Commit cc2661c6 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 a16c9226
......@@ -50,6 +50,7 @@
"Description[sv]": "Ruby-språkstöd",
"Description[uk]": "Підтримка мови Ruby",
"Description[x-test]": "xxRuby Language Supportxx",
"Description[zh_CN]": "Ruby 语言支持",
"Icon": "application-x-ruby",
"Id": "KDevRubySupport",
"Name": "Ruby Support",
......@@ -67,6 +68,7 @@
"Name[sv]": "Stöd för Ruby",
"Name[uk]": "Підтримка Ruby",
"Name[x-test]": "xxRuby Supportxx",
"Name[zh_CN]": "Ruby 支持",
"ServiceTypes": [
"KDevelop/Plugin"
]
......
Supports Markdown
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