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 9510ce34e2adde314152fcaa3741ad1159fd21f8..59be517161ebee2a829ddd3804e025ea79bf515c 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -19,6 +19,7 @@
         "Name[de]": "Dolphin-Ansicht",
         "Name[el]": "Dolphin View",
         "Name[en_GB]": "Dolphin View",
+        "Name[eo]": "Dolfin-Vido",
         "Name[es]": "Vista de Dolphin",
         "Name[et]": "Dolphini vaade",
         "Name[eu]": "Dolphin ikuspegia",

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 481ee6f401ae54787b6ef49095109dd61dfdbc79..ae36ac0d98b3a9bda44d2335fe7ffb096cff0500 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -18,6 +18,7 @@ Name[da]=Ikoner
 Name[de]=Symbole
 Name[el]=Εικονίδια
 Name[en_GB]=Icons
+Name[eo]=Piktogramoj
 Name[es]=Iconos
 Name[et]=Ikoonid
 Name[eu]=Ikonoak
@@ -80,6 +81,7 @@ Name[da]=Kompakt
 Name[de]=Kompakt
 Name[el]=Σύμπτυξη
 Name[en_GB]=Compact
+Name[eo]=Kompakta
 Name[es]=Compacto
 Name[et]=Kompaktne
 Name[eu]=Trinkoa
@@ -141,6 +143,7 @@ Name[da]=Detaljer
 Name[de]=Details
 Name[el]=Λεπτομέρειες
 Name[en_GB]=Details
+Name[eo]=Detaloj
 Name[es]=Detalles
 Name[et]=Üksikasjad
 Name[eu]=Xehetasunak

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index c0e72d94276f8cf363edbfd92acff1e6cb7b8cef..8b957e66e9f1ad9cf0438978ea472e107602db4d 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -11,6 +11,7 @@ Name[da]=Dolphin
 Name[de]=Dolphin
 Name[el]=Dolphin
 Name[en_GB]=Dolphin
+Name[eo]=Dolfin
 Name[es]=Dolphin
 Name[et]=Dolphin
 Name[eu]=Dolphin
@@ -73,6 +74,7 @@ GenericName[da]=Filhåndtering
 GenericName[de]=Dateiverwaltung
 GenericName[el]=Διαχειριστής αρχείων
 GenericName[en_GB]=File Manager
+GenericName[eo]=Dosiermastrumilo
 GenericName[es]=Gestor de archivos
 GenericName[et]=Failihaldur
 GenericName[eu]=Fitxategi-kudeatzailea

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index c3c9bda9e7ab81b74cbcd84144eba08c9de984d6..81b52a32cd74dd7a86c7f7cf9033d7c38071df1a 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -12,6 +12,7 @@
         "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen",
         "Description[el]": "Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων",
         "Description[en_GB]": "Configure general file manager settings",
+        "Description[eo]": "Agordi ĝeneralajn dosiermastrumajn metojn",
         "Description[es]": "Configurar las preferencias generales del gestor de archivos",
         "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak",
         "Description[fi]": "Tiedostonhallinnan yleisasetukset",
@@ -55,6 +56,7 @@
         "Name[de]": "Allgemein",
         "Name[el]": "Γενικά",
         "Name[en_GB]": "General",
+        "Name[eo]": "Ĝenerala",
         "Name[es]": "General",
         "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index bd6b2cef684ba30015487881abd18d4231a21bb2..68a7b2905a371b434a86c0a1be0275adc434eb02 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -12,6 +12,7 @@
         "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung",
         "Description[el]": "Διαμόρφωση πλοήγησης του διαχειριστή αρχείων",
         "Description[en_GB]": "Configure file manager navigation",
+        "Description[eo]": "Agordi dosiermastruman navigadon",
         "Description[es]": "Configurar la navegación del gestor de archivos",
         "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea",
         "Description[fi]": "Tiedostonhallinnan selausasetukset",
@@ -55,6 +56,7 @@
         "Name[de]": "Navigation",
         "Name[el]": "Πλοήγηση",
         "Name[en_GB]": "Navigation",
+        "Name[eo]": "Navigado",
         "Name[es]": "Navegación",
         "Name[et]": "Liikumine",
         "Name[eu]": "Nabigatzea",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 27fa2c5283ac9a25900e4ae8adb31c7991c61df4..3127f6dcda62afa1f00b4b5ca732ef7ed7723f31 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -12,6 +12,7 @@
         "Description[de]": "Dateiverwaltungs-Ansichten einrichten",
         "Description[el]": "Διαμόρφωση των λειτουργιών προβολής του διαχειριστή αρχείων",
         "Description[en_GB]": "Configure file manager view modes",
+        "Description[eo]": "Agordi dosiermastrumajn vidreĝimojn",
         "Description[es]": "Configurar los modos de vistas del gestor de archivos",
         "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak",
         "Description[fi]": "Tiedostonhallinnan näkymäasetukset",
@@ -55,6 +56,7 @@
         "Name[de]": "Ansichts-Modi",
         "Name[el]": "Λειτουργίες Προβολής",
         "Name[en_GB]": "View Modes",
+        "Name[eo]": "Vidreĝimoj",
         "Name[es]": "Modos de vistas",
         "Name[et]": "Vaaterežiimid",
         "Name[eu]": "Ikuspegi moduak",