Commit ea26b92c 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 d9e29248
......@@ -130,7 +130,7 @@ Comment[th]=เมนูปกติที่จะแสดงเมื่อ
Comment[tr]=Sağ tıklama ile doğal olarak gösterilen menü
Comment[ug]=چاشقىنەك ئوڭ توپچىسى چېكىلگەندە كۆرۈنىدىغان تىزىملىك
Comment[uk]=Меню, яке буде показано у відповідь на клацання правою кнопкою миші
Comment[vi]=Trình đơn thường thấy khi chuột phải
Comment[vi]=Trình đơn thường thấy khi bấm phải
Comment[wa]=Li dressêye k' on voet normålmint cwand on clitche droet
Comment[x-test]=xxThe menu that normally shows on right-clickxx
Comment[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