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 d6928ef5efe0695c40397c6bd31199d3e818bcbc..15ef97633e0006cc803d46fc71cdb648e46c87d2 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -16,7 +16,6 @@
         "Name[cs]": "Pohled Dolphin",
         "Name[da]": "Dolphin-visning",
         "Name[de]": "Dolphin-Ansicht",
-        "Name[en_GB]": "Dolphin View",
         "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 3d140705e6dee98bfae3dc0f77b7ad7cfb796863..1b040416f2a2f5e68c9841d515afd9fb25453a4c 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -11,7 +11,6 @@
         "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[en_GB]": "Move to New Folder",
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",
         "Name[fr]": "Déplacer vers le nouveau dossier",

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 975e181b76e6b536ce53d2f0511af36bdb7fe989..1805822e37de45adc1fdbfa1588e1a4c1bdefa73 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -7,14 +7,10 @@
         "Name[az]": "Əsas",
         "Name[be]": "Асноўныя",
         "Name[bg]": "Общи",
-        "Name[ca@valencia]": "General",
-        "Name[ca]": "General",
         "Name[cs]": "Obecné",
         "Name[da]": "Generelt",
         "Name[de]": "Allgemein",
-        "Name[en_GB]": "General",
         "Name[eo]": "Ĝenerala",
-        "Name[es]": "General",
         "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",
         "Name[fr]": "Général",
@@ -22,9 +18,7 @@
         "Name[he]": "כללי",
         "Name[hi]": "साधारण",
         "Name[hu]": "Általános",
-        "Name[ia]": "General",
         "Name[id]": "Umum",
-        "Name[ie]": "General",
         "Name[is]": "Almennt",
         "Name[it]": "Generale",
         "Name[ka]": "მთავარი",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index abb2401a7fa23a808268397ef1a7c96c39a58a3e..508bb908a0c8b1c106d175c59f14949269081207 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[en_GB]": "View Modes",
         "Name[eo]": "Vidreĝimoj",
         "Name[es]": "Modos de vistas",
         "Name[et]": "Vaaterežiimid",