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 2022-10-16 01:57:21 +00:00
parent e68ada8322
commit babbf00578

View file

@ -51,7 +51,7 @@
"Name[en_GB]": "Snap Helper",
"Name[es]": "Auxiliar de ajuste",
"Name[eu]": "Atxikitze laguntzailea",
"Name[fi]": "Kiinnistysavustaja",
"Name[fi]": "Kiinnitysavustaja",
"Name[fr]": "Assistant pour Snap",
"Name[hu]": "Középpontkereső",
"Name[ia]": "Adjutante de photo",