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 59be517161ebee2a829ddd3804e025ea79bf515c..e8c87b8f2b567b1b4fe0c9e018afc8a9d430c867 100644 (file)
--- 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 584aed1f032aaea151f520104755434329ca0838..57fcaa3dad50c07afafe04237cab8ef4a37bdba8 100644 (file)
--- 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 d9250e3d82fad249c683dd0f4a3e03b55c1eeab0..8bf2cbfd84fab21674257d33746ff6bf487ea13c 100644 (file)
--- 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 80477a832457d5747a03aadf351e0e165f2d1986..3ba03c5fa1cba16717527afe4ff1edb74efd4b56 100644 (file)
--- 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",