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-17 01:35:11 +00:00
parent 09715da168
commit 5c432ff8e1
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

@ -4,6 +4,7 @@
{ {
"Email": "luis.buechi@kdemail.net", "Email": "luis.buechi@kdemail.net",
"Name": "Luis Büchi", "Name": "Luis Büchi",
"Name[ar]": "لويس بوشي",
"Name[ca@valencia]": "Luis Büchi", "Name[ca@valencia]": "Luis Büchi",
"Name[ca]": "Luis Büchi", "Name[ca]": "Luis Büchi",
"Name[es]": "Luis Büchi", "Name[es]": "Luis Büchi",
@ -22,6 +23,7 @@
], ],
"Category": "System Information", "Category": "System Information",
"Description": "Configure System Navigation", "Description": "Configure System Navigation",
"Description[ar]": "اضبط التنقل في النظام",
"Description[ca@valencia]": "Configura la navegació del sistema", "Description[ca@valencia]": "Configura la navegació del sistema",
"Description[ca]": "Configura la navegació del sistema", "Description[ca]": "Configura la navegació del sistema",
"Description[es]": "Configurar la navegación del sistema", "Description[es]": "Configurar la navegación del sistema",
@ -46,6 +48,7 @@
"Icon": "preferences-desktop-gestures-touch", "Icon": "preferences-desktop-gestures-touch",
"License": "GPL", "License": "GPL",
"Name": "Navigation", "Name": "Navigation",
"Name[ar]": "التّنقّل",
"Name[ca@valencia]": "Navegueu", "Name[ca@valencia]": "Navegueu",
"Name[ca]": "Navegació", "Name[ca]": "Navegació",
"Name[es]": "Navegación", "Name[es]": "Navegación",
@ -63,6 +66,7 @@
"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[ar]": "نظام,صدفة,لوحة,التنقل,تنقل,إيماء",
"X-KDE-Keywords[ca@valencia]": "sistema,intèrpret d'ordres,quadro,navegació,gest", "X-KDE-Keywords[ca@valencia]": "sistema,intèrpret d'ordres,quadro,navegació,gest",
"X-KDE-Keywords[ca]": "sistema,intèrpret d'ordres,plafó,navegació,gest", "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[es]": "sistema,intérprete,intérprete de órdenes,panel,navegación,gestos",