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-08-09 01:21:45 +00:00
parent 8b606266c5
commit a794420d3e
4 changed files with 15 additions and 0 deletions

View File

@@ -4,6 +4,7 @@
{
"Name": "Tobias Fella",
"Name[ar]": "توبياس فلة",
"Name[he]": "טוביאס פלה",
"Name[ta]": "டோபியாஸ் ஃபெல்லா",
"Name[x-test]": "xxTobias Fellaxx"
}
@@ -20,6 +21,7 @@
"Description[fi]": "Jaa NeoChatillä",
"Description[fr]": "Partager grâce à NeoChat",
"Description[gl]": "Compartir por NeoChat",
"Description[he]": "שיתוף דרך NeoChat",
"Description[hu]": "Megosztás NeoChatben",
"Description[ia]": "Comparti via NeoChat",
"Description[it]": "Condividi tramite NeoChat",