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"
2021-07-20 01:15:33 +00:00
parent df6c2a85f6
commit 9567c7ecf7
2 changed files with 2 additions and 0 deletions
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -28,6 +28,7 @@ Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
+Name[zh_CN]=NeoChat
 GenericName=Matrix Client
 GenericName[az]=Matrix Müştərisi
 GenericName[ca]=Client de Matrix