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[is]=Opna nýjan glugga
 Name[it]=Apri in una nuova finestra
 Name[ko]=새 창 열기
 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
@@ -295,6 +296,7 @@ Name[hu]=Új lap megnyitása
 Name[ia]=Aperi un nove scheda
 Name[it]=Apri in una nuova scheda
 Name[ko]=새 탭 열기
+Name[nb]=Åpne en ny fane
 Name[nl]=Een nieuw tabblad openen
 Name[nn]=Opna ny fane
 Name[pl]=Otwórz nową kartę