Commit 86ba8ebc 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 39ede9c7
......@@ -98,7 +98,7 @@ Name[vi]=Thiết bị USB
Name[wa]=Éndjins USB
Name[xh]=Amacebo e USB
Name[x-test]=xxUSB Devicesxx
Name[zh_CN]=USB 设备
Name[zh_CN]=USB设备
Name[zh_TW]=USB 裝置
Comment=USB devices attached to this computer
......
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