Commit 1e59780c 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 22d22d88
......@@ -36,9 +36,25 @@
"GenericName[zh_CN]": "Ruby 支持",
"KPlugin": {
"Description": "Ruby Language Support",
"Description[ca]": "Implementació del llenguatge Ruby",
"Description[es]": "Implementación del lenguaje Ruby",
"Description[gl]": "Compatibilidade coa linguaxe Ruby",
"Description[nl]": "Ondersteuning voor de taal Ruby",
"Description[pt_BR]": "Suporte à linguagem Ruby",
"Description[sv]": "Ruby-språkstöd",
"Description[uk]": "Підтримка мови Ruby",
"Description[x-test]": "xxRuby Language Supportxx",
"Icon": "application-x-ruby",
"Id": "KDevRubySupport",
"Name": "Ruby Support",
"Name[ca]": "Implementació de Ruby",
"Name[es]": "Implementación de Ruby",
"Name[gl]": "Compatibilidade con Ruby",
"Name[nl]": "Ondersteuning voor Ruby",
"Name[pt_BR]": "Suporte à Ruby",
"Name[sv]": "Stöd för Ruby",
"Name[uk]": "Підтримка Ruby",
"Name[x-test]": "xxRuby Supportxx",
"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