Commit 42892158 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 4f83786c
......@@ -93,6 +93,7 @@ Name[uz@cyrillic]=Меню таҳрирчи
Name[vi]=Biên soạn trình đơn
Name[wa]=Aspougneu di menus
Name[xh]=Umhleli we Menu
Name[x-test]=xxMenu Editorxx
Name[zh_CN]=菜单编辑器
Name[zh_TW]=選單編輯器
......
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