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"

src/plasma/packagestructure/containmentactions-packagestructure.json

@@ -40,6 +40,7 @@
         "Name[sr@latin]": "Radnje sadržaoca",
         "Name[sr]": "Радње садржаоца",
         "Name[sv]": "Omgivningsåtgärder",
+        "Name[tr]": "Sınırlama Eylemleri",
         "Name[uk]": "Дії з контейнерами",
         "Name[x-test]": "xxContainment Actionsxx",
         "Name[zh_CN]": "容器动作",

src/plasma/packagestructure/dataengine-packagestructure.json

@@ -42,6 +42,7 @@
         "Name[sr@latin]": "Datomotor",
         "Name[sr]": "Датомотор",
         "Name[sv]": "Datagränssnitt",
+        "Name[tr]": "Veri Motoru",
         "Name[uk]": "Рушій даних",
         "Name[x-test]": "xxData Enginexx",
         "Name[zh_CN]": "数据引擎",

src/plasma/packagestructure/plasmageneric-packagestructure.json

@@ -40,6 +40,7 @@
         "Name[sr@latin]": "Generički",
         "Name[sr]": "Генерички",
         "Name[sv]": "Generella",
+        "Name[tr]": "Genel",
         "Name[uk]": "Загальний",
         "Name[x-test]": "xxGenericxx",
         "Name[zh_CN]": "常规",

src/plasma/packagestructure/plasmatheme-packagestructure.json

@@ -42,6 +42,7 @@
         "Name[sr@latin]": "Plasma tema",
         "Name[sr]": "Плазма тема",
         "Name[sv]": "Plasmatema",
+        "Name[tr]": "Plasma Teması",
         "Name[uk]": "Тема Плазми",
         "Name[x-test]": "xxPlasma Themexx",
         "Name[zh_CN]": "Plasma 主题",