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/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