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"
2024-10-10 03:01:02 +00:00
parent 588266d7c3
commit a0fef7b397
3 changed files with 3 additions and 0 deletions
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -15,6 +15,7 @@ Name[en_GB]=NeoChat
 Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
+Name[fa]=نئوچت
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -13,6 +13,7 @@ Name[en_GB]=NeoChat
 Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
+Name[fa]=نئوچت
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -14,6 +14,7 @@ Name[en_GB]=NeoChat
 Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
+Name[fa]=نئوچت
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat