From 51f24b694849b7fec1526be7d2f37db47155abdd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 7 Sep 2025 01:34:50 +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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kcms/navigation/kcm_navigation.json b/kcms/navigation/kcm_navigation.json index 5861a1de..39cbf4c2 100644 --- a/kcms/navigation/kcm_navigation.json +++ b/kcms/navigation/kcm_navigation.json @@ -3,11 +3,13 @@ "Authors": [ { "Email": "luis.buechi@kdemail.net", - "Name": "Luis Büchi" + "Name": "Luis Büchi", + "Name[x-test]": "xxLuis Büchixx" } ], "Category": "System Information", "Description": "Configure System Navigation", + "Description[x-test]": "xxConfigure System Navigationxx", "EnabledByDefault": true, "FormFactors": [ "desktop", @@ -18,8 +20,10 @@ "Icon": "preferences-desktop-gestures-touch", "License": "GPL", "Name": "Navigation", + "Name[x-test]": "xxNavigationxx", "Website": "https://plasma-mobile.org/" }, "X-KDE-Keywords": "system,shell,panel,navigation,gesture", + "X-KDE-Keywords[x-test]": "xxsystemxx,xxshellxx,xxpanelxx,xxnavigationxx,xxgesturexx", "X-KDE-System-Settings-Parent-Category": "personalization" }