From 06776451a72c395fca4b40196a6617366167ad66 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 26 Apr 2015 09:44:42 +0000
Subject: [PATCH] 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"
---
 src/dolphinpart.desktop                              | 10 ++++++++++
 src/org.kde.dolphin.desktop                          |  6 ++++++
 src/settings/kcm/kcmdolphingeneral.desktop           |  9 +++++++++
 src/settings/kcm/kcmdolphinnavigation.desktop        | 12 ++++++++++++
 src/settings/kcm/kcmdolphinservices.desktop          |  6 ++++++
 src/settings/kcm/kcmdolphinviewmodes.desktop         | 12 ++++++++++++
 .../fileviewversioncontrolplugin.desktop             |  2 ++
 7 files changed, 57 insertions(+)

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 52412b9b9..24ce9c2f4 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -10,11 +10,14 @@ Name[fr]=Vue de Dolphin
 Name[gl]=Vista de Dolphin
 Name[id]=Tampilan Dolphin
 Name[it]=Vista di Dolphin
+Name[ko]=Dolphin 보기
+Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
 Name[nn]=Dolphin-vising
 Name[pl]=Widok Dolphina
 Name[pt]=Área do Dolphin
 Name[pt_BR]=Visualização do Dolphin
+Name[se]=Dolphinčájeheapmi
 Name[sk]=Dolphin pohľad
 Name[sl]=Dolphin - pogled
 Name[sr]=Делфинов приказ
@@ -49,11 +52,14 @@ Name[fr]=Icônes
 Name[gl]=Iconas
 Name[id]=Ikon
 Name[it]=Icone
+Name[ko]=아이콘
+Name[nb]=Ikoner
 Name[nl]=Pictogrammen
 Name[nn]=Ikon
 Name[pl]=Ikony
 Name[pt]=Ícones
 Name[pt_BR]=Ícones
+Name[se]=Govažat
 Name[sk]=Ikony
 Name[sl]=Ikone
 Name[sr]=Иконе
@@ -79,6 +85,8 @@ Name[fr]=Concis
 Name[gl]=Compacta
 Name[id]=Sederhana
 Name[it]=Compatta
+Name[ko]=축소됨
+Name[nb]=Kompakt
 Name[nl]=Compact
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
@@ -108,6 +116,8 @@ Name[fr]=Détails
 Name[gl]=Detalles
 Name[id]=Detail
 Name[it]=Dettagli
+Name[ko]=자세히
+Name[nb]=Detaljer
 Name[nl]=Details
 Name[nn]=Detaljar
 Name[pl]=Szczegóły
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 2193f9533..cb5afd224 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -9,11 +9,14 @@ Name[fr]=Dolphin
 Name[gl]=Dolphin
 Name[id]=Dolphin
 Name[it]=Dolphin
+Name[ko]=Dolphin
+Name[nb]=Dolphin
 Name[nl]=Dolphin
 Name[nn]=Dolphin
 Name[pl]=Dolphin
 Name[pt]=Dolphin
 Name[pt_BR]=Dolphin
+Name[se]=Dolphin
 Name[sk]=Dolphin
 Name[sl]=Dolphin
 Name[sr]=Делфин
@@ -39,11 +42,14 @@ GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
 GenericName[id]=Manajer Berkas
 GenericName[it]=Gestore dei file
+GenericName[ko]=파일 관리자
+GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder
 GenericName[nn]=Filhandsamar
 GenericName[pl]=Zarządzanie plikami
 GenericName[pt]=Gestor de Ficheiros
 GenericName[pt_BR]=Gerenciador de arquivos
+GenericName[se]=Fiilagieđahalli
 GenericName[sk]=Správca súborov
 GenericName[sl]=Upravljalnik datotek
 GenericName[sr]=Менаџер фајлова
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index c57bcf38d..cdc096277 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -8,11 +8,14 @@ Name[fr]=Dolphin général
 Name[gl]=Xerais de Dolphin
 Name[id]=Dolphin Umum
 Name[it]=Impostazioni generali di Dolphin
+Name[ko]=Dolphin 일반
+Name[nb]=Dolphin generelt
 Name[nl]=Dolphin algemeen
 Name[nn]=Generelt for Dolphin
 Name[pl]=Ustawienia Dolphina
 Name[pt]=Geral do Dolphin
 Name[pt_BR]=Geral do Dolphin
+Name[se]=Dolphinoppalaččat
 Name[sk]=Všeobecný Dolphin
 Name[sl]=Dolphin - splošno
 Name[sr]=Делфиново опште
@@ -33,6 +36,7 @@ Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphi
 Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin.
 Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin.
+Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다.
 Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren.
 Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina.
 Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin.
@@ -69,6 +73,8 @@ Name[fr]=Général
 Name[gl]=Xerais
 Name[id]=Umum
 Name[it]=Generale
+Name[ko]=일반
+Name[nb]=Generelt
 Name[nl]=Algemeen
 Name[nn]=Generelt
 Name[pl]=Ogólne
@@ -94,6 +100,7 @@ Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers
 Comment[gl]=Configurar opcións xerais de xestores de ficheiros.
 Comment[id]=Konfigurasi pengaturan manajer berkas umum
 Comment[it]=Configura le impostazioni generali del gestore dei file
+Comment[ko]=일반 파일 관리자 설정
 Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
 Comment[pl]=Ustawienia ogólne zarządzania plikami
 Comment[pt]=Configurar as definições gerais do gestor de ficheiros
@@ -118,6 +125,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
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
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index d81785dd8..bb4e7680c 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -8,6 +8,7 @@ Name[fr]=Services de Dolphin
 Name[gl]=Servizos de Dolphin
 Name[id]=Layanan Dolphin
 Name[it]=Servizi di Dolphin
+Name[ko]=Dolphin 서비스
 Name[nl]=Dolphin-services
 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin
@@ -43,6 +44,7 @@ Name[fr]=Services
 Name[gl]=Servizos
 Name[id]=Layanan
 Name[it]=Servizi
+Name[ko]=서비스
 Name[nl]=Services
 Name[pl]=Usługi
 Name[pt]=Serviços
@@ -67,6 +69,8 @@ Comment[fr]=Configuration des services du gestionnaire de fichiers
 Comment[gl]=Configurar servizos de xestores de ficheiros.
 Comment[id]=Konfigurasi layanan manajer berkas
 Comment[it]=Configura i servizi del gestore dei file
+Comment[ko]=파일 관리자 서비스 설정
+Comment[nb]=Sett opp tjenester i filbehandleren
 Comment[nl]=Bestandsbeheerderservices configureren
 Comment[nn]=Set opp tenester i filhandsamaren
 Comment[pl]=Ustawienia usług zarządzania plikami
@@ -92,6 +96,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
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 65c6a43f9..ac79626f8 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -8,11 +8,14 @@ Name[fr]=Modes d'affichage de Dolphin
 Name[gl]=Modos de vista de Dolphin
 Name[id]=Mode Tampilan Dolphin
 Name[it]=Viste di Dolphin
+Name[ko]=Dolphin 보기 모드
+Name[nb]=Dolphin visningsmåter
 Name[nl]=Dolphin-weergavemodussen
 Name[nn]=Dolphin-visingar
 Name[pl]=Tryby widoku Dolphina
 Name[pt]=Modos de Visualização do Dolphin
 Name[pt_BR]=Modos de exibição do Dolphin
+Name[se]=Dolphin čájehanmodusat
 Name[sk]=Režimy zobrazenia Dolphinu
 Name[sl]=Dolphin - načini prikaza
 Name[sr]=Делфинови режими приказа
@@ -33,6 +36,7 @@ Comment[fr]=Ce service permet de configurer les modes d'affichage de Dolphin.
 Comment[gl]=Este servizo permite configurar os modos de vista de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi mode tampilan Dolphin.
 Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
+Comment[ko]=이 서비스는 Dolphin 보기 모드를 설정합니다.
 Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
 Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.
 Comment[pt]=Este serviço permite a configuração dos modos de visualização do Dolphin.
@@ -68,11 +72,14 @@ Name[fr]=Modes d'affichage
 Name[gl]=Modos de vista
 Name[id]=Mode Tampilan
 Name[it]=Viste
+Name[ko]=보기 모드
+Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
 Name[nn]=Visingsmodusar
 Name[pl]=Tryby widoku
 Name[pt]=Modos de Visualização
 Name[pt_BR]=Modos de exibição
+Name[se]=Čájehanmodusat
 Name[sk]=Režimy zobrazenia
 Name[sl]=Načini prikaza
 Name[sr]=Режими приказа
@@ -93,11 +100,14 @@ Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers
 Comment[gl]=Configurar os modos de vista do xestor de ficheiros.
 Comment[id]=Konfigurasi mode tampilan manajer berkas
 Comment[it]=Configura le viste del gestore dei file
+Comment[ko]=파일 관리자 보기 모드 설정
+Comment[nb]=Tilpass filbehandlerens visningsmåter
 Comment[nl]=Bestandsbeheerderweergavemodussen configureren
 Comment[nn]=Set opp visingsmodusane i filhandsamaren
 Comment[pl]=Ustawienia trybów widoku zarządzania plikami
 Comment[pt]=Configurar os modos de visualização do gestor de ficheiros
 Comment[pt_BR]=Configura os modos de exibição do gerenciador de arquivos
+Comment[se]=Heivet fiilagieđahalli čájehanmodusat
 Comment[sk]=Nastavenie režimov zobrazenia správcu súborov
 Comment[sl]=Nastavitve načinov prikaza upravljalnika 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
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index eabf6e467..85744ca1a 100644
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -11,6 +11,8 @@ Comment[fr]=Module externe pour le contrôle de version applicable aux vues de f
 Comment[gl]=Complemento de control de versión para vistas de ficheiros.
 Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas
 Comment[it]=Estensione di controllo delle versioni per le viste dei file
+Comment[ko]=파일 보기를 위한 버전 관리 플러그인
+Comment[nb]=Versjonskontrollmodul for filvisninger
 Comment[nl]=Plugin voor versiecontrole op bestandoverzichten
 Comment[nn]=Versjonskontroll-tillegg for filvisingar
 Comment[pl]=Wtyczka systemu zarządzania wersjami dla widoku plików
-- 
2.47.3