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

@@ -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",

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",

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]": "მთავარი",

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",