Commit 33b87f40 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 810ef198
......@@ -45,6 +45,7 @@
"Name[sv]": "Stöd för Python-avlusare (PDB)",
"Name[uk]": "Підтримка засобу діагностики Python (PDB)",
"Name[x-test]": "xxPython Debugger (PDB) supportxx",
"Name[zh_CN]": "Python 调试器 (PDB) 支持",
"ServiceTypes": [
"KDevelop/Plugin"
]
......
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