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-23 01:38:17 +00:00
parent 9ffd815c12
commit aa5b483bf2
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

@ -9,6 +9,7 @@
"Name[ca]": "Luis Büchi", "Name[ca]": "Luis Büchi",
"Name[es]": "Luis Büchi", "Name[es]": "Luis Büchi",
"Name[eu]": "Luis Büchi", "Name[eu]": "Luis Büchi",
"Name[fi]": "Luis Büchi",
"Name[fr]": "Luis Büchi", "Name[fr]": "Luis Büchi",
"Name[he]": "לואי ביושי", "Name[he]": "לואי ביושי",
"Name[is]": "Luis Büchi", "Name[is]": "Luis Büchi",
@ -29,6 +30,7 @@
"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",
"Description[eu]": "Konfiguratu sistemaren nabigazioa", "Description[eu]": "Konfiguratu sistemaren nabigazioa",
"Description[fi]": "Järjestelmänavigointiasetukset",
"Description[fr]": "Configurer le système de navigation", "Description[fr]": "Configurer le système de navigation",
"Description[he]": "הגדרת ניווט במערכת", "Description[he]": "הגדרת ניווט במערכת",
"Description[is]": "Grunnstilla flakk um skráakerfi", "Description[is]": "Grunnstilla flakk um skráakerfi",
@ -53,6 +55,7 @@
"Name[ca]": "Navegació", "Name[ca]": "Navegació",
"Name[es]": "Navegación", "Name[es]": "Navegación",
"Name[eu]": "Nabigazioa", "Name[eu]": "Nabigazioa",
"Name[fi]": "Navigointi",
"Name[fr]": "Système de navigation", "Name[fr]": "Système de navigation",
"Name[he]": "ניווט", "Name[he]": "ניווט",
"Name[is]": "Flakk", "Name[is]": "Flakk",
@ -72,6 +75,7 @@
"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",
"X-KDE-Keywords[eu]": "sistema,shell,oskola,panela,nabigazioa,keinua", "X-KDE-Keywords[eu]": "sistema,shell,oskola,panela,nabigazioa,keinua",
"X-KDE-Keywords[fi]": "järjestelmä,komentotulkki,paneeli,navigointi,ele,eleet",
"X-KDE-Keywords[fr]": "système, shell, panneau, navigation, geste", "X-KDE-Keywords[fr]": "système, shell, panneau, navigation, geste",
"X-KDE-Keywords[he]": "מערכת,מעטפת,של,שאל,לוח,פאנל,מחווה,תנועת עכבר", "X-KDE-Keywords[he]": "מערכת,מעטפת,של,שאל,לוח,פאנל,מחווה,תנועת עכבר",
"X-KDE-Keywords[is]": "kerfi,skel,sphald,flakk,hreyfiskipun", "X-KDE-Keywords[is]": "kerfi,skel,sphald,flakk,hreyfiskipun",