Commit 7125ed99 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 7d8fb734
......@@ -14,6 +14,7 @@ Comment[x-test]=xxTiny Music Playerxx
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[cs]=vvave
Name[en_GB]=vvave
Name[gl]=vvave
Name[nl]=vvave
......@@ -25,6 +26,7 @@ Name[x-test]=xxvvavexx
Name=vvave...
Name[ca]=vvave...
Name[ca@valencia]=vvave...
Name[cs]=vvave...
Name[en_GB]=vvave...
Name[gl]=vvave…
Name[nl]=vvave...
......@@ -34,6 +36,7 @@ Name[x-test]=xxvvave...xx
Comment=Connection to device failed
Comment[ca]=Ha fallat la connexió amb el dispositiu
Comment[ca@valencia]=Ha fallat la connexió amb el dispositiu
Comment[cs]=Připojení k zařízení selhalo
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é
......
......@@ -2,6 +2,7 @@
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[cs]=vvave
Name[en_GB]=vvave
Name[gl]=vvave
Name[nl]=vvave
......
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