From: l10n daemon script <scripty@kde.org>
Date: Fri, 28 Jul 2023 01:43:52 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2f0369b333ac5c714d59b74665e76a41a5936042

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/dolphinpart.json.in b/src/dolphinpart.json.in
index 59be51716..e8c87b8f2 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -17,7 +17,6 @@
         "Name[cs]": "Pohled Dolphin",
         "Name[da]": "Dolphin-visning",
         "Name[de]": "Dolphin-Ansicht",
-        "Name[el]": "Dolphin View",
         "Name[en_GB]": "Dolphin View",
         "Name[eo]": "Dolfin-Vido",
         "Name[es]": "Vista de Dolphin",
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 584aed1f0..57fcaa3da 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -11,7 +11,6 @@
         "Name[cs]": "Obecné",
         "Name[da]": "Generelt",
         "Name[de]": "Allgemein",
-        "Name[el]": "Γενικά",
         "Name[en_GB]": "General",
         "Name[eo]": "Ĝenerala",
         "Name[es]": "General",
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index d9250e3d8..8bf2cbfd8 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -11,7 +11,6 @@
         "Name[cs]": "Navigace",
         "Name[da]": "Navigation",
         "Name[de]": "Navigation",
-        "Name[el]": "Πλοήγηση",
         "Name[en_GB]": "Navigation",
         "Name[eo]": "Navigado",
         "Name[es]": "Navegación",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 80477a832..3ba03c5fa 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -11,7 +11,6 @@
         "Name[cs]": "Režimy pohledu",
         "Name[da]": "Visningstilstande",
         "Name[de]": "Ansichts-Modi",
-        "Name[el]": "Λειτουργίες Προβολής",
         "Name[en_GB]": "View Modes",
         "Name[eo]": "Vidreĝimoj",
         "Name[es]": "Modos de vistas",