Commit 60716e95 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 5d00d23d
......@@ -49,6 +49,7 @@
"Description[pt_BR]": "Suporte à linguagem Ruby",
"Description[sk]": "Podpora jazyka Ruby",
"Description[sv]": "Ruby-språkstöd",
"Description[tr]": "Ruby Dil Desteği",
"Description[uk]": "Підтримка мови Ruby",
"Description[x-test]": "xxRuby Language Supportxx",
"Description[zh_CN]": "Ruby 语言支持",
......@@ -68,6 +69,7 @@
"Name[pt_BR]": "Suporte à Ruby",
"Name[sk]": "Podpora Ruby",
"Name[sv]": "Stöd för Ruby",
"Name[tr]": "Ruby Desteği",
"Name[uk]": "Підтримка Ruby",
"Name[x-test]": "xxRuby Supportxx",
"Name[zh_CN]": "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