From 37a1aefed365c536e5bcd168d0b41721794b6f3e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 12 Mar 2025 01:31:07 +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 5198130a..b827aada 100644 --- a/initialstart/modules/systemnavigation/metadata.json +++ b/initialstart/modules/systemnavigation/metadata.json @@ -50,6 +50,7 @@ "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[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", "Description[ka]": "Plasma Mobile-ის სისტემაში ნავიგაციის სწრაფი გაშვების მოდული", "Description[nl]": "Systeemnavigatie initiële startmodule voor Plasma Mobile", @@ -66,6 +67,7 @@ "Name[es]": "Navegación del sistema", "Name[fr]": "Système de navigation", "Name[he]": "ניווט במערכת", + "Name[ia]": "Systema de Navigation", "Name[it]": "Navigazione del sistema", "Name[ka]": "ნავიგაცია სისტემაში", "Name[nl]": "Systeemnavigatie",