From 8560c73e677186572a134ba427443924eeda9646 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 19 Jul 2024 01:21:28 +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"
---
 src/dolphinpart.json.in                        | 1 +
 src/itemactions/movetonewfolderitemaction.json | 1 +
 src/settings/kcm/kcmdolphingeneral.json        | 1 +
 src/settings/kcm/kcmdolphinviewmodes.json      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 15ef97633..1b1343d11 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -16,6 +16,7 @@
         "Name[cs]": "Pohled Dolphin",
         "Name[da]": "Dolphin-visning",
         "Name[de]": "Dolphin-Ansicht",
+        "Name[el]": "Προβολή Dolphin",
         "Name[eo]": "Dolfin-Vido",
         "Name[es]": "Vista de Dolphin",
         "Name[et]": "Dolphini vaade",
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index 03de58f2c..7cdb60c8b 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -11,6 +11,7 @@
         "Name[ca@valencia]": "Mou cap a una carpeta nova",
         "Name[ca]": "Mou a una carpeta nova",
         "Name[cs]": "Přesunout do nové složky",
+        "Name[el]": "Μετακίνηση σε Νέο Φάκελο",
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",
         "Name[eu]": "Eraman karpeta berrira",
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 1805822e3..c2fd44577 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -10,6 +10,7 @@
         "Name[cs]": "Obecné",
         "Name[da]": "Generelt",
         "Name[de]": "Allgemein",
+        "Name[el]": "Γενικά",
         "Name[eo]": "Ĝenerala",
         "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 508bb908a..f02d99a09 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -11,6 +11,7 @@
         "Name[cs]": "Režimy pohledu",
         "Name[da]": "Visningstilstande",
         "Name[de]": "Ansichts-Modi",
+        "Name[el]": "Λειτουργίες Προβολής",
         "Name[eo]": "Vidreĝimoj",
         "Name[es]": "Modos de vistas",
         "Name[et]": "Vaaterežiimid",
-- 
2.47.3