Commit c7254e73 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 69e1ed66
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"Name[pl]": "Bazgroszyt", "Name[pl]": "Bazgroszyt",
"Name[pt]": "Quadro", "Name[pt]": "Quadro",
"Name[pt_BR]": "Scratchpad", "Name[pt_BR]": "Scratchpad",
"Name[sk]": "Scratchpad",
"Name[sv]": "Scratchpad", "Name[sv]": "Scratchpad",
"Name[uk]": "Нотатник для чернеток", "Name[uk]": "Нотатник для чернеток",
"Name[x-test]": "xxScratchpadxx", "Name[x-test]": "xxScratchpadxx",
......
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