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 2024-05-31 01:20:19 +00:00
parent 76d3323e8f
commit 8f70d0afcb

View file

@ -28,6 +28,7 @@
"Name": "Plasma Mobile Autodetect APNs",
"Name[ca@valencia]": "Detecció automàtica dels APN de Plasma Mobile",
"Name[ca]": "Detecció automàtica dels APN del Plasma Mobile",
"Name[cs]": "Automatická detekce APN v Plasma Mobile",
"Name[en_GB]": "Plasma Mobile Autodetect APNs",
"Name[eo]": "Atomata APN-Ekkono de Plasma-Mobile",
"Name[es]": "Detección automática de APN en Plasma Mobile",