From 03f3411c9a3fde016e9ba8eb06006f210e049e8e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 Apr 2022 01:49:56 +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" --- quicksettings/audio/metadata.desktop | 2 ++ quicksettings/battery/metadata.desktop | 2 ++ quicksettings/bluetooth/metadata.desktop | 2 ++ quicksettings/flashlight/package/metadata.desktop | 1 + quicksettings/location/metadata.desktop | 2 ++ quicksettings/mobiledata/metadata.desktop | 1 + quicksettings/screenrotation/package/metadata.desktop | 1 + quicksettings/screenshot/package/metadata.desktop | 2 ++ quicksettings/settingsapp/metadata.desktop | 2 ++ quicksettings/wifi/metadata.desktop | 2 ++ 10 files changed, 17 insertions(+) diff --git a/quicksettings/audio/metadata.desktop b/quicksettings/audio/metadata.desktop index 27dbb129..bb87377c 100644 --- a/quicksettings/audio/metadata.desktop +++ b/quicksettings/audio/metadata.desktop @@ -6,6 +6,7 @@ Name=Audio Name[az]=Səs Name[ca]=Àudio Name[ca@valencia]=Àudio +Name[cs]=Audio Name[en_GB]=Audio Name[es]=Sonido Name[fr]=Audio @@ -13,6 +14,7 @@ Name[it]=Audio Name[nl]=Audio Name[pt]=Áudio Name[pt_BR]=Áudio +Name[ro]=Audio Name[sl]=Zvok Name[sv]=Ljud Name[tr]=Ses diff --git a/quicksettings/battery/metadata.desktop b/quicksettings/battery/metadata.desktop index 282ef8c5..b05d54c2 100644 --- a/quicksettings/battery/metadata.desktop +++ b/quicksettings/battery/metadata.desktop @@ -6,6 +6,7 @@ Name=Battery Name[az]=Batareya Name[ca]=Bateria Name[ca@valencia]=Bateria +Name[cs]=Baterie Name[en_GB]=Battery Name[es]=Batería Name[fr]=Batterie @@ -13,6 +14,7 @@ Name[it]=Batteria Name[nl]=Batterij Name[pt]=Bateria Name[pt_BR]=Bateria +Name[ro]=Acumulator Name[sl]=Baterija Name[sv]=Batteri Name[tr]=Pil diff --git a/quicksettings/bluetooth/metadata.desktop b/quicksettings/bluetooth/metadata.desktop index be243a1d..b118783c 100644 --- a/quicksettings/bluetooth/metadata.desktop +++ b/quicksettings/bluetooth/metadata.desktop @@ -6,6 +6,7 @@ Name=Bluetooth Name[az]=Bluetooth Name[ca]=Bluetooth Name[ca@valencia]=Bluetooth +Name[cs]=Bluetooth Name[en_GB]=Bluetooth Name[es]=Bluetooth Name[fr]=Bluetooth @@ -13,6 +14,7 @@ Name[it]=Bluetooth Name[nl]=Bluetooth Name[pt]=Bluetooth Name[pt_BR]=Bluetooth +Name[ro]=Bluetooth Name[sl]=Bluetooth Name[sv]=Blåtand Name[tr]=Bluetooth diff --git a/quicksettings/flashlight/package/metadata.desktop b/quicksettings/flashlight/package/metadata.desktop index 63a13c32..621aef1f 100644 --- a/quicksettings/flashlight/package/metadata.desktop +++ b/quicksettings/flashlight/package/metadata.desktop @@ -13,6 +13,7 @@ Name[it]=Torcia Name[nl]=Zaklamp Name[pt]=Luz de Flash Name[pt_BR]=Lanterna +Name[ro]=Lanternă Name[sl]=Svetilka Name[sv]=Ficklampa Name[tr]=El Feneri diff --git a/quicksettings/location/metadata.desktop b/quicksettings/location/metadata.desktop index b3003899..be73531f 100644 --- a/quicksettings/location/metadata.desktop +++ b/quicksettings/location/metadata.desktop @@ -6,6 +6,7 @@ Name=Location Name[az]=Məkan Name[ca]=Ubicació Name[ca@valencia]=Ubicació +Name[cs]=Umístění Name[en_GB]=Location Name[es]=Ubicación Name[fr]=Localisation @@ -13,6 +14,7 @@ Name[it]=Posizione Name[nl]=Locatie Name[pt]=Localização Name[pt_BR]=Localização +Name[ro]=Localizare Name[sl]=Lokacija Name[sv]=Plats Name[tr]=Konum diff --git a/quicksettings/mobiledata/metadata.desktop b/quicksettings/mobiledata/metadata.desktop index 7e49022a..9c53c499 100644 --- a/quicksettings/mobiledata/metadata.desktop +++ b/quicksettings/mobiledata/metadata.desktop @@ -13,6 +13,7 @@ Name[it]=Dati mobili Name[nl]=Mobiele gegevens Name[pt]=Dados Móveis Name[pt_BR]=Dados móveis +Name[ro]=Date mobile Name[sl]=Mobilni podatki Name[sv]=Mobildata Name[tr]=Mobil veri diff --git a/quicksettings/screenrotation/package/metadata.desktop b/quicksettings/screenrotation/package/metadata.desktop index a139ec0f..fef90aec 100644 --- a/quicksettings/screenrotation/package/metadata.desktop +++ b/quicksettings/screenrotation/package/metadata.desktop @@ -13,6 +13,7 @@ Name[it]=Rotazione dello schermo Name[nl]=Schermrotatie Name[pt]=Rotação do ecrã Name[pt_BR]=Rotação da tela +Name[ro]=Rotirea ecranului Name[sl]=Sukanje zaslona Name[sv]=Skärmrotation Name[tr]=Ekran döndürme diff --git a/quicksettings/screenshot/package/metadata.desktop b/quicksettings/screenshot/package/metadata.desktop index 9d38e33f..73af0154 100644 --- a/quicksettings/screenshot/package/metadata.desktop +++ b/quicksettings/screenshot/package/metadata.desktop @@ -6,6 +6,7 @@ Name=Screenshot Name[az]=Ekran şəkli Name[ca]=Captura de pantalla Name[ca@valencia]=Captura de pantalla +Name[cs]=Snímek obrazovky Name[en_GB]=Screenshot Name[es]=Captura de pantalla Name[fr]=Copie d'écran @@ -13,6 +14,7 @@ Name[it]=Schermata Name[nl]=Schermafdruk Name[pt]=Captura Name[pt_BR]=Captura de tela +Name[ro]=Captură de ecran Name[sl]=Slika zaslona Name[sv]= Skärmbild Name[tr]=Ekran görüntüsü diff --git a/quicksettings/settingsapp/metadata.desktop b/quicksettings/settingsapp/metadata.desktop index aec9620a..1d322d30 100644 --- a/quicksettings/settingsapp/metadata.desktop +++ b/quicksettings/settingsapp/metadata.desktop @@ -6,6 +6,7 @@ Name=Settings Name[az]=Ayarlar Name[ca]=Configuració Name[ca@valencia]=Configuració +Name[cs]=Nastavení Name[en_GB]=Settings Name[es]=Preferencias Name[fr]=Configuration @@ -13,6 +14,7 @@ Name[it]=Impostazioni Name[nl]=Instellingen Name[pt]=Configuração Name[pt_BR]=Configurações +Name[ro]=Configurări Name[sl]=Nastavitve Name[sv]=Inställningar Name[tr]=Ayarlar diff --git a/quicksettings/wifi/metadata.desktop b/quicksettings/wifi/metadata.desktop index 00f7bf9a..4088dd9e 100644 --- a/quicksettings/wifi/metadata.desktop +++ b/quicksettings/wifi/metadata.desktop @@ -6,6 +6,7 @@ Name=Wi-Fi Name[az]=Wi-Fi Name[ca]=Wi-Fi Name[ca@valencia]=Wi-Fi +Name[cs]=Wi-Fi Name[en_GB]=Wi-Fi Name[es]=Wifi Name[fr]=Wi-Fi @@ -13,6 +14,7 @@ Name[it]=Wi-Fi Name[nl]=Wi-Fi Name[pt]=Wi-Fi Name[pt_BR]=Wi-Fi +Name[ro]=Wi-Fi Name[sl]=Wi-Fi Name[sv]=Wifi Name[tr]=Wi-Fi