From aa5b483bf2636e50228c383786339a2aae00d52b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Sep 2025 01:38:17 +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/navigation/kcm_navigation.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kcms/navigation/kcm_navigation.json b/kcms/navigation/kcm_navigation.json index a0a6aba1..906e7e9d 100644 --- a/kcms/navigation/kcm_navigation.json +++ b/kcms/navigation/kcm_navigation.json @@ -9,6 +9,7 @@ "Name[ca]": "Luis Büchi", "Name[es]": "Luis Büchi", "Name[eu]": "Luis Büchi", + "Name[fi]": "Luis Büchi", "Name[fr]": "Luis Büchi", "Name[he]": "לואי ביושי", "Name[is]": "Luis Büchi", @@ -29,6 +30,7 @@ "Description[ca]": "Configura la navegació del sistema", "Description[es]": "Configurar la navegación del sistema", "Description[eu]": "Konfiguratu sistemaren nabigazioa", + "Description[fi]": "Järjestelmänavigointiasetukset", "Description[fr]": "Configurer le système de navigation", "Description[he]": "הגדרת ניווט במערכת", "Description[is]": "Grunnstilla flakk um skráakerfi", @@ -53,6 +55,7 @@ "Name[ca]": "Navegació", "Name[es]": "Navegación", "Name[eu]": "Nabigazioa", + "Name[fi]": "Navigointi", "Name[fr]": "Système de navigation", "Name[he]": "ניווט", "Name[is]": "Flakk", @@ -72,6 +75,7 @@ "X-KDE-Keywords[ca]": "sistema,intèrpret d'ordres,plafó,navegació,gest", "X-KDE-Keywords[es]": "sistema,intérprete,intérprete de órdenes,panel,navegación,gestos", "X-KDE-Keywords[eu]": "sistema,shell,oskola,panela,nabigazioa,keinua", + "X-KDE-Keywords[fi]": "järjestelmä,komentotulkki,paneeli,navigointi,ele,eleet", "X-KDE-Keywords[fr]": "système, shell, panneau, navigation, geste", "X-KDE-Keywords[he]": "מערכת,מעטפת,של,שאל,לוח,פאנל,מחווה,תנועת עכבר", "X-KDE-Keywords[is]": "kerfi,skel,sphald,flakk,hreyfiskipun",