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-10-11 03:14:33 +00:00
parent 389016f126
commit e274e09bbc
1 changed files with 1 additions and 0 deletions
--- a/src/purpose/purposeplugin.json
+++ b/src/purpose/purposeplugin.json
@@ -77,6 +77,7 @@
        "Name[eo]": "NeoChat",
        "Name[es]": "NeoChat",
        "Name[eu]": "NeoChat",
+        "Name[fa]": "نئوچت",
        "Name[fi]": "NeoChat",
        "Name[fr]": "NeoChat",
        "Name[gl]": "NeoChat",