Re: [tools/wine.desktop] Add czech translation

[Nikolay Sivov]

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?

[tools/wine.desktop] Add czech translation

[Scott Ritchie]

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