Commit fe516fa3 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 c11d4ea1
......@@ -18,8 +18,8 @@
"Description[uk]": "За допомогою нотатника ви можете швидко створити фрагмент коду та поекспериментувати з ним без створення повноцінного проєкту. Можливе навіть створення завдань на майбутнє.",
"Description[x-test]": "xxScratchpad lets you quickly run and experiment with code without a full project, and even store todos.xx",
"Description[zh_CN]": "通过刮板,您可以在没有完整项目的情况下快速运行和试验代码,甚至可以存储待办事项。",
"Id": "scratchpad",
"Icon": "note",
"Id": "scratchpad",
"Name": "Scratchpad",
"Name[ca@valencia]": "Scratchpad",
"Name[ca]": "Scratchpad",
......
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