From: l10n daemon script <scripty@kde.org>
Date: Sat, 7 May 2022 01:45:00 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2e333e1b9784b2d04b056e9b1a8e6ddb058584fd

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"
---

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 488760c2b..bd7bff9ab 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -27,6 +27,7 @@
         "Name[az]": "Əsas",
         "Name[ca@valencia]": "General",
         "Name[ca]": "General",
+        "Name[cs]": "Obecné",
         "Name[es]": "General",
         "Name[fr]": "Général",
         "Name[it]": "Generale",