Commit 748f1811 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 659c6bd3
......@@ -9,6 +9,7 @@ Comment[en_GB]=Tiny Music Player
Comment[es]=Pequeño reproductor de música
Comment[fr]=Lecteur de musique ultra compact
Comment[gl]=Reprodutor de música anano.
Comment[it]=Piccolo lettore musicale
Comment[nl]=Kleine muziekspeler
Comment[pt]=Pequeno Leitor Multimédia
Comment[sk]=Malý hudobný prehrávač
......@@ -24,6 +25,7 @@ Name[en_GB]=vvave
Name[es]=vvave
Name[fr]=vvave
Name[gl]=vvave
Name[it]=vvave
Name[nl]=vvave
Name[pt]=vvave
Name[sv]=vvave
......@@ -40,6 +42,7 @@ Name[en_GB]=vvave...
Name[es]=vvave...
Name[fr]=vvave...
Name[gl]=vvave…
Name[it]=vvave...
Name[nl]=vvave...
Name[pt]=vvave...
Name[sv]=vvave...
......@@ -54,6 +57,7 @@ Comment[en_GB]=Connection to device failed
Comment[es]=La conexión con el dispositivo ha fallado
Comment[fr]=La connexion au périphérique a échoué
Comment[gl]=A conexión co dispositivo fallou.
Comment[it]=Connessione al dispositivo non riuscita
Comment[nl]=Verbinding met het apparaat is mislukt
Comment[pt]=A ligação ao dispositivo foi mal-sucedida
Comment[sk]=Pripojenie k zariadeniu zlyhalo
......
......@@ -8,6 +8,7 @@ Name[en_GB]=vvave
Name[es]=vvave
Name[fr]=vvave
Name[gl]=vvave
Name[it]=vvave
Name[nl]=vvave
Name[pt]=vvave
Name[sv]=vvave
......@@ -22,6 +23,7 @@ Comment[en_GB]=Play your music collection
Comment[es]=Reproducir su colección de música
Comment[fr]=Jouez votre collection musicale
Comment[gl]=Reproduza a súa colección de música.
Comment[it]=Riproduce la tua collezione musicale
Comment[nl]=Uw muziekcollectie afspelen
Comment[pt]=Tocar a sua colecção de música
Comment[sk]=Prehrať vašu hudobnú kolekciu
......@@ -46,6 +48,7 @@ GenericName[en_GB]=Audio Player
GenericName[es]=Reproductor de sonido
GenericName[fr]=Lecteur audio
GenericName[gl]=Reprodutor de son
GenericName[it]=Lettore audio
GenericName[nl]=Audiospeler
GenericName[pt]=Leitor de Áudio
GenericName[sk]=Audio prehrávač
......
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