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-06-02 01:44:29 +00:00
parent 9bb2b0a6a8
commit 165448bc7f

View file

@ -42,7 +42,7 @@
"Name[pl]": "Widok Dolphina",
"Name[pt]": "Área do Dolphin",
"Name[pt_BR]": "Visualização do Dolphin",
"Name[ro]": "Dolphin Vizualizare",
"Name[ro]": "Vizualizare Dolphin",
"Name[ru]": "Представление Dolphin",
"Name[se]": "Dolphinčájeheapmi",
"Name[sk]": "Dolphin pohľad",