Commit aa92de6a authored by Script Kiddy's avatar Script Kiddy

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 e58eb2cc
......@@ -8,7 +8,7 @@
],
"Category": "Analyzers",
"Description": "This plugin integrates Cppcheck (static analysis tool) to KDevelop",
"Description[ca@valencia]": "Este connector integra el Cppcheck (eina per a l'anàlisi estàtic) al KDevelop",
"Description[ca@valencia]": "Este connector integra el Cppcheck (eina per a l'anàlisi estàtica) al KDevelop",
"Description[ca]": "Aquest connector integra el Cppcheck (eina per a l'anàlisi estàtica) al KDevelop",
"Description[cs]": "Tento modul integruje Cppcheck (statický analytický nástroj) do KDevelop",
"Description[de]": "Dieses Modul integriert Cppcheck (Werkzeug zur statischen Analyse) in KDevelop",
......
......@@ -27,7 +27,7 @@
"Id": "KDevManPage",
"License": "GPL",
"Name": "Man Pages",
"Name[ca@valencia]": "Pàgines man",
"Name[ca@valencia]": "Pàgines «man»",
"Name[ca]": "Pàgines «man»",
"Name[cs]": "Manuálové stránky",
"Name[de]": "Handbuch-Seiten",
......
Markdown is supported
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