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"

kcms/mobileshell/package/metadata.desktop

@@ -18,6 +18,7 @@ Name[ia]=Shell
 Name[ko]=셸
 Name[nl]=Shell
 Name[nn]=Skal
+Name[pt]=Consola
 Name[pt_BR]=Shell
 Name[ro]=Interpretor
 Name[sl]=Shell

quicksettings/audio/metadata.desktop

@@ -8,6 +8,7 @@ Name[ca@valencia]=Àudio
 Name[es]=Sonido
 Name[fr]=Audio
 Name[nl]=Audio
+Name[pt]=Áudio
 Name[sl]=Zvok
 Name[sv]=Ljud
 Name[tr]=Ses

quicksettings/bluetooth/metadata.desktop

@@ -8,6 +8,7 @@ Name[ca@valencia]=Bluetooth
 Name[es]=Bluetooth
 Name[fr]=Bluetooth
 Name[nl]=Bluetooth
+Name[pt]=Bluetooth
 Name[sl]=Bluetooth
 Name[sv]=Blåtand
 Name[tr]=Bluetooth

quicksettings/caffeine/metadata.desktop

@@ -18,6 +18,7 @@ Name[ia]=Caffeine
 Name[ko]=카페인
 Name[nl]=Cafeïne
 Name[nn]=Caffeine
+Name[pt]=Cafeína
 Name[pt_BR]=Cafeína
 Name[ro]=Cafeină
 Name[sl]=Caffeine

quicksettings/settingsapp/metadata.desktop

@@ -8,6 +8,7 @@ Name[ca@valencia]=Configuració
 Name[es]=Preferencias
 Name[fr]=Configuration
 Name[nl]=Instellingen
+Name[pt]=Configuração
 Name[sl]=Nastavitve
 Name[sv]=Inställningar
 Name[tr]=Ayarlar

quicksettings/wifi/metadata.desktop

@@ -8,6 +8,7 @@ Name[ca@valencia]=Wi-Fi
 Name[es]=Wifi
 Name[fr]=Wi-Fi
 Name[nl]=Wi-Fi
+Name[pt]=Wi-Fi
 Name[sl]=Wi-Fi
 Name[sv]=Wifi
 Name[tr]=Wi-Fi