From 6fe1c74947fcc9e6170ca1b3028a7786e21222ab Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 17 Mar 2023 02:54:12 +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/cellularnetwork/kcm_cellular_network.json | 2 ++ kcms/hotspot/kcm_mobile_hotspot.json | 5 +++++ kcms/info/kcm_mobile_info.json | 2 ++ kcms/powermanagement/kcm_mobile_power.json | 2 ++ kcms/time/clockconfig_actions.actions | 3 +++ kcms/time/kcm_mobile_time.json | 2 ++ kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json | 2 ++ kcms/wifi/kcm_mobile_wifi.json | 2 ++ kwin/mobiletaskswitcher/metadata.json | 2 ++ look-and-feel/metadata.json | 3 +++ quicksettings/hotspot/metadata.json | 3 +++ 11 files changed, 28 insertions(+) diff --git a/kcms/cellularnetwork/kcm_cellular_network.json b/kcms/cellularnetwork/kcm_cellular_network.json index 332db38d..6c7f3ed8 100644 --- a/kcms/cellularnetwork/kcm_cellular_network.json +++ b/kcms/cellularnetwork/kcm_cellular_network.json @@ -7,6 +7,7 @@ "Description[en_GB]": "Management of cellular networks", "Description[es]": "Gestión de redes móviles", "Description[fr]": "Gestion de réseaux cellulaires", + "Description[ia]": "Gestion de retes cellular", "Description[ka]": "ფიჭური ქსელების მართვა", "Description[nl]": "Beheer van cellulaire netwerken", "Description[sl]": "Upravljanje celičnih omrežij", @@ -25,6 +26,7 @@ "Name[en_GB]": "Cellular Network", "Name[es]": "Red móvil", "Name[fr]": "Réseau cellulaire", + "Name[ia]": "Rete Cellular", "Name[ka]": "ფიჭური ქსელი", "Name[nl]": "Cellulair netwerk", "Name[sl]": "Celično omrežje", diff --git a/kcms/hotspot/kcm_mobile_hotspot.json b/kcms/hotspot/kcm_mobile_hotspot.json index 3e691ed6..06f3d960 100644 --- a/kcms/hotspot/kcm_mobile_hotspot.json +++ b/kcms/hotspot/kcm_mobile_hotspot.json @@ -7,6 +7,8 @@ "Name[ca@valencia]": "Tobias Fella", "Name[ca]": "Tobias Fella", "Name[es]": "Tobias Fella", + "Name[fr]": "Tobias Fella", + "Name[ia]": "Tobias Fella", "Name[ka]": "Tobias Fella", "Name[nl]": "Tobias Fella", "Name[sl]": "Tobias Fella", @@ -20,6 +22,8 @@ "Description[ca@valencia]": "Punt d'accés Wi-Fi", "Description[ca]": "Punt d'accés Wi-Fi", "Description[es]": "Punto de acceso wifi", + "Description[fr]": "Points d'accès Wifi", + "Description[ia]": "Hotspots de Wi-Fi", "Description[ka]": "Wi-Fi ჰოტსპოტი", "Description[nl]": "Wi-Fi-hotspot", "Description[sl]": "Wi-Fi vroča točka", @@ -44,6 +48,7 @@ "Name[eu]": "Berogunea", "Name[fi]": "Tukiasema", "Name[fr]": "Points d'accès", + "Name[ia]": "Hotspot", "Name[it]": "Hotspot", "Name[ka]": "ჰოტსპოტი", "Name[nl]": "Hotspot", diff --git a/kcms/info/kcm_mobile_info.json b/kcms/info/kcm_mobile_info.json index edfab03c..85e922a0 100644 --- a/kcms/info/kcm_mobile_info.json +++ b/kcms/info/kcm_mobile_info.json @@ -7,6 +7,7 @@ "Description[en_GB]": "Software Versions", "Description[es]": "Versiones de software", "Description[fr]": "Versions de logiciels", + "Description[ia]": "Versiones de software", "Description[ka]": "პროგრამების ვერსიები", "Description[nl]": "Softwareversies", "Description[sl]": "Verzije programja", @@ -25,6 +26,7 @@ "Name[en_GB]": "Information", "Name[es]": "Información", "Name[fr]": "Informations", + "Name[ia]": "Information", "Name[ka]": "ინფორმაცია", "Name[nl]": "Informatie", "Name[sl]": "Informacije", diff --git a/kcms/powermanagement/kcm_mobile_power.json b/kcms/powermanagement/kcm_mobile_power.json index f90d0b64..3d4b0be6 100644 --- a/kcms/powermanagement/kcm_mobile_power.json +++ b/kcms/powermanagement/kcm_mobile_power.json @@ -7,6 +7,7 @@ "Description[en_GB]": "Configure power management settings", "Description[es]": "Configurar las preferencias de la gestión de energía", "Description[fr]": "Configurer les paramètres de gestion de l'énergie", + "Description[ia]": "Configura preferentias de gestion de energia", "Description[ka]": "ენერგიის მართვის პარამეტრების კონფიგურაცია", "Description[nl]": "Energie-instellingen configureren", "Description[sl]": "Konfiguriraj nastavitve upravljanja z energijo", @@ -25,6 +26,7 @@ "Name[en_GB]": "Energy", "Name[es]": "Energía", "Name[fr]": "Énergie", + "Name[ia]": "Energia", "Name[ka]": "ენერგია", "Name[nl]": "Energie", "Name[sl]": "Energija", diff --git a/kcms/time/clockconfig_actions.actions b/kcms/time/clockconfig_actions.actions index d1af5f75..2d8cf8a3 100644 --- a/kcms/time/clockconfig_actions.actions +++ b/kcms/time/clockconfig_actions.actions @@ -9,6 +9,7 @@ Name[ca@valencia]=Mòdul de control de la data i hora Name[en_GB]=Date and Time Control Module Name[es]=Módulo de control de fecha y hora Name[fr]=Module de contrôle de la date et de l'heure +Name[ia]=Modulo de controlo de data e tempore Name[ka]=თარიღისა და დროის კონტროლის მოდული Name[nl]=Controlemodule van datum en tijd Name[sl]=Kontrolni modul datuma in časa @@ -24,6 +25,7 @@ Name[ca@valencia]=Guarda la configuració de la data i hora Name[en_GB]=Save the date/time settings Name[es]=Guardar las preferencias de fecha y hora Name[fr]=Enregistrer la configuration pour la date et l'heure +Name[ia]=Salveguarda le preferentias de data & tempore Name[ka]=თარიღის/დროის პარამეტრების შენახვა Name[nl]=Datum- en tijdinstellingen opslaan Name[sl]=Shrani nastavitve datuma in časa @@ -36,6 +38,7 @@ Description[ca@valencia]=Les polítiques del sistema impedixen que guardeu la co Description[en_GB]=System policies prevent you from saving the date/time settings. Description[es]=Las políticas del sistema le impiden guardar las preferencias de fecha y hora. Description[fr]=La politique du système vous empêche d’enregistrer la configuration pour la date et l'heure. +Description[ia]=Le politicas de systema preveni te ex salveguardar le preferentias de tempore/data. Description[ka]=სისტემის წესები გიკრძალავთ დროის/თარიღის პარამეტრების შენახვას. Description[nl]=Systeembeleid voorkwam dat u de datum- en tijdinstellingen kon opslaan. Description[sl]=Sistemska politika vam preprečuje shranjevanje nastavitev datuma in časa. diff --git a/kcms/time/kcm_mobile_time.json b/kcms/time/kcm_mobile_time.json index ff3fe6d5..70b2fe51 100644 --- a/kcms/time/kcm_mobile_time.json +++ b/kcms/time/kcm_mobile_time.json @@ -7,6 +7,7 @@ "Description[en_GB]": "Timezone, Date Display", "Description[es]": "Zona horaria, visor de la fecha", "Description[fr]": "Affichage du fuseau horaire et de la date", + "Description[ia]": "Fuso horari, Monstrator de Data", "Description[ka]": "დროის სარტყელი, თარიღის ჩვენება", "Description[nl]": "Tijdzone, datumweergave", "Description[sl]": "Časovni pas, prikaz datuma", @@ -25,6 +26,7 @@ "Name[en_GB]": "Time and Date", "Name[es]": "Fecha y hora", "Name[fr]": "Date et heure", + "Name[ia]": "Hora e data", "Name[ka]": "თარიღი და დრო", "Name[nl]": "Tijd en datum", "Name[sl]": "Čas in datum", diff --git a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json index fddb2289..7db779b4 100644 --- a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json +++ b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json @@ -39,6 +39,7 @@ "Description[en_GB]": "On-Screen Keyboard configuration", "Description[es]": "Configuración del teclado en pantalla", "Description[fr]": "Configuration du clavier en incrustation vidéo", + "Description[ia]": "Configuration de Claviero sur le schermo", "Description[ka]": "კლავიატურის კრანზე მორგება", "Description[nl]": "Configuratie van toetsenbord op het scherm", "Description[sl]": "Konfiguracija zaslonske tipkovnice", @@ -57,6 +58,7 @@ "Name[en_GB]": "On-Screen Keyboard", "Name[es]": "Teclado en pantalla", "Name[fr]": "Clavier en incrustation vidéo", + "Name[ia]": "Claviero sur schermo", "Name[ka]": "ეკრანის კლავიატურა", "Name[nl]": "Toetsenbord op scherm", "Name[sl]": "Zaslonska tipkovnica", diff --git a/kcms/wifi/kcm_mobile_wifi.json b/kcms/wifi/kcm_mobile_wifi.json index 73ec92a2..3078989e 100644 --- a/kcms/wifi/kcm_mobile_wifi.json +++ b/kcms/wifi/kcm_mobile_wifi.json @@ -5,6 +5,8 @@ "Description[ca@valencia]": "Configureu la xarxa sense fil", "Description[ca]": "Configuració de la xarxa sense fil", "Description[es]": "Preferencias de la red inalámbrica", + "Description[fr]": "Configuration des réseaux sans fil", + "Description[ia]": "Preferentia de rete sin cablos", "Description[ka]": "უსადენო ქსელის მორგება", "Description[nl]": "Instelling van draadloos netwerk", "Description[sl]": "Nastavitve brezžičnega omrežja", diff --git a/kwin/mobiletaskswitcher/metadata.json b/kwin/mobiletaskswitcher/metadata.json index 7cac43f3..df7783bf 100644 --- a/kwin/mobiletaskswitcher/metadata.json +++ b/kwin/mobiletaskswitcher/metadata.json @@ -5,6 +5,7 @@ "Description[ca@valencia]": "Us permet canviar entre les tasques diferents en execució amb una interfície mòbil.", "Description[ca]": "Us permet canviar entre les tasques diferents en execució amb una interfície mòbil.", "Description[es]": "Le permite cambiar entre tareas en ejecución con una interfaz móvil.", + "Description[fr]": "Vous permet de basculer entre des tâches en exécution avec une interface pour périphérique mobile.", "Description[ka]": "საშუალებას გაძლევთ მობილურ ინტერფეისში გაშვებულ ამოცანებს შორის გადაერთოთ.", "Description[nl]": "Biedt u het omschakelen tussen actieve taken met een mobiel-interface.", "Description[sl]": "Dovoljuje preklapljanje med tekočimi opravili z mobilnim vmesnikom.", @@ -18,6 +19,7 @@ "Name[ca@valencia]": "Commutador de tasques del mòbil", "Name[ca]": "Commutador de tasques del mòbil", "Name[es]": "Selector de tareas móvil", + "Name[fr]": "Commutateur de tâches pour périphérique mobile", "Name[ka]": "მობილური ამოცანების გადამრთველი", "Name[nl]": "Taakschakelaar van mobiel", "Name[sl]": "Preklopnik mobilnih opravil", diff --git a/look-and-feel/metadata.json b/look-and-feel/metadata.json index 6b6092f6..43c01f53 100644 --- a/look-and-feel/metadata.json +++ b/look-and-feel/metadata.json @@ -13,6 +13,7 @@ "Name[eu]": "KDE Ikus-diseinu taldea", "Name[fi]": "KDE:n visuaalinen suunnitteluryhmä", "Name[fr]": "Groupe de conception graphique de KDE", + "Name[ia]": "KDE Visual Design Group (Gruppo de Designo Visual de KDE)", "Name[it]": "KDE Visual Design Group", "Name[ka]": "KDE-ის ვიზუალური დიზაინის ჯგუფი", "Name[nl]": "KDE Visuele ontwerpgroep", @@ -33,6 +34,7 @@ "Description[eu]": "Plasma gailu mugikorretarako", "Description[fi]": "Plasma mobiililaitteille", "Description[fr]": "Plasma pour périphériques mobiles", + "Description[ia]": "Plasma per dispositivos mobile", "Description[it]": "Plasma per dispositivi mobili", "Description[ka]": "Plasma მობილური მოწყობილობებისთვის", "Description[nl]": "Plasma voor mobiele apparaten", @@ -52,6 +54,7 @@ "Name[eu]": "Plasma Mugikorra Breeze", "Name[fi]": "Plasma Mobilen Breeze", "Name[fr]": "Thème « Breeze » pour Plasma Mobile", + "Name[ia]": "Breeze de Plasma Mobile", "Name[it]": "Brezza per Plasma Mobile", "Name[ka]": "Plasma მობილური ნიავი", "Name[nl]": "Plasma Mobile Breeze", diff --git a/quicksettings/hotspot/metadata.json b/quicksettings/hotspot/metadata.json index d77d015f..1d440b17 100644 --- a/quicksettings/hotspot/metadata.json +++ b/quicksettings/hotspot/metadata.json @@ -13,6 +13,7 @@ "Name[eu]": "Yari Polla", "Name[fi]": "Yari Polla", "Name[fr]": "Yari Polla", + "Name[ia]": "Yari Polla", "Name[it]": "Yari Polla", "Name[ka]": "Yari Polla", "Name[nl]": "Yari Polla", @@ -32,6 +33,7 @@ "Description[eu]": "Berogunearen ezarpen azkarra Plasma Mugikorrerako", "Description[fi]": "Tukiaseman pika-asetus Plasma Mobileen", "Description[fr]": "Configuration rapide pour les points d'accès sous Plasma Mobile", + "Description[ia]": "Preferentia rapide de hotspot per Plasma Mobile", "Description[it]": "Impostazione rapida dell'hotspot per Plasma Mobile", "Description[ka]": "ჰოტსპოტის სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის", "Description[nl]": "Hotspot snelle instelling voor Plasma Mobile", @@ -52,6 +54,7 @@ "Name[eu]": "Berogunea", "Name[fi]": "Tukiasema", "Name[fr]": "Points d'accès", + "Name[ia]": "Hotspot", "Name[it]": "Hotspot", "Name[ka]": "ჰოტსპოტი", "Name[nl]": "Hotspot",