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/kcmdolphinnavigation.desktop | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.desktop') diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index ca83f2a88..425375800 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -8,6 +8,7 @@ Name[fr]=Navigation avec Dolphin Name[gl]=Navegación de Dolphin Name[id]=Navigasi Dolphin Name[it]=Navigazione di Dolphin +Name[ja]=Dolphin ナビゲーション Name[ko]=Dolphin 탐색 Name[nb]=Navigasjon i Dolphin Name[nl]=Dolphin-navigatie @@ -36,6 +37,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[ja]=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. @@ -72,6 +74,7 @@ Name[fr]=Navigation Name[gl]=Navegación Name[id]=Navigasi Name[it]=Navigazione +Name[ja]=ナビゲーション Name[ko]=탐색 Name[nb]=Navigasjon Name[nl]=Navigatie @@ -100,6 +103,7 @@ 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[ja]=ファイルマネージャでのナビゲーションを設定します Comment[ko]=파일 관리자 탐색 설정 Comment[nb]=Sett opp navigasjon i filbehandleren Comment[nl]=Bestandsbeheerdernavigatie configureren -- cgit v1.3.1