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
2025-10-15 01:33:59 +00:00
parent d1d3c43c6f
commit dbb41d061c

View File

@@ -23,6 +23,7 @@
"Name[it]": "Tobias Fella",
"Name[ka]": "Tobias Fella",
"Name[ko]": "Tobias Fella",
"Name[lt]": "Tobias Fella",
"Name[lv]": "Tobias Fella",
"Name[nl]": "Tobias Fella",
"Name[nn]": "Tobias Fella",
@@ -62,6 +63,7 @@
"Description[it]": "Condividi tramite NeoChat",
"Description[ka]": "გააზიარეთ NeoChat-ით",
"Description[ko]": "NeoChat으로 공유",
"Description[lt]": "Bendrinti per NeoChat",
"Description[lv]": "Kopīgot ar „NeoChat“",
"Description[nl]": "Delen via NeoChat",
"Description[nn]": "Del via NeoChat",
@@ -101,6 +103,7 @@
"Name[it]": "NeoChat",
"Name[ka]": "NeoChat",
"Name[ko]": "NeoChat",
"Name[lt]": "NeoChat",
"Name[lv]": "NeoChat",
"Name[nl]": "NeoChat",
"Name[nn]": "NeoChat",