From a0fef7b3978c321d7c2bc78244e14b6ec2298624 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Oct 2024 03:01:02 +0000 Subject: [PATCH] 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" --- org.kde.neochat.desktop | 1 + src/neochat.notifyrc | 1 + src/plasma-runner-neochat.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index a816b5d83..cd3935eb4 100644 --- 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 diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index 8cfc92de6..d539bd93e 100644 --- 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 diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index fe8f2146f..f62cdcb1a 100644 --- 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