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-04 01:17:30 +00:00
parent 40daa1e6b8
commit 025f00e99d
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -6,6 +6,7 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
+Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -5,6 +5,7 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
+Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat