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"

dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop

@@ -9,7 +9,7 @@ Name[bg]=Наблюдение на системата
 Name[bn]=সিস্টেম মনিটর
 Name[bn_IN]=সিস্টেম নিরীক্ষণ ব্যবস্থা
 Name[bs]=Monitor sistema
-Name[ca]=Monitor del sistema
+Name[ca]=Controlador del sistema
 Name[ca@valencia]=Monitor del sistema
 Name[cs]=Monitor systému
 Name[csb]=Mònitór systemë

systemmonitor/org.kde.systemmonitor.desktop

@@ -10,7 +10,7 @@ Name[bg]=Наблюдение на системата
 Name[bn]=সিস্টেম মনিটর
 Name[bn_IN]=সিস্টেম নিরীক্ষণ ব্যবস্থা
 Name[bs]=Monitor sistema
-Name[ca]=Monitor del sistema
+Name[ca]=Controlador del sistema
 Name[ca@valencia]=Monitor del sistema
 Name[cs]=Monitor systému
 Name[csb]=Mònitór systemë