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"

quicksettings/airplanemode/metadata.desktop

@@ -5,6 +5,7 @@ Name[es]=Modo avión
 Name[fr]=Mode Avion
 Name[ia]=Modo aeroplano
 Name[nl]=Vliegtuigmodus
+Name[nn]=Flymodus
 Name[sv]=Flygplansläge
 Name[uk]=Режим польоту
 Name[x-test]=xxAirplane Modexx

quicksettings/nightcolor/metadata.desktop

@@ -11,6 +11,7 @@ Name[ia]=Color de Nocte
 Name[it]=Colore notturno
 Name[ko]=야간 색상
 Name[nl]=Nachtkleur
+Name[nn]=Nattfargar
 Name[pl]=Barwy nocne
 Name[pt]=Cor Nocturna
 Name[pt_BR]=Cor noturna