Commit b4fab317 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 71c20211
......@@ -36,6 +36,7 @@
"GenericName[zh_CN]": "Ruby 支持",
"KPlugin": {
"Description": "Ruby Language Support",
"Description[ast]": "Sofitu del llinguax Ruby",
"Description[ca@valencia]": "Implementació del llenguatge Ruby",
"Description[ca]": "Implementació del llenguatge Ruby",
"Description[cs]": "Podpora jazyka 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