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 954fb1f724abdbecd4f454b429265f898cfb4f01..2ad9781420f68e41d72f2465ab1155892b18abd8 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[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",
         "Description[id]": "Konfigurasikan pengaturan pengelola file umum",
@@ -39,6 +40,7 @@
         "Name[cs]": "Obecné",
         "Name[de]": "Allgemein",
         "Name[es]": "General",
+        "Name[fi]": "Perusasetukset",
         "Name[fr]": "Général",
         "Name[ia]": "General",
         "Name[id]": "Umum",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index ddc5d19e6cb91820e839f75dae1780f667b5c2a5..7fbbb7120fa3c19c07c167bf9233446eaf2c6f0f 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[fi]": "Tiedostonhallinnan selausasetukset",
         "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
         "Description[ia]": "Configura navigation del gerente de file",
         "Description[id]": "Konfigurasikan navigasi pengelola file",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index f5ef43c147eeb02eb25a53705ec646614b233650..b5e99304a67f984e84a349494865f94103334294 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[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",
         "Description[id]": "Konfigurasikan mode tampilan pengelola file",