Commit 74f72073 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 fbda9b20
......@@ -14,6 +14,7 @@ Comment[x-test]=xxTiny Music Playerxx
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[en_GB]=vvave
Name[gl]=vvave
Name[nl]=vvave
Name[pt]=vvave
......@@ -24,6 +25,7 @@ Name[x-test]=xxvvavexx
Name=vvave...
Name[ca]=vvave...
Name[ca@valencia]=vvave...
Name[en_GB]=vvave...
Name[gl]=vvave…
Name[nl]=vvave...
Name[pt]=vvave...
......
......@@ -2,6 +2,7 @@
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[en_GB]=vvave
Name[gl]=vvave
Name[nl]=vvave
Name[pt]=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