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-08 01:18:43 +00:00
parent 01f3f185d8
commit ea5b79dbf6

View file

@ -32,6 +32,7 @@
"Name[bg]": "Скриване показалеца на мишката", "Name[bg]": "Скриване показалеца на мишката",
"Name[ca@valencia]": "Oculta el cursor", "Name[ca@valencia]": "Oculta el cursor",
"Name[ca]": "Oculta el cursor", "Name[ca]": "Oculta el cursor",
"Name[cs]": "Skrýt kurzor",
"Name[eo]": "Kaŝi Kursoron", "Name[eo]": "Kaŝi Kursoron",
"Name[es]": "Ocultar el cursor", "Name[es]": "Ocultar el cursor",
"Name[eu]": "Ezkutatu kurtsorea", "Name[eu]": "Ezkutatu kurtsorea",