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-10-12 01:18:05 +00:00
parent e6c594f3d2
commit ecc6c6e2eb
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -11,6 +11,7 @@ Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[it]=NeoChat
 Name[ko]=NeoChat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -12,6 +12,7 @@ Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[it]=NeoChat
 Name[ko]=NeoChat