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-08-28 01:36:44 +00:00
parent e4a8ead084
commit 66a0c38d2c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@
"Name[ca]": "Sebastian Kügler",
"Name[es]": "Sebastian Kügler",
"Name[eu]": "Sebastian Kügler",
"Name[fr]": "Sebastian Kügler",
"Name[he]": "סבסטיאן קיגלר",
"Name[it]": "Sebastian Kügler",
"Name[ka]": "სებასტიან კუგლერი",
@ -28,6 +29,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[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",
"Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
@ -48,6 +50,7 @@
"Name[ca]": "OSD de la pantalla",
"Name[es]": "OSD de pantalla",
"Name[eu]": "Pantailako OSD",
"Name[fr]": "Incrustation vidéo sur écran (OSD)",
"Name[he]": "חיווי על גבי המסך",
"Name[it]": "OSD schermo",
"Name[ka]": "ეკრანის OSD",