Commit a08ae647 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 7dc22316
......@@ -15,7 +15,6 @@ Comment[sk]=Malý hudobný prehrávač
Comment[sv]=Mycket liten musikspelare
Comment[uk]=Маленький музичний програвач
Comment[x-test]=xxTiny Music Playerxx
Comment[zh_CN]=简洁的音乐播放器
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
......@@ -29,7 +28,6 @@ Name[pt]=vvave
Name[sv]=vvave
Name[uk]=vvave
Name[x-test]=xxvvavexx
Name[zh_CN]=vvave
[Event/Notify]
Name=vvave...
......@@ -45,7 +43,6 @@ Name[pt]=vvave...
Name[sv]=vvave...
Name[uk]=vvave…
Name[x-test]=xxvvave...xx
Name[zh_CN]=vvave...
Comment=Connection to device failed
Comment[ast]=Falló la conexón col preséu
Comment[ca]=Ha fallat la connexió amb el dispositiu
......
[Desktop Entry]
Name=vvave
Name[ast]=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[cs]=vvave
......@@ -10,7 +9,6 @@ Name[fr]=vvave
Name[gl]=vvave
Name[nl]=vvave
Name[pt]=vvave
Name[sk]=vvave
Name[sv]=vvave
Name[uk]=vvave
Name[x-test]=xxvvavexx
......
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