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/org.kde.konsole.desktop

@@ -252,6 +252,7 @@ Name[ko]=새 창 열기
 Name[lt]=Atverti naujame lange
 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
@@ -289,6 +290,7 @@ Name[ia]=Aperi un nove scheda
 Name[it]=Apri in una nuova scheda
 Name[ko]=새 탭 열기
 Name[nl]=Een nieuw tabblad openen
+Name[nn]=Opna ny fane
 Name[pl]=Otwórz nową kartę
 Name[pt]=Abrir uma Nova Página
 Name[pt_BR]=Abre uma nova aba