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-14 01:34:35 +00:00
parent 447049d570
commit 0f7ce1f2ad
2 changed files with 7 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

@ -8,6 +8,7 @@
"Name[ca]": "Luis Büchi",
"Name[es]": "Luis Büchi",
"Name[eu]": "Luis Büchi",
"Name[fr]": "Luis Büchi",
"Name[he]": "לואי ביושי",
"Name[it]": "Luis Büchi",
"Name[ka]": "Luis Büchi",
@ -25,6 +26,7 @@
"Description[ca]": "Configura la navegació del sistema",
"Description[es]": "Configurar la navegación del sistema",
"Description[eu]": "Konfiguratu sistemaren nabigazioa",
"Description[fr]": "Configurer le système de navigation",
"Description[he]": "הגדרת ניווט במערכת",
"Description[it]": "Configura navigazione del sistema",
"Description[ka]": "სისტემის ნავიგაციის მორგება",
@ -48,6 +50,7 @@
"Name[ca]": "Navegació",
"Name[es]": "Navegación",
"Name[eu]": "Nabigazioa",
"Name[fr]": "Système de navigation",
"Name[he]": "ניווט",
"Name[it]": "Navigazione",
"Name[ka]": "ნავიგაცია",
@ -64,6 +67,7 @@
"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[eu]": "sistema,shell,oskola,panela,nabigazioa,keinua",
"X-KDE-Keywords[fr]": "système, shell, panneau, navigation, geste",
"X-KDE-Keywords[he]": "מערכת,מעטפת,של,שאל,לוח,פאנל,מחווה,תנועת עכבר",
"X-KDE-Keywords[it]": "sistema,shell,pannello,navigazione,gesto",
"X-KDE-Keywords[ka]": "system,shell,panel,სისტემა,გარემო,პანელი,ჟესტი",

3
quicksettings/kscreenosd/package/metadata.json
View file

@ -11,6 +11,7 @@
"Name[cs]": "Sebastian Kügler",
"Name[es]": "Sebastian Kügler",
"Name[eu]": "Sebastian Kügler",
"Name[fi]": "Sebastian Kügler",
"Name[fr]": "Sebastian Kügler",
"Name[he]": "סבסטיאן קיגלר",
"Name[it]": "Sebastian Kügler",
@ -32,6 +33,7 @@
"Description[ca]": "Configuració ràpida de l'OSD de la pantalla per al Plasma Mobile",
"Description[es]": "Ajuste rápido del OSD de configuración de pantalla para Plasma Mobile",
"Description[eu]": "Pantaila ezarpena OSD ezarpen azkarra Plasma Mugikorrerako",
"Description[fi]": "Näyttöjen ruutupika-asetus Plasma Mobileen",
"Description[fr]": "Configuration rapide de l'incrustation vidéo sur écran (OSD) pour Plasma Mobile",
"Description[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים",
"Description[it]": "Configurazione rapida dell'OSD per Plasma Mobile",
@ -54,6 +56,7 @@
"Name[ca]": "OSD de la pantalla",
"Name[es]": "OSD de pantalla",
"Name[eu]": "Pantailako OSD",
"Name[fi]": "Näyttöjen ruutunäyttö",
"Name[fr]": "Incrustation vidéo sur écran (OSD)",
"Name[he]": "חיווי על גבי המסך",
"Name[it]": "OSD schermo",