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

@@ -8,6 +8,7 @@ Name[fr]=Mode Avion
 Name[ia]=Modo aeroplano
 Name[nl]=Vliegtuigmodus
 Name[nn]=Flymodus
+Name[pa]=ਏਅਰਪਲੇਨ ਮੋਡ
 Name[pl]=Tryb samolotowy
 Name[pt_BR]=Modo avião
 Name[ru]=Режим полёта

quicksettings/nightcolor/metadata.desktop

@@ -12,6 +12,7 @@ Name[it]=Colore notturno
 Name[ko]=야간 색상
 Name[nl]=Nachtkleur
 Name[nn]=Nattfargar
+Name[pa]=ਰਾਤ ਦੇ ਰੰਗ
 Name[pl]=Barwy nocne
 Name[pt]=Cor Nocturna
 Name[pt_BR]=Cor noturna