]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c91112)
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 7 May 2022 01:45:00 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 7 May 2022 01:45:00 +0000 (01:45 +0000)
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"

src/settings/kcm/kcmdolphingeneral.json patch | blob | blame | history

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 488760c2b4007dd0f553b54116964867f08bf030..bd7bff9abd48692d3d81198bddf8f56ec6dac712 100644 (file)
--- 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[az]": "Əsas",
         "Name[ca@valencia]": "General",
         "Name[ca]": "General",
+        "Name[cs]": "Obecné",
         "Name[es]": "General",
         "Name[fr]": "Général",
         "Name[it]": "Generale",
         "Name[es]": "General",
         "Name[fr]": "Général",
         "Name[it]": "Generale",