From 606997be18f221eab748385dcd71f16857cdb847 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Jul 2022 01:50:33 +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/bluetooth/metadata.desktop | 1 + quicksettings/flashlight/package/metadata.desktop | 1 + quicksettings/mobiledata/metadata.desktop | 1 + quicksettings/screenrotation/package/metadata.desktop | 1 + quicksettings/settingsapp/metadata.desktop | 1 + quicksettings/wifi/metadata.desktop | 1 + 6 files changed, 6 insertions(+) diff --git a/quicksettings/bluetooth/metadata.desktop b/quicksettings/bluetooth/metadata.desktop index c683e0e2..52c1b64b 100644 --- a/quicksettings/bluetooth/metadata.desktop +++ b/quicksettings/bluetooth/metadata.desktop @@ -33,6 +33,7 @@ Description=Bluetooth quick setting Description[az]=Bluetooth sürətli ayarı Description[ca]=Configuració ràpida del Bluetooth Description[ca@valencia]=Configuració ràpida de Bluetooth +Description[cs]=Rychlé nastavení Bluetooth Description[en_GB]=Bluetooth quick setting Description[es]=Ajuste rápido del Bluetooth Description[fi]=Bluetoothin pika-asetus diff --git a/quicksettings/flashlight/package/metadata.desktop b/quicksettings/flashlight/package/metadata.desktop index 4c1169fb..e5c75694 100644 --- a/quicksettings/flashlight/package/metadata.desktop +++ b/quicksettings/flashlight/package/metadata.desktop @@ -6,6 +6,7 @@ Name=Flashlight Name[az]=Fənər Name[ca]=Llum de flaix Name[ca@valencia]=Llum de flaix +Name[cs]=Světlo Name[en_GB]=Flashlight Name[es]=Linterna Name[fi]=Taskulamppu diff --git a/quicksettings/mobiledata/metadata.desktop b/quicksettings/mobiledata/metadata.desktop index 724521b4..de686985 100644 --- a/quicksettings/mobiledata/metadata.desktop +++ b/quicksettings/mobiledata/metadata.desktop @@ -6,6 +6,7 @@ Name=Mobile Data Name[az]=Mobil internet Name[ca]=Dades mòbils Name[ca@valencia]=Dades mòbils +Name[cs]=Mobilní data Name[en_GB]=Mobile Data Name[es]=Datos móviles Name[fi]=Mobiilidata diff --git a/quicksettings/screenrotation/package/metadata.desktop b/quicksettings/screenrotation/package/metadata.desktop index 8f34ffe8..81553e11 100644 --- a/quicksettings/screenrotation/package/metadata.desktop +++ b/quicksettings/screenrotation/package/metadata.desktop @@ -6,6 +6,7 @@ Name=Screen rotation Name[az]=Ekran dönməsi Name[ca]=Gir de la pantalla Name[ca@valencia]=Gir de la pantalla +Name[cs]=Otáčení obrazovky Name[en_GB]=Screen rotation Name[es]=Rotación de la pantalla Name[fi]=Näytön kierto diff --git a/quicksettings/settingsapp/metadata.desktop b/quicksettings/settingsapp/metadata.desktop index 62cd44e0..38b6a0de 100644 --- a/quicksettings/settingsapp/metadata.desktop +++ b/quicksettings/settingsapp/metadata.desktop @@ -33,6 +33,7 @@ Description=Settings application quick setting Description[az]=Ayarlar tətbiqinin sürətli ayarı Description[ca]=Configuració ràpida de la configuració general Description[ca@valencia]=Configuració ràpida de la configuració general +Description[cs]=Rychlé nastavení aplikace Description[en_GB]=Settings application quick setting Description[es]=Ajuste rápido de la aplicación de preferencias Description[fi]=Asetussovelluksen pika-asetus diff --git a/quicksettings/wifi/metadata.desktop b/quicksettings/wifi/metadata.desktop index 9d670436..2efaaf94 100644 --- a/quicksettings/wifi/metadata.desktop +++ b/quicksettings/wifi/metadata.desktop @@ -33,6 +33,7 @@ Description=Wi-Fi quick setting Description[az]=Wi-Fi sürətli ayarı Description[ca]=Configuració ràpida de la Wi-Fi Description[ca@valencia]=Configuració ràpida de la Wi-Fi +Description[cs]=Rychlé nastavení WiFi Description[en_GB]=Wi-Fi quick setting Description[es]=Ajuste rápido del wifi Description[fi]=Langattoman verkon pika-asetus