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-03-24 05:54:34 +01:00
parent 9b916edfdc
commit 05548bc8a9
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -9,6 +9,7 @@ Name[ia]=Neochat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pt]=NeoChat
+Name[pt_BR]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[uk]=NeoChat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -8,6 +8,7 @@ Name[ia]=Neochat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pt]=NeoChat
+Name[pt_BR]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[uk]=NeoChat