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-05-05 01:31:43 +00:00
parent 321b192e08
commit c3c96f0331

View file

@ -10,6 +10,7 @@
"Name[ca]": "Micah Stanley",
"Name[es]": "Micah Stanley",
"Name[fr]": "Micah Stanley",
"Name[gl]": "Micah Stanley",
"Name[he]": "מיקה סטנלי",
"Name[ia]": "Micah Stanley",
"Name[it]": "Micah Stanley",
@ -27,6 +28,7 @@
"Description[ca]": "Configuració ràpida per a ocultar automàticament els plafons al Plasma Mobile",
"Description[es]": "Ajuste rápido de ocultación automática de paneles para Plasma Mobile",
"Description[fr]": "Configuration rapide pour le masquage automatique des panneaux de Plasma Mobile",
"Description[gl]": "Opción rápida de agochar paneis automaticamente para 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",
@ -45,6 +47,7 @@
"Name[ca]": "Oculta automàticament els plafons",
"Name[es]": "Ocultar paneles automáticamente",
"Name[fr]": "Masquer automatiquement les panneaux",
"Name[gl]": "Agochar os paneis automaticamente",
"Name[he]": "הסתרת לוחות אוטומטית",
"Name[ia]": "Auto-Cela Pannellos",
"Name[it]": "Nascondi automaticamente i pannelli",