Commit a1c344b6 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 df768aba
......@@ -182,7 +182,7 @@ Comment[ug]=چېتىلغان IEEE 1394 ئۈسكۈنىلەر
Comment[uk]=Під’єднані пристрої IEEE 1394
Comment[uz]=Ulangan IEEE 1394 uskunalar
Comment[uz@cyrillic]=Уланган IEEE 1394 ускуналар
Comment[vi]=Thiết bị IEEE 1394 đã gắn
Comment[vi]=Thiết bị IEEE 1394 đã kết nối
Comment[wa]=Éndjins IEEE 1394 ataetchîs
Comment[x-test]=xxAttached IEEE 1394 devicesxx
Comment[zh_CN]=挂接的 IEEE 1394 设备
......
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