marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2025-09-07 01:34:50 +00:00
parent 339cec2b8a
commit 51f24b6948
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kcms/navigation/kcm_navigation.json
View file

@ -3,11 +3,13 @@
"Authors": [ "Authors": [
{ {
"Email": "luis.buechi@kdemail.net", "Email": "luis.buechi@kdemail.net",
"Name": "Luis Büchi" "Name": "Luis Büchi",
"Name[x-test]": "xxLuis Büchixx"
} }
], ],
"Category": "System Information", "Category": "System Information",
"Description": "Configure System Navigation", "Description": "Configure System Navigation",
"Description[x-test]": "xxConfigure System Navigationxx",
"EnabledByDefault": true, "EnabledByDefault": true,
"FormFactors": [ "FormFactors": [
"desktop", "desktop",
@ -18,8 +20,10 @@
"Icon": "preferences-desktop-gestures-touch", "Icon": "preferences-desktop-gestures-touch",
"License": "GPL", "License": "GPL",
"Name": "Navigation", "Name": "Navigation",
"Name[x-test]": "xxNavigationxx",
"Website": "https://plasma-mobile.org/" "Website": "https://plasma-mobile.org/"
}, },
"X-KDE-Keywords": "system,shell,panel,navigation,gesture", "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" "X-KDE-System-Settings-Parent-Category": "personalization"
} }