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"
2024-03-28 01:18:33 +00:00
parent bae14ecd35
commit dc2cf21cb8
1 changed files with 1 additions and 0 deletions
--- a/src/purpose/purposeplugin.json
+++ b/src/purpose/purposeplugin.json
@@ -46,6 +46,7 @@
        "Icon": "org.kde.neochat",
        "License": "GPL",
        "Name": "NeoChat",
+        "Name[ast]": "NeoChat",
        "Name[ca@valencia]": "NeoChat",
        "Name[ca]": "NeoChat",
        "Name[de]": "NeoChat",