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-04-28 01:30:43 +00:00
parent 1e6989b19f
commit 74303f0983

View file

@ -12,6 +12,7 @@
"Name[fr]": "Micah Stanley",
"Name[he]": "מיקה סטנלי",
"Name[ia]": "Micah Stanley",
"Name[it]": "Micah Stanley",
"Name[ka]": "Micah Stanley",
"Name[nl]": "Micah Stanley",
"Name[sl]": "Micah Stanley",
@ -28,6 +29,7 @@
"Description[fr]": "Configuration rapide pour le masquage automatique des panneaux de Plasma Mobile",
"Description[he]": "הגדרות הסתרת לוחות אוטומטית מהירות לפלזמה לניידים",
"Description[ia]": "Auto Cela Pannellos Preferentia rapide per Plasma Mobile",
"Description[it]": "Impostazione rapida Nascondi automaticamente i pannelli per Plasma Mobile",
"Description[ka]": "პანელების ავტოდამალვის სწრაფად დაყენება Plasma Mobile-სთვის",
"Description[nl]": "Snelle instelling van automatisch panelen verbergen voor Plasma Mobile",
"Description[sl]": "Hitre nastavitve samodejnega skrivanja plošč za Plasma Mobile",
@ -45,6 +47,7 @@
"Name[fr]": "Masquer automatiquement les panneaux",
"Name[he]": "הסתרת לוחות אוטומטית",
"Name[ia]": "Auto-Cela Pannellos",
"Name[it]": "Nascondi automaticamente i pannelli",
"Name[ka]": "პანელების ავტომატური დამალვა",
"Name[nl]": "Panelen automatisch verbergen",
"Name[sl]": "Samodejno skrij plošče",