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 81b52a32cd74dd7a86c7f7cf9033d7c38071df1a..cd93d374b1492330435b6e707d45dd9a9d9f3d3e 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -17,6 +17,7 @@
         "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[hi]": "साधारण फ़ाइल प्रबंधक सेटिंग्स विन्यस्त करें",
         "Description[ia]": "Configura preferentias del gerente general de file",
         "Description[id]": "Konfigurasikan pengaturan pengelola file umum",
         "Description[ie]": "Configurar li parametres del gerente de files",
@@ -61,6 +62,7 @@
         "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",
         "Name[fr]": "Général",
+        "Name[hi]": "साधारण",
         "Name[ia]": "General",
         "Name[id]": "Umum",
         "Name[ie]": "General",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 68a7b2905a371b434a86c0a1be0275adc434eb02..9999e6f85042f35d2e7518e48b791128601945b4 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -17,6 +17,7 @@
         "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea",
         "Description[fi]": "Tiedostonhallinnan selausasetukset",
         "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
+        "Description[hi]": "फ़ाइल प्रबंधक संचालन विन्यस्त करें",
         "Description[ia]": "Configura navigation del gerente de file",
         "Description[id]": "Konfigurasikan navigasi pengelola file",
         "Description[ie]": "Configurar li navigation del gerente de files",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 3127f6dcda62afa1f00b4b5ca732ef7ed7723f31..10a1613b9502ed8afab72a59776c717bba193bda 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -17,6 +17,7 @@
         "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[hi]": "फ़ाइल प्रबंधक दृश्य मोड विन्यस्त करें",
         "Description[ia]": "Configura le modos de vista del gerente de file",
         "Description[id]": "Konfigurasikan mode tampilan pengelola file",
         "Description[ie]": "Configurar li modes de vise del gerente de files",