Commit 99ce5831 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 0e0b84a5
......@@ -4,6 +4,7 @@ Comment=Tiny Music Player
Comment[ca]=Reproductor de música petit
Comment[en_GB]=Tiny Music Player
Comment[nl]=Kleine muziekspeler
Comment[sk]=Malý hudobný prehrávač
Comment[sv]=Mycket liten musikspelare
Comment[uk]=Маленький музичний програвач
Comment[x-test]=xxTiny Music Playerxx
......@@ -11,6 +12,7 @@ Name=Babe
Name[ca]=Babe
Name[en_GB]=Babe
Name[nl]=Babe
Name[sk]=Babe
Name[sv]=Babe
Name[uk]=Babe
Name[x-test]=xxBabexx
......@@ -20,6 +22,7 @@ Name=Babe...
Name[ca]=Babe...
Name[en_GB]=Babe...
Name[nl]=Babe...
Name[sk]=Babe...
Name[sv]=Babe...
Name[uk]=Babe…
Name[x-test]=xxBabe...xx
......@@ -28,6 +31,7 @@ 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[sk]=Pripojenie k zariadeniu zlyhalo
Comment[sv]=Anslutning till enhet misslyckades
Comment[uk]=Не вдалося встановити з’єднання із пристроєм
Comment[x-test]=xxConnection to device failedxx
......
......@@ -3,6 +3,7 @@ Name=Babe
Name[ca]=Babe
Name[en_GB]=Babe
Name[nl]=Babe
Name[sk]=Babe
Name[sv]=Babe
Name[uk]=Babe
Name[x-test]=xxBabexx
......@@ -10,6 +11,7 @@ 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[sk]=Prehrať vašu hudobnú kolekciu
Comment[sv]=Spela din musiksamling
Comment[uk]=Відтворення вашої музичної збірки
Comment[x-test]=xxPlay your music collectionxx
......@@ -27,6 +29,7 @@ GenericName[ca]=Reproductor d'àudio
GenericName[en_GB]=Audio Player
GenericName[nl]=Audiospeler
GenericName[pt]=Leitor de Áudio
GenericName[sk]=Audio prehrávač
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