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 2d56db9046c69723e2124869a680d037f9ebe1e8..d99151f72ef5ed951319243ecf2b89d9b33649cd 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -35,13 +35,16 @@
         "Name[lv]": "Dolphin skats",
         "Name[ml]": "ഡോള്‍ഫിന്‍ അവതരണരീതി",
         "Name[my]": "လင်းပိုင် မြင်ကွင်း",
+        "Name[nb]": "Dolphin visning",
         "Name[nl]": "Dolphin-weergave",
+        "Name[nn]": "Dolphin-vising",
         "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
         "Name[pl]": "Widok Dolphina",
         "Name[pt]": "Área do Dolphin",
         "Name[pt_BR]": "Visualização do Dolphin",
         "Name[ro]": "Dolphin – Vizualizare",
         "Name[ru]": "Представление Dolphin",
+        "Name[se]": "Dolphinčájeheapmi",
         "Name[sk]": "Dolphin pohľad",
         "Name[sl]": "Dolphin - pogled",
         "Name[sr@ijekavian]": "Делфинов приказ",

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 9536dc751d0a72a4a6fb7982c6776cb65300ec17..74db701ed738d695867fedf712633e17220571fe 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -12,6 +12,7 @@
         "Description[it]": "Configura le impostazioni generali del gestore dei file",
         "Description[ko]": "일반 파일 관리자 설정",
         "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
+        "Description[nn]": "Set opp generelle innstillingar for filhandsamaren",
         "Description[pl]": "Ustawienia ogólne zarządzania plikami",
         "Description[pt]": "Configurar as definições gerais do gestor de ficheiros",
         "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
@@ -38,6 +39,7 @@
         "Name[it]": "Generale",
         "Name[ko]": "일반",
         "Name[nl]": "Algemeen",
+        "Name[nn]": "Generelt",
         "Name[pl]": "Ogólne",
         "Name[pt]": "Geral",
         "Name[pt_BR]": "Geral",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 8d06ab13de290b4b4c35a512f87f3ee93155fcc0..e3c34030991c29186d5e438fd1259c674b16365e 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -12,6 +12,7 @@
         "Description[it]": "Configura la navigazione col gestore dei file",
         "Description[ko]": "파일 관리자 탐색 설정",
         "Description[nl]": "Bestandsbeheerdernavigatie configureren",
+        "Description[nn]": "Set opp navigasjonen i filhandsamaren",
         "Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami",
         "Description[pt]": "Configurar a navegação do gestor de ficheiros",
         "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 9a59d84d6c1761f9adb1f884e807a5682c3df240..77689a4671939fd2ef7be9313153a29740277ea7 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -12,6 +12,7 @@
         "Description[it]": "Configura le viste del gestore dei file",
         "Description[ko]": "파일 관리자 보기 모드 설정",
         "Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
+        "Description[nn]": "Set opp visingsmodusane i filhandsamaren",
         "Description[pl]": "Ustawienia trybów widoku zarządzania plikami",
         "Description[pt]": "Configurar os modos de visualização do gestor de ficheiros",
         "Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos",