[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    Re: [tools/wine.desktop] Add czech translation
From:       Scott Ritchie <scott () open-vote ! org>
Date:       2010-06-30 23:28:01
Message-ID: 4C2BD301.40007 () open-vote ! org
[Download RAW message or body]

On 06/30/2010 03:46 PM, Nikolay Sivov wrote:
> On 7/1/2010 02:20, Scott Ritchie wrote:
> > Translation by Sven Augustin
> 
> > @@ -20,7 +21,12 @@ Name[sr]=Wine - аДаИаЗаАб� Windows \
> > аПб�аОаГб�аАаМаА Name[sr@latin]=Wine - dizaФ� Windows \
> > programa Name[hr]=Wine - diza� Windows programa
> > Exec=wine start /unix %f
> > +<<<<<<<  HEAD
> > 
> > MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk;application/x-ms-shortcut
> >  
> > +=======
> > +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk;
> >  
> > +>>>>>>>  tools/wine.desktop: add Icon=wine to support systems with an
> > icon theme
> > Icon=wine
> > NoDisplay=true
> > StartupNotify=true
> > +
> Conflicts?

Already noticed, resent


[prev in list] [next in list] [prev in thread] [next in thread]