Commit c969b742 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 808ce345
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
"GenericName[zh_CN]": "Ruby 支持", "GenericName[zh_CN]": "Ruby 支持",
"KPlugin": { "KPlugin": {
"Description": "Ruby Language Support", "Description": "Ruby Language Support",
"Description[ca@valencia]": "Implementació del llenguatge Ruby",
"Description[ca]": "Implementació del llenguatge Ruby", "Description[ca]": "Implementació del llenguatge Ruby",
"Description[cs]": "Podpora jazyka Ruby", "Description[cs]": "Podpora jazyka Ruby",
"Description[de]": "Sprachunterstützung für Ruby", "Description[de]": "Sprachunterstützung für Ruby",
...@@ -57,6 +58,7 @@ ...@@ -57,6 +58,7 @@
"Icon": "application-x-ruby", "Icon": "application-x-ruby",
"Id": "KDevRubySupport", "Id": "KDevRubySupport",
"Name": "Ruby Support", "Name": "Ruby Support",
"Name[ca@valencia]": "Implementació de Ruby",
"Name[ca]": "Implementació de Ruby", "Name[ca]": "Implementació de Ruby",
"Name[cs]": "Podpora Ruby", "Name[cs]": "Podpora Ruby",
"Name[de]": "Unterstützung für Ruby", "Name[de]": "Unterstützung für Ruby",
......
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