From a005e9b74675007c3c0d5714e767702852afd666 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 24 Mar 2022 01:50:51 +0000 Subject: [PATCH] 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 | 1 + quicksettings/audio/metadata.desktop | 1 + quicksettings/bluetooth/metadata.desktop | 1 + quicksettings/caffeine/metadata.desktop | 1 + quicksettings/settingsapp/metadata.desktop | 1 + quicksettings/wifi/metadata.desktop | 1 + 6 files changed, 6 insertions(+) diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop index 4f5a2c21..2f8c39fe 100644 --- a/kcms/mobileshell/package/metadata.desktop +++ b/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 diff --git a/quicksettings/audio/metadata.desktop b/quicksettings/audio/metadata.desktop index 190c4e77..27e33644 100644 --- a/quicksettings/audio/metadata.desktop +++ b/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 diff --git a/quicksettings/bluetooth/metadata.desktop b/quicksettings/bluetooth/metadata.desktop index f5c13c76..36ad6f75 100644 --- a/quicksettings/bluetooth/metadata.desktop +++ b/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 diff --git a/quicksettings/caffeine/metadata.desktop b/quicksettings/caffeine/metadata.desktop index 98b2a56c..1471c53d 100644 --- a/quicksettings/caffeine/metadata.desktop +++ b/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 diff --git a/quicksettings/settingsapp/metadata.desktop b/quicksettings/settingsapp/metadata.desktop index 76d17c5f..798e68e2 100644 --- a/quicksettings/settingsapp/metadata.desktop +++ b/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 diff --git a/quicksettings/wifi/metadata.desktop b/quicksettings/wifi/metadata.desktop index b1d10849..ef8cd1f8 100644 --- a/quicksettings/wifi/metadata.desktop +++ b/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