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:45 +00:00
parent 7af98dedfb
commit c387884cca

View file

@ -34,6 +34,7 @@
"Description[en_GB]": "Screen rotation quick setting",
"Description[es]": "Ajuste rápido de rotación de la pantalla",
"Description[eu]": "Pantaila biratzearen ezarpen azkarra",
"Description[fi]": "Näytön kierron pika-asetus",
"Description[fr]": "Configuration rapide pour la rotation d'écran",
"Description[is]": "Flýtistilling á snúningi skjás",
"Description[it]": "Impostazione rapida della rotazione dello schermo",