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-26 01:32:45 +00:00
parent 0ad69ad3e0
commit 5fcb33ef67

View file

@ -10,6 +10,7 @@
"Name[ca]": "Micah Stanley",
"Name[es]": "Micah Stanley",
"Name[eu]": "Micah Stanley",
"Name[fi]": "Micah Stanley",
"Name[fr]": "Micah Stanley",
"Name[gl]": "Micah Stanley",
"Name[he]": "מיקה סטנלי",
@ -30,6 +31,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[eu]": "Panelak automatikoki ezkutatu ezarpen azkarra Plasma Mugikorrerako",
"Description[fi]": "Paneelien automaattipiilotusasetus Plasma Mobileen",
"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]": "הגדרות הסתרת לוחות אוטומטית מהירות לפלזמה לניידים",
@ -51,6 +53,7 @@
"Name[ca]": "Oculta automàticament els plafons",
"Name[es]": "Ocultar paneles automáticamente",
"Name[eu]": "Panelak automatikoki ezkutatu",
"Name[fi]": "Piilota paneelit automaattisesti",
"Name[fr]": "Masquer automatiquement les panneaux",
"Name[gl]": "Agochar os paneis automaticamente",
"Name[he]": "הסתרת לוחות אוטומטית",