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

@@ -26,6 +26,7 @@
         "Name[fr]": "Actions de conteneur",
         "Name[gl]": "Accións de contención",
         "Name[ia]": "Actiones de continer",
+        "Name[id]": "Tindakan Penahanan",
         "Name[it]": "Azioni dei contenitori",
         "Name[ko]": "컨테이너 동작",
         "Name[nl]": "Containeracties",

src/plasma/packagestructure/dataengine-packagestructure.json

@@ -28,6 +28,7 @@
         "Name[fr]": "Moteur de données",
         "Name[gl]": "Motor de datos",
         "Name[ia]": "Motor de datos",
+        "Name[id]": "Mesin Data",
         "Name[it]": "Motore dati",
         "Name[ko]": "데이터 엔진",
         "Name[nl]": "Gegevensengine",

src/plasma/packagestructure/plasmageneric-packagestructure.json

@@ -25,6 +25,7 @@
         "Name[fi]": "Yleinen",
         "Name[fr]": "Générique",
         "Name[gl]": "Xenérico",
+        "Name[id]": "Generik",
         "Name[it]": "Generico",
         "Name[ko]": "일반",
         "Name[nl]": "Algemeen",

src/plasma/packagestructure/plasmatheme-packagestructure.json

@@ -28,6 +28,7 @@
         "Name[fr]": "Thème Plasma pour les thèmes foncés",
         "Name[gl]": "Tema de Plasma",
         "Name[ia]": "Thema de Plasma",
+        "Name[id]": "Tema Plasma",
         "Name[it]": "Tema di Plasma",
         "Name[ko]": "Plasma 테마",
         "Name[nl]": "Plasma-thema",