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
2024-11-13 03:05:22 +00:00
parent 80ac9e1ba7
commit b51194f90f

View File

@@ -91,7 +91,9 @@ Comment=Chat on Matrix
Comment[ca]=Xat a Matrix
Comment[es]=Chat en Matrix
Comment[eu]=Berriketa Matrix-en
Comment[fr]=Clavarder sur Matrix
Comment[gl]=Charle en Matrix
Comment[it]= su Matrix
Comment[pl]=Rozmawiaj na Matriksie
Comment[sl]=Klepet na Matrixu
Comment[tr]=Matrix Üzerinde Sohbet Et