SVN_SILENT made messages (.desktop file) - always resolve ours

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-29 01:35:56 +00:00
parent 63d5dba69f
commit 23afd2e767

View file

@ -6,7 +6,9 @@
"Email": "sebas@kde.org",
"Name": "Sebastian Kügler",
"Name[ar]": "سيباستيان كوغلر",
"Name[ca@valencia]": "Sebastian Kügler",
"Name[ca]": "Sebastian Kügler",
"Name[cs]": "Sebastian Kügler",
"Name[es]": "Sebastian Kügler",
"Name[eu]": "Sebastian Kügler",
"Name[fr]": "Sebastian Kügler",
@ -26,6 +28,7 @@
],
"Description": "Screen setup OSD quick setting for Plasma Mobile",
"Description[ar]": "إعداد سريع العرض على الشاشة لبلازما الجوال",
"Description[ca@valencia]": "Configuració ràpida d'OSD de la pantalla per a Plasma Mobile",
"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",
@ -47,6 +50,7 @@
"License": "GPL-2.0+",
"Name": "Screen OSD",
"Name[ar]": "العرض على الشاشة",
"Name[ca@valencia]": "OSD de la pantalla",
"Name[ca]": "OSD de la pantalla",
"Name[es]": "OSD de pantalla",
"Name[eu]": "Pantailako OSD",