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/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 2ad9781420f68e41d72f2465ab1155892b18abd8..fbf6a94285927d687b2a927921779d7a8e592912 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -9,6 +9,7 @@
         "Description[cs]": "Obecné nastavení správce souborů",
         "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen",
         "Description[es]": "Configurar las preferencias generales del gestor de archivos",
+        "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak",
         "Description[fi]": "Tiedostonhallinnan yleisasetukset",
         "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
         "Description[ia]": "Configura preferentias del gerente general de file",
@@ -40,6 +41,7 @@
         "Name[cs]": "Obecné",
         "Name[de]": "Allgemein",
         "Name[es]": "General",
+        "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",
         "Name[fr]": "Général",
         "Name[ia]": "General",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 7fbbb7120fa3c19c07c167bf9233446eaf2c6f0f..30e8b431fee47b1c69048b9cd17b87afb2973855 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -9,6 +9,7 @@
         "Description[cs]": "Nastavení navigace správce souborů",
         "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung",
         "Description[es]": "Configurar la navegación del gestor de archivos",
+        "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea",
         "Description[fi]": "Tiedostonhallinnan selausasetukset",
         "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
         "Description[ia]": "Configura navigation del gerente de file",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index b5e99304a67f984e84a349494865f94103334294..5e39fc5e890fe2d061d97beb53a100e07cd76534 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -9,6 +9,7 @@
         "Description[cs]": "Nastavení režimů pohledu správce souborů",
         "Description[de]": "Dateiverwaltungs-Ansichten einrichten",
         "Description[es]": "Configurar los modos de vistas del gestor de archivos",
+        "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak",
         "Description[fi]": "Tiedostonhallinnan näkymäasetukset",
         "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
         "Description[ia]": "Configura le modos de vista del gerente de file",