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"

components/shellprivate/widgetexplorer/plasmoids.knsrc

@@ -43,7 +43,7 @@ Name[sr@latin]=plasma vidžeti
 Name[sv]=Plasma grafiska komponenter
 Name[ta]=பிளாஸ்மா பிளாஸ்மாய்டுகள்
 Name[tg]=Виҷетҳои Плазма
-Name[tr]=Plasma Gereçleri
+Name[tr]=Plasma Araç Takımları
 Name[uk]=Віджети Плазми
 Name[vi]=Phụ kiện Plasma
 Name[x-test]=xxPlasma Widgetsxx

runners/windowedwidgets/plasma-runner-windowedwidgets.json

@@ -134,7 +134,7 @@
         "Name[sv]": "Fönsterbaserade grafiska komponenter",
         "Name[ta]": "சாளர பிளாஸ்மாய்டுகள்",
         "Name[th]": "วิดเจ็ตที่เป็นหน้าต่าง",
-        "Name[tr]": "Pencerelendirilmiş gereçler",
+        "Name[tr]": "Pencerelendirilmiş araç takımları",
         "Name[ug]": "كۆزنەكلىك ۋىجېتلار",
         "Name[uk]": "Віджети-вікна",
         "Name[vi]": "Phụ kiện được cửa sổ hoá",