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-12-15 01:35:34 +00:00
parent 843da2664f
commit c4aa843038
4 changed files with 16 additions and 0 deletions

View File

@@ -26,6 +26,7 @@
"Name[nn]": "Tobias Fella",
"Name[pl]": "Tobias Fella",
"Name[ru]": "Tobias Fella",
"Name[sa]": "टोबियास फेला",
"Name[sk]": "Tobias Fella",
"Name[sl]": "Tobias Fella",
"Name[sv]": "Tobias Fella",
@@ -60,6 +61,7 @@
"Description[nn]": "Del via NeoChat",
"Description[pl]": "Udostępnij przez NeoChat",
"Description[ru]": "Опубликовать в NeoChat",
"Description[sa]": "NeoChat मार्गेण साझां कुर्वन्तु",
"Description[sl]": "Deli prek NeoChat",
"Description[sv]": "Dela via NeoChat",
"Description[ta]": "நியோச்சாட் மூலம் பகிர்",
@@ -94,6 +96,7 @@
"Name[nn]": "NeoChat",
"Name[pl]": "NeoChat",
"Name[ru]": "NeoChat",
"Name[sa]": "नवचैट्",
"Name[sk]": "NeoChat",
"Name[sl]": "NeoChat",
"Name[sv]": "NeoChat",