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 2023-03-13 01:45:53 +00:00
parent 56c44df3ae
commit f9404b83ed

View file

@ -54,7 +54,7 @@
"Description[ca]": "Envia i rep SMS",
"Description[cs]": "Posílat a přijímat SMS",
"Description[da]": "Send og modtag sms",
"Description[de]": "Senden und Empfangen von SMS",
"Description[de]": "SMS senden und empfangen",
"Description[el]": "Αποστολή και λήψη SMS",
"Description[en_GB]": "Send and receive SMS",
"Description[es]": "Enviar y recibir SMS",