From 903a9447bb8527e27b4bdce6393f143bd4b24d61 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 7 Jun 2025 01:33:02 +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" --- initialstart/modules/systemnavigation/metadata.json | 2 ++ quicksettings/airplanemode/metadata.json | 2 +- quicksettings/audio/metadata.json | 2 +- quicksettings/autohidepanels/metadata.json | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/initialstart/modules/systemnavigation/metadata.json b/initialstart/modules/systemnavigation/metadata.json index c7fb93e3..3a40424b 100644 --- a/initialstart/modules/systemnavigation/metadata.json +++ b/initialstart/modules/systemnavigation/metadata.json @@ -55,6 +55,7 @@ "Description[fr]": "Module de démarrage initial pour le système de navigation pour Plasma Mobile", "Description[gl]": "Módulo de inicio de navegación do sistema para Plasma Mobile.", "Description[he]": "מודול להפעלה ראשונית של ניווט במערכת לפלזמה לניידים", + "Description[hu]": "Rendszernavigáció elsőindítás modul a Plasma Mobile-hoz", "Description[ia]": "Modulo initialstart de Systema de Navigation per Plasma Mobile", "Description[is]": "initialstart-eining kerfisskoðunar fyrir Plasma Mobile", "Description[it]": "Modulo di avvio iniziale della navigazione del sistema per Plasma Mobile", @@ -81,6 +82,7 @@ "Name[fr]": "Système de navigation", "Name[gl]": "Navegación do sistema", "Name[he]": "ניווט במערכת", + "Name[hu]": "Rendszernavigáció", "Name[ia]": "Systema de Navigation", "Name[is]": "Flakk um skráakerfi", "Name[it]": "Navigazione del sistema", diff --git a/quicksettings/airplanemode/metadata.json b/quicksettings/airplanemode/metadata.json index c2053ab5..bcd1f5f5 100644 --- a/quicksettings/airplanemode/metadata.json +++ b/quicksettings/airplanemode/metadata.json @@ -58,7 +58,7 @@ "Description[fr]": "Configuration rapide du mode « Avion » pour Plasma Mobile", "Description[gl]": "Opción rápida de modo avión para Plasma Mobile.", "Description[he]": "הגדרה מהירה למצב טיסה לפלזמה לניידים", - "Description[hu]": "Repülős üzemmód gyorsbeállítása a Plasma Mobile-hoz", + "Description[hu]": "Repülős üzemmód gyorsbeállítás a Plasma Mobile-hoz", "Description[ia]": "Preferentia rapide de modo eroplano per Plasma Mobile", "Description[is]": "Flýtiflugstilling fyrir Plasma Mobile", "Description[it]": "Impostazione rapida della modalità aereo per Plasma Mobile", diff --git a/quicksettings/audio/metadata.json b/quicksettings/audio/metadata.json index 2947b9b9..a8954534 100644 --- a/quicksettings/audio/metadata.json +++ b/quicksettings/audio/metadata.json @@ -57,7 +57,7 @@ "Description[fr]": "Configuration rapide de l'audio pour Plasma Mobile", "Description[gl]": "Opción rápida de son para Plasma Mobile.", "Description[he]": "הגדרה מהירה לשמע לפלזמה לניידים", - "Description[hu]": "Hang gyorsbeállítása a Plasma Mobile-hoz", + "Description[hu]": "Hang gyorsbeállítás a Plasma Mobile-hoz", "Description[ia]": "Preferentia rapide de Audio per Plasma Mobile", "Description[is]": "Flýtistilling hljóðs fyrir Plasma Mobile", "Description[it]": "Impostazioni audio rapide per Plasma Mobile", diff --git a/quicksettings/autohidepanels/metadata.json b/quicksettings/autohidepanels/metadata.json index 5cdb8a00..1aef17b4 100644 --- a/quicksettings/autohidepanels/metadata.json +++ b/quicksettings/autohidepanels/metadata.json @@ -14,6 +14,7 @@ "Name[fr]": "Micah Stanley", "Name[gl]": "Micah Stanley", "Name[he]": "מיקה סטנלי", + "Name[hu]": "Micah Stanley", "Name[ia]": "Micah Stanley", "Name[it]": "Micah Stanley", "Name[ka]": "Micah Stanley", @@ -37,6 +38,7 @@ "Description[fr]": "Configuration rapide pour le masquage automatique des panneaux de Plasma Mobile", "Description[gl]": "Opción rápida de agochar paneis automaticamente para Plasma Mobile.", "Description[he]": "הגדרות הסתרת לוחות אוטומטית מהירות לפלזמה לניידים", + "Description[hu]": "Panelek automatikus elrejtése gyorsbeállítás a Plasma Mobile-hoz", "Description[ia]": "Auto Cela Pannellos Preferentia rapide per Plasma Mobile", "Description[it]": "Impostazione rapida Nascondi automaticamente i pannelli per Plasma Mobile", "Description[ka]": "პანელების ავტოდამალვის სწრაფად დაყენება Plasma Mobile-სთვის", @@ -61,6 +63,7 @@ "Name[fr]": "Masquer automatiquement les panneaux", "Name[gl]": "Agochar os paneis automaticamente", "Name[he]": "הסתרת לוחות אוטומטית", + "Name[hu]": "Panelek automatikus elrejtése", "Name[ia]": "Auto-Cela Pannellos", "Name[it]": "Nascondi automaticamente i pannelli", "Name[ka]": "პანელების ავტომატური დამალვა",