From 06776451a72c395fca4b40196a6617366167ad66 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Apr 2015 09:44:42 +0000 Subject: 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/settings/kcm/kcmdolphinservices.desktop | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') 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 -- cgit v1.3.1