From bfd43271777ad39e9b46bcaccdc4219ea17044a0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 20 Mar 2025 01:31:46 +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 ++ 1 file changed, 2 insertions(+) diff --git a/initialstart/modules/systemnavigation/metadata.json b/initialstart/modules/systemnavigation/metadata.json index 3a8bb7fc..d777bd29 100644 --- a/initialstart/modules/systemnavigation/metadata.json +++ b/initialstart/modules/systemnavigation/metadata.json @@ -50,6 +50,7 @@ "Description[eo]": "Sistemnaviga prakomenca modulo por Plasma Mobile", "Description[es]": "Módulo de navegación del sistema del primer inicio para Plasma Mobile", "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[ia]": "Modulo initialstart de Systema de Navigation per Plasma Mobile", "Description[it]": "Modulo di avvio iniziale della navigazione del sistema per Plasma Mobile", @@ -67,6 +68,7 @@ "Name[ca]": "Navegació del sistema", "Name[es]": "Navegación del sistema", "Name[fr]": "Système de navigation", + "Name[gl]": "Navegación do sistema", "Name[he]": "ניווט במערכת", "Name[ia]": "Systema de Navigation", "Name[it]": "Navigazione del sistema",