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-10 01:35:56 +00:00
parent 625deeb11d
commit 5a36fa519c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcms/navigation/kcm_navigation.json
View file

@ -14,6 +14,7 @@
"Name[nl]": "Luis Büchi", "Name[nl]": "Luis Büchi",
"Name[pt_BR]": "Luis Büchi", "Name[pt_BR]": "Luis Büchi",
"Name[sl]": "Luis Büchi", "Name[sl]": "Luis Büchi",
"Name[sv]": "Luis Büchi",
"Name[tr]": "Luis Büchi", "Name[tr]": "Luis Büchi",
"Name[uk]": "Luis Büchi" "Name[uk]": "Luis Büchi"
} }
@ -30,6 +31,7 @@
"Description[nl]": "Systeemnavigatie configureren", "Description[nl]": "Systeemnavigatie configureren",
"Description[pt_BR]": "Configurar sistema de navegação", "Description[pt_BR]": "Configurar sistema de navegação",
"Description[sl]": "Konfiguriraj sistemsko navigacijo", "Description[sl]": "Konfiguriraj sistemsko navigacijo",
"Description[sv]": "Anpassa systemnavigering",
"Description[tr]": "Sistem dolaşımını yapılandırın", "Description[tr]": "Sistem dolaşımını yapılandırın",
"Description[uk]": "Налаштовування навігації системою", "Description[uk]": "Налаштовування навігації системою",
"EnabledByDefault": true, "EnabledByDefault": true,
@ -52,6 +54,7 @@
"Name[nl]": "Navigatie", "Name[nl]": "Navigatie",
"Name[pt_BR]": "Navegação", "Name[pt_BR]": "Navegação",
"Name[sl]": "Navigacija", "Name[sl]": "Navigacija",
"Name[sv]": "Navigering",
"Name[tr]": "Dolaşım", "Name[tr]": "Dolaşım",
"Name[uk]": "Навігація", "Name[uk]": "Навігація",
"Website": "https://plasma-mobile.org/" "Website": "https://plasma-mobile.org/"
@ -67,6 +70,7 @@
"X-KDE-Keywords[nl]": "systeem,shell,paneel,navigatie,gebaar", "X-KDE-Keywords[nl]": "systeem,shell,paneel,navigatie,gebaar",
"X-KDE-Keywords[pt_BR]": "sistema,shell,painel,navegação,gestos", "X-KDE-Keywords[pt_BR]": "sistema,shell,painel,navegação,gestos",
"X-KDE-Keywords[sl]": "sistem,shell,kontrolna plošča,navigacija,gesta", "X-KDE-Keywords[sl]": "sistem,shell,kontrolna plošča,navigacija,gesta",
"X-KDE-Keywords[sv]": "system,skal,panel,navigering,gest",
"X-KDE-Keywords[tr]": "sistem,kabuk,panel,dolaşım,gezinme,dolaşma,hareket", "X-KDE-Keywords[tr]": "sistem,kabuk,panel,dolaşım,gezinme,dolaşma,hareket",
"X-KDE-Keywords[uk]": "system,shell,panel,navigation,gesture,система,оболонка,панель,навігація,жест", "X-KDE-Keywords[uk]": "system,shell,panel,navigation,gesture,система,оболонка,панель,навігація,жест",
"X-KDE-System-Settings-Parent-Category": "personalization" "X-KDE-System-Settings-Parent-Category": "personalization"