From a71687c1ee1a6452e7d2ddca95ae711ef890255b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 4 Apr 2025 01:31:32 +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 123235f5..b22157ea 100644 --- a/initialstart/modules/systemnavigation/metadata.json +++ b/initialstart/modules/systemnavigation/metadata.json @@ -49,6 +49,7 @@ "Description[ca]": "Mòdul de començament inicial de navegació del sistema per al Plasma Mobile", "Description[eo]": "Sistemnaviga prakomenca modulo por Plasma Mobile", "Description[es]": "Módulo de navegación del sistema del primer inicio para Plasma Mobile", + "Description[fi]": "Järjestelmänavigoinnin pika-aloitusmoduuli Plasma Mobileen", "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]": "מודול להפעלה ראשונית של ניווט במערכת לפלזמה לניידים", @@ -68,6 +69,7 @@ "Name[ca@valencia]": "Navegueu pel sistema", "Name[ca]": "Navegació del sistema", "Name[es]": "Navegación del sistema", + "Name[fi]": "Järjestelmänavigointi", "Name[fr]": "Système de navigation", "Name[gl]": "Navegación do sistema", "Name[he]": "ניווט במערכת",