Commit 41e2ca7c 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 dcb6cfd4
......@@ -37,6 +37,8 @@
"KPlugin": {
"Description": "Ruby Language Support",
"Description[ca]": "Implementació del llenguatge Ruby",
"Description[cs]": "Podpora jazyka Ruby",
"Description[de]": "Sprachunterstützung für Ruby",
"Description[en_GB]": "Ruby Language Support",
"Description[es]": "Implementación del lenguaje Ruby",
"Description[gl]": "Compatibilidade coa linguaxe Ruby",
......@@ -51,6 +53,8 @@
"Id": "KDevRubySupport",
"Name": "Ruby Support",
"Name[ca]": "Implementació de Ruby",
"Name[cs]": "Podpora Ruby",
"Name[de]": "Unterstützung für Ruby",
"Name[en_GB]": "Ruby Support",
"Name[es]": "Implementación de Ruby",
"Name[gl]": "Compatibilidade con 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