Commit e6790aba 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 5bcd5739
......@@ -83,5 +83,6 @@ Name[ug]=KDED ئومۇمىيەت تېزلەتمە مۇلازىمېتىرى
Name[uk]=Сервер загальних клавіатурних скорочень KDED
Name[vi]=Máy chủ phím tắt hệ thống KDED
Name[wa]=Sierveu des rascourtis globås po KDED
Name[x-test]=xxKDED Global Shortcuts Serverxx
Name[zh_CN]=KDED 全局快捷键服务器
Name[zh_TW]=KDED 全域鍵盤捷徑
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