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

@@ -22,6 +22,7 @@
         "Name[et]": "Konteineritoimingud", 
         "Name[it]": "Azioni dei contenitori", 
         "Name[nl]": "Containeracties", 
+        "Name[nn]": "Behaldarhandlingar", 
         "Name[pl]": "Działania pojemnika", 
         "Name[pt]": "Acções do Contentor", 
         "Name[ru]": "Действия для контейнера Plasma", 

src/plasma/packagestructure/dataengine-packagestructure.json

@@ -23,6 +23,7 @@
         "Name[et]": "Andmemootor", 
         "Name[it]": "Motore dati", 
         "Name[nl]": "Gegevensengine", 
+        "Name[nn]": "Datamotor", 
         "Name[pl]": "Silnik danych", 
         "Name[pt]": "Motor de Dados", 
         "Name[ru]": "Источник данных Plasma", 

src/plasma/packagestructure/plasmageneric-packagestructure.json

@@ -22,6 +22,7 @@
         "Name[et]": "Üldine", 
         "Name[it]": "Generico", 
         "Name[nl]": "Algemeen", 
+        "Name[nn]": "Generisk", 
         "Name[pl]": "Ogólne", 
         "Name[pt]": "Genérico", 
         "Name[pt_BR]": "Genérico", 

src/plasma/packagestructure/plasmatheme-packagestructure.json

@@ -24,6 +24,7 @@
         "Name[fi]": "Plasma-teema", 
         "Name[it]": "Tema di Plasma", 
         "Name[nl]": "Plasma-thema", 
+        "Name[nn]": "Plasma-tema", 
         "Name[pl]": "Wystrój Plazmy", 
         "Name[pt]": "Tema do Plasma", 
         "Name[ru]": "Тема оформления Plasma", 

src/plasma/packagestructure/plasmoid-packagestructure.json

@@ -19,6 +19,7 @@
         "Name[es]": "Plasmoide", 
         "Name[fi]": "Plasmoidi", 
         "Name[it]": "Plasmoide", 
+        "Name[nn]": "Plasmoide", 
         "Name[pl]": "Plazmoid", 
         "Name[pt]": "Plasmóide", 
         "Name[ru]": "Виджет Plasma",