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-01-10 03:23:16 +00:00
parent 9f8c089f9c
commit 665ad78064

View file

@ -100,7 +100,7 @@
"Name": "Host remote commands",
"Name[ar]": "استضف الأوامر البعيدة",
"Name[az]": "Hostun uzaq əmrləri",
"Name[bg]": "за",
"Name[bg]": "Команди на отдалечения хост",
"Name[ca@valencia]": "Allotja ordres remotes",
"Name[ca]": "Allotja ordres remotes",
"Name[cs]": "Přijímat vzdálené příkazy",