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 1b1343d112266497feb7f865220a54bf6c2694b3..d0cf5174ad6429e1aa1e7587fab8bc65eebb4dfe 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -17,6 +17,7 @@
         "Name[da]": "Dolphin-visning",
         "Name[de]": "Dolphin-Ansicht",
         "Name[el]": "Προβολή Dolphin",
+        "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 3f8efeddc18e3226d78c64f99d5af64c6c95c25e..29603122fa60365df0682b728510c7f7c9291510 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -13,6 +13,7 @@
         "Name[cs]": "Přesunout do nové složky",
         "Name[de]": "In neuen Ordner verschieben",
         "Name[el]": "Μετακίνηση σε Νέο Φάκελο",
+        "Name[en_GB]": "Move to New Folder",
         "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 c2fd44577d4e2e1fcff655632de6731863e1ad1a..ba3228894f730ddfefab2b15b24a693c188ca57f 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -7,11 +7,15 @@
         "Name[az]": "Əsas",
         "Name[be]": "Асноўныя",
         "Name[bg]": "Общи",
+        "Name[ca@valencia]": "General",
+        "Name[ca]": "General",
         "Name[cs]": "Obecné",
         "Name[da]": "Generelt",
         "Name[de]": "Allgemein",
         "Name[el]": "Γενικά",
+        "Name[en_GB]": "General",
         "Name[eo]": "Ĝenerala",
+        "Name[es]": "General",
         "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",
         "Name[fr]": "Général",
@@ -19,7 +23,9 @@
         "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 f02d99a090066dcfc75b565f1e5e31c2a2d3fbae..7383193b92303c365308c8f163eafbc65c55c2dc 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -12,6 +12,7 @@
         "Name[da]": "Visningstilstande",
         "Name[de]": "Ansichts-Modi",
         "Name[el]": "Λειτουργίες Προβολής",
+        "Name[en_GB]": "View Modes",
         "Name[eo]": "Vidreĝimoj",
         "Name[es]": "Modos de vistas",
         "Name[et]": "Vaaterežiimid",