From 720cb44e054bd8b0f482c6641cbc52350a8b57a4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Mar 2026 01:40:47 +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 456e8751..47ec52b9 100644 --- a/kcms/navigation/kcm_navigation.json +++ b/kcms/navigation/kcm_navigation.json @@ -18,6 +18,7 @@ "Name[it]": "Luis Büchi", "Name[ka]": "Luis Büchi", "Name[ko]": "Luis Büchi", + "Name[lv]": "Luis Büchi", "Name[nl]": "Luis Büchi", "Name[pt_BR]": "Luis Büchi", "Name[ru]": "Luis Büchi", @@ -45,6 +46,7 @@ "Description[it]": "Configura navigazione del sistema", "Description[ka]": "სისტემის ნავიგაციის მორგება", "Description[ko]": "시스템 탐색 설정", + "Description[lv]": "Konfigurēt sistēmas navigāciju", "Description[nl]": "Systeemnavigatie configureren", "Description[pt_BR]": "Configurar sistema de navegação", "Description[ru]": "Настройка навигации в системе", @@ -77,6 +79,7 @@ "Name[it]": "Navigazione", "Name[ka]": "ნავიგაცია", "Name[ko]": "탐색", + "Name[lv]": "Navigācija", "Name[nl]": "Navigatie", "Name[pt_BR]": "Navegação", "Name[ru]": "Навигация", @@ -103,6 +106,7 @@ "X-KDE-Keywords[it]": "sistema,shell,pannello,navigazione,gesto", "X-KDE-Keywords[ka]": "system,shell,panel,სისტემა,გარემო,პანელი,ჟესტი", "X-KDE-Keywords[ko]": "시스템,셸,패널,탐색,제스처", + "X-KDE-Keywords[lv]": "sistēma,čaula,panelis,navigācija, žests", "X-KDE-Keywords[nl]": "systeem,shell,paneel,navigatie,gebaar", "X-KDE-Keywords[pt_BR]": "sistema,shell,painel,navegação,gestos", "X-KDE-Keywords[ru]": "system,shell,panel,navigation,gesture,система,оболочка,панель,навигация,жесты",