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"

1 files changed, 12 insertions, 0 deletions

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 6bde5f6eb..ca83f2a88 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -8,11 +8,14 @@ Name[fr]=Navigation avec Dolphin
 Name[gl]=Navegación de Dolphin
 Name[id]=Navigasi Dolphin
 Name[it]=Navigazione di Dolphin
+Name[ko]=Dolphin 탐색
+Name[nb]=Navigasjon i Dolphin
 Name[nl]=Dolphin-navigatie
 Name[nn]=Navigasjon i Dolphin
 Name[pl]=Nawigacja Dolphina
 Name[pt]=Navegação do Dolphin
 Name[pt_BR]=Navegação do Dolphin
+Name[se]=Dolphinnavigašuvdna
 Name[sk]=Navigácia Dolphinu
 Name[sl]=Dolphin - krmarjenje
 Name[sr]=Делфинова навигација
@@ -33,6 +36,7 @@ Comment[fr]=Ce service permet de configurer la navigation avec Dolphin.
 Comment[gl]=Este servizo permite configurar a navegación de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin.
 Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin.
+Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다.
 Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
 Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.
 Comment[pt]=Este serviço permite a configuração da navegação do Dolphin.
@@ -68,11 +72,14 @@ Name[fr]=Navigation
 Name[gl]=Navegación
 Name[id]=Navigasi
 Name[it]=Navigazione
+Name[ko]=탐색
+Name[nb]=Navigasjon
 Name[nl]=Navigatie
 Name[nn]=Navigasjon
 Name[pl]=Nawigacja
 Name[pt]=Navegação
 Name[pt_BR]=Navegação
+Name[se]=Navigašuvdna
 Name[sk]=Navigácia
 Name[sl]=Krmarjenje
 Name[sr]=Навигација
@@ -93,11 +100,14 @@ Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers
 Comment[gl]=Configurar a navegación do xestor de ficheiros.
 Comment[id]=Konfigurasi navigasi manajer berkas
 Comment[it]=Configura la navigazione col gestore dei file
+Comment[ko]=파일 관리자 탐색 설정
+Comment[nb]=Sett opp navigasjon i filbehandleren
 Comment[nl]=Bestandsbeheerdernavigatie configureren
 Comment[nn]=Set opp navigasjonen i filhandsamaren
 Comment[pl]=Ustawienia nawigacji w zarządzaniu plikami
 Comment[pt]=Configurar a navegação do gestor de ficheiros
 Comment[pt_BR]=Configura a navegação do gerenciador de arquivos
+Comment[se]=Heivet fiilagieđahallannavigašuvdna
 Comment[sk]=Nastavenie navigácie správcu súborov
 Comment[sl]=Nastavitve krmarjenja v upravljalniku datotek
 Comment[sr]=Подешавање навигације у менаџеру фајлова
@@ -118,6 +128,8 @@ X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
+X-KDE-Keywords[ko]=파일 관리자
+X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[pl]=zarządzanie plikami