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-11-26 02:30:37 +00:00
parent e30540a882
commit 157f22b4c3
1 changed files with 1 additions and 1 deletions

View File

@ -114,7 +114,7 @@ Keywords[sv]=poddsändning
Keywords[tr]=pod yayını
Keywords[uk]=трансляція
Keywords[x-test]=xxpodcastxx
Keywords[zh_CN]=播客
Keywords[zh_CN]=podcast;播客;boke
Icon=kasts
Exec=kasts
Type=Application