Commit d52ad919 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 d1481336
......@@ -37,11 +37,13 @@
"KPlugin": {
"Description": "Ruby Language Support",
"Description[ca]": "Implementació del llenguatge Ruby",
"Description[en_GB]": "Ruby Language Support",
"Description[es]": "Implementación del lenguaje Ruby",
"Description[gl]": "Compatibilidade coa linguaxe Ruby",
"Description[nl]": "Ondersteuning voor de taal Ruby",
"Description[pt]": "Suporte à Linguagem Ruby",
"Description[pt_BR]": "Suporte à linguagem Ruby",
"Description[sk]": "Podpora jazyka Ruby",
"Description[sv]": "Ruby-språkstöd",
"Description[uk]": "Підтримка мови Ruby",
"Description[x-test]": "xxRuby Language Supportxx",
......@@ -49,11 +51,13 @@
"Id": "KDevRubySupport",
"Name": "Ruby Support",
"Name[ca]": "Implementació de Ruby",
"Name[en_GB]": "Ruby Support",
"Name[es]": "Implementación de Ruby",
"Name[gl]": "Compatibilidade con Ruby",
"Name[nl]": "Ondersteuning voor Ruby",
"Name[pt]": "Suporte para Ruby",
"Name[pt_BR]": "Suporte à Ruby",
"Name[sk]": "Podpora Ruby",
"Name[sv]": "Stöd för Ruby",
"Name[uk]": "Підтримка Ruby",
"Name[x-test]": "xxRuby Supportxx",
......
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