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-06-03 02:27:05 +00:00
parent 15137cd704
commit 03ec17366e
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -14,6 +14,7 @@ Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
+Name[pt_BR]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -13,6 +13,7 @@ Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
+Name[pt_BR]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat