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"

desktop/konsolerun.desktop

@@ -37,6 +37,7 @@ Name[lt]=Paleisti konsolėje
 Name[nb]=Kjør i Konsole
 Name[nds]=Binnen Konsole lopen
 Name[nl]=In Konsole uitvoeren
+Name[nn]=Køyr i konsoll
 Name[pa]=ਕੰਨਸੋਲ ਵਿੱਚ ਚਲਾਓ
 Name[pl]=Uruchom w konsoli
 Name[pt]=Executar no Konsole

desktop/org.kde.konsole.desktop

@@ -216,6 +216,7 @@ Name[lt]=Atverti naujame lange
 Name[nb]=Åpne et nytt vindu
 Name[nds]=En nieg Finster opmaken
 Name[nl]=Een nieuw venster openen
+Name[nn]=Opna i nytt vindauge
 Name[pa]=ਨਵੀਂ ਵਿੰਡੋ ਖੋਲ੍ਹੋ
 Name[pl]=Otwórz nowe okno
 Name[pt]=Abrir uma Nova Janela