Commit 94a54859 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 6e2a1208
......@@ -110,7 +110,7 @@ Name[ug]=چەك
Name[uk]=Клац
Name[wa]=Clitchî
Name[x-test]=xxClickxx
Name[zh_CN]=
Name[zh_CN]=
Name[zh_TW]=點擊
Comment=Click
Comment[ast]=Calcar
......@@ -176,7 +176,7 @@ Comment[ug]=چەك
Comment[uk]=Клац
Comment[wa]=Clitchî
Comment[x-test]=xxClickxx
Comment[zh_CN]=
Comment[zh_CN]=
Comment[zh_TW]=點擊
Action=Sound
Sound=reversi-click.wav
......
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