Commit 7e6dd145 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 6b25f374
......@@ -63,7 +63,7 @@ Name[th]=ยุติการทำงานของโปรแกรม
Name[tr]=Uygulamaları Bitir
Name[ug]=پروگراممىلارنى توختات
Name[uk]=Переривання програм
Name[vi]=Huỷ diệt ứng dụng
Name[vi]=Kết thúc ứng dụng
Name[wa]=Fé fini des programes
Name[x-test]=xxTerminate Applicationsxx
Name[zh_CN]=终止程序
......
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