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-07-03 01:20:28 +00:00
parent aeb2b11fe4
commit 98ff038416

View file

@ -17,6 +17,7 @@
"Name[fr]": "Déplacer vers le nouveau dossier",
"Name[he]": "העברה לתיקייה חדשה",
"Name[ia]": "Move a nove dossier",
"Name[is]": "Færa í nýja möppu",
"Name[it]": "Sposta in una nuova cartella",
"Name[ka]": "გადატანა ახალ საქაღალდეში",
"Name[lt]": "Perkelti į naują aplanką",