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-06-01 01:18:01 +00:00
parent cb183efa66
commit 9893fae27c

View File

@@ -3,6 +3,7 @@
"Authors": [
{
"Name": "Tobias Fella",
"Name[ar]": "توبياس فلة",
"Name[ca@valencia]": "Tobias Fella",
"Name[ca]": "Tobias Fella",
"Name[cs]": "Tobias Fella",
@@ -31,6 +32,7 @@
],
"Category": "Utilities",
"Description": "Share via NeoChat",
"Description[ar]": "شارك بواسطة نيوتشات",
"Description[ca@valencia]": "Compartix a través de NeoChat",
"Description[ca]": "Comparteix a través del NeoChat",
"Description[de]": "Über NeoChat teilen",
@@ -57,6 +59,7 @@
"Icon": "org.kde.neochat",
"License": "GPL",
"Name": "NeoChat",
"Name[ar]": "نيوتشات",
"Name[ast]": "NeoChat",
"Name[ca@valencia]": "NeoChat",
"Name[ca]": "NeoChat",