Commit 8d541fa9 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 a4c1a13f
......@@ -6,6 +6,7 @@ Comment[ca@valencia]=Reproductor de música petit
Comment[cs]=Drobný přehrávač hudby
Comment[de]=Einfache Audio-Wiedergabe
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[nl]=Kleine muziekspeler
......@@ -20,6 +21,7 @@ Name[ca@valencia]=vvave
Name[cs]=vvave
Name[de]=vvave
Name[en_GB]=vvave
Name[es]=vvave
Name[fr]=vvave
Name[gl]=vvave
Name[nl]=vvave
......@@ -35,6 +37,7 @@ Name[ca@valencia]=vvave...
Name[cs]=vvave...
Name[de]=vvave ...
Name[en_GB]=vvave...
Name[es]=vvave...
Name[fr]=vvave...
Name[gl]=vvave…
Name[nl]=vvave...
......
......@@ -5,6 +5,7 @@ Name[ca@valencia]=vvave
Name[cs]=vvave
Name[de]=vvave
Name[en_GB]=vvave
Name[es]=vvave
Name[fr]=vvave
Name[gl]=vvave
Name[nl]=vvave
......@@ -18,6 +19,7 @@ Comment[ca@valencia]=Reprodueix la vostra col·lecció de música
Comment[cs]=Přehrávejte svou hudební sbírku
Comment[de]=Wiedergabe Ihrer Musik-Sammlung
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[nl]=Uw muziekcollectie afspelen
......
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