From f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 May 2015 10:09:13 +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 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index bb4e7680c..f130b37ae 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[ja]=Dolphin サービス Name[ko]=Dolphin 서비스 Name[nl]=Dolphin-services Name[pl]=Usługi Dolphina @@ -44,6 +45,7 @@ Name[fr]=Services Name[gl]=Servizos Name[id]=Layanan Name[it]=Servizi +Name[ja]=サービス Name[ko]=서비스 Name[nl]=Services Name[pl]=Usługi @@ -69,6 +71,7 @@ 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[ja]=ファイルマネージャのサービスを設定します Comment[ko]=파일 관리자 서비스 설정 Comment[nb]=Sett opp tjenester i filbehandleren Comment[nl]=Bestandsbeheerderservices configureren -- cgit v1.3.1