Commit 0e0b84a5 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent b1527ab6
[Global]
IconName=preferences-system-bluetooth
Comment=Tiny Music Player
Comment[ca]=Reproductor de música petit
Comment[en_GB]=Tiny Music Player
Comment[nl]=Kleine muziekspeler
Comment[sv]=Mycket liten musikspelare
Comment[uk]=Маленький музичний програвач
Comment[x-test]=xxTiny Music Playerxx
Name=Babe
Name[ca]=Babe
Name[en_GB]=Babe
Name[nl]=Babe
Name[sv]=Babe
Name[uk]=Babe
Name[x-test]=xxBabexx
[Event/Notify]
Name=Babe...
Name[ca]=Babe...
Name[en_GB]=Babe...
Name[nl]=Babe...
Name[sv]=Babe...
Name[uk]=Babe…
Name[x-test]=xxBabe...xx
Comment=Connection to device failed
Comment[ca]=Ha fallat la connexió amb el dispositiu
Comment[en_GB]=Connection to device failed
Comment[nl]=Verbinding met het apparaat is mislukt
Comment[pt]=A ligação ao dispositivo foi mal-sucedida
Comment[sv]=Anslutning till enhet misslyckades
Comment[uk]=Не вдалося встановити з’єднання із пристроєм
Comment[x-test]=xxConnection to device failedxx
Icon=babe-qt
......
[Desktop Entry]
Name=Babe
Name[ca]=Babe
Name[en_GB]=Babe
Name[nl]=Babe
Name[sv]=Babe
Name[uk]=Babe
Name[x-test]=xxBabexx
Comment=Play your music collection
Comment[ca]=Reprodueix la vostra col·lecció de música
Comment[en_GB]=Play your music collection
Comment[nl]=Uw muziekcollectie afspelen
Comment[sv]=Spela din musiksamling
Comment[uk]=Відтворення вашої музичної збірки
Comment[x-test]=xxPlay your music collectionxx
TryExec=babe
......@@ -15,6 +23,10 @@ Icon=babe
MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;audio/x-flac;audio/x-vorbis+ogg;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;audio/flac;audio/mp4;
# Generic name with translations
GenericName=Audio Player
GenericName[ca]=Reproductor d'àudio
GenericName[en_GB]=Audio Player
GenericName[nl]=Audiospeler
GenericName[pt]=Leitor de Áudio
GenericName[sv]=Ljudspelare
GenericName[uk]=Аудіопрогравач
GenericName[x-test]=xxAudio Playerxx
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment