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-04-26 01:20:23 +00:00
parent 59f89d96e1
commit 6b21289af3
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -13,6 +13,7 @@ Name[ia]=Neochat
 Name[it]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sl]=NeoChat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -12,6 +12,7 @@ Name[ia]=Neochat
 Name[it]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sl]=NeoChat