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"

examples/applets/bugreport/metadata.desktop

@@ -54,6 +54,7 @@ Keywords[fi]=plasma;bugzilla;bug;bugi;vika;virhe;development;kehitys;kehittämin
 Keywords[fr]=plasma;bugzilla;bug;développement;support;
 Keywords[gd]=plasma;bugzilla;bug;development;support;buga;leasachadh;taic;cobhair;
 Keywords[gl]=plasma;bugzilla;erro;desenvolvemento;soporte;asistencia técnica;
+Keywords[ia]=plasma;bugzilla;bug;development;support;
 Keywords[it]=plasma;bugzilla;bug;sviluppo;supporto;
 Keywords[ko]=plasma;bugzilla;bug;development;support;버그;개발;지원;
 Keywords[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas;

src/plasma/packagestructure/containmentactions-packagestructure.json

@@ -21,6 +21,7 @@
         "Name[es]": "Acciones del contenedor", 
         "Name[et]": "Konteineritoimingud", 
         "Name[fi]": "Sovelmasäiliön toiminnot", 
+        "Name[ia]": "Actiones de continer", 
         "Name[it]": "Azioni dei contenitori", 
         "Name[ko]": "컨테이너 동작", 
         "Name[nl]": "Containeracties", 
@@ -45,4 +46,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}

src/plasma/packagestructure/dataengine-packagestructure.json

@@ -23,6 +23,7 @@
         "Name[et]": "Andmemootor", 
         "Name[fi]": "Tietomoottori", 
         "Name[fr]": "Moteur de données", 
+        "Name[ia]": "Motor de datos", 
         "Name[it]": "Motore dati", 
         "Name[ko]": "데이터 엔진", 
         "Name[nl]": "Gegevensengine", 
@@ -47,4 +48,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}

src/plasma/packagestructure/plasmageneric-packagestructure.json

@@ -47,4 +47,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}

src/plasma/packagestructure/plasmatheme-packagestructure.json

@@ -23,6 +23,7 @@
         "Name[et]": "Plasma teema", 
         "Name[fi]": "Plasma-teema", 
         "Name[fr]": "Thème Plasma pour les thèmes foncés", 
+        "Name[ia]": "Thema de Plasma", 
         "Name[it]": "Tema di Plasma", 
         "Name[ko]": "Plasma 테마", 
         "Name[nl]": "Plasma-thema", 
@@ -47,4 +48,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}

src/plasma/packagestructure/plasmoid-packagestructure.json

@@ -38,4 +38,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}