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"

autotests/data/signedPackage/metadata.desktop

@@ -20,6 +20,7 @@ Name[mr]=जावास्क्रिप्ट फाईलच्या क्
 Name[nb]=JavaScript filhandlinger
 Name[nds]=JavaScript-Dateiakschonen
 Name[nl]=Bestandsbewerkingen in JavaScript
+Name[nn]=JavaScript-filoperasjonar
 Name[pl]=Operacje plikowe JavaScript
 Name[pt]=Operações com Ficheiros em JavaScript
 Name[pt_BR]=Operações com arquivos JavaScript

examples/applets/bugreport/metadata.desktop

@@ -88,6 +88,7 @@ Name[lt]=Vabalas
 Name[nb]=Feil
 Name[nds]=Fehler
 Name[nl]=Bug
+Name[nn]=Feil
 Name[pa]=ਬੱਗ
 Name[pl]=Błąd
 Name[pt]=Insecto

examples/applets/conditionalloader/metadata.desktop

@@ -22,6 +22,7 @@ Name[mr]=एप्लेट चाचणी
 Name[nb]=Applet-test
 Name[nds]=Lüttprogramm-Test
 Name[nl]=Test van applet
+Name[nn]=Applet-test
 Name[pa]=ਐਪਲਿਟ ਟੈਸਟ
 Name[pl]=Próba apletu
 Name[pt]=Teste de 'Applets'

examples/applets/config/metadata.desktop

@@ -21,6 +21,7 @@ Name[lt]=Konfigūracijos testas
 Name[nb]=Oppsettstest
 Name[nds]=Instellen-Test
 Name[nl]=Test van instellingen
+Name[nn]=Oppsettest
 Name[pa]=ਸੰਰਚਨਾ ਟੈਸਟ
 Name[pl]=Próba ustawień
 Name[pt]=Teste de configuração

examples/applets/testcomponents/metadata.desktop

@@ -21,6 +21,7 @@ Name[mr]=घटक चाचणी
 Name[nb]=Komponent-test
 Name[nds]=Komponententest
 Name[nl]=Test van componenten
+Name[nn]=Komponenttest
 Name[pl]=Próba składników
 Name[pt]=Teste de Componentes
 Name[pt_BR]=Teste de componentes

examples/applets/testtheme/metadata.desktop

@@ -19,6 +19,7 @@ Name[ko]=테마 테스트
 Name[nb]=Tema-test
 Name[nds]=Mustertest
 Name[nl]=Test van thema
+Name[nn]=Tematest
 Name[pl]=Próba wystroju
 Name[pt]=Teste de Tema
 Name[pt_BR]=Teste de tema