diff options
| author | l10n daemon script <[email protected]> | 2015-05-04 10:09:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-04 10:09:13 +0000 |
| commit | f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 (patch) | |
| tree | ce9a944a91afa36aee45fbd19695eef720e7fb42 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | ece6650ecd3af0eb450e28a9aadcb0f4dd26cb24 (diff) | |
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"
Diffstat (limited to 'src/settings/kcm/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index cdc096277..8699d8b21 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -8,6 +8,7 @@ Name[fr]=Dolphin général Name[gl]=Xerais de Dolphin Name[id]=Dolphin Umum Name[it]=Impostazioni generali di Dolphin +Name[ja]=Dolphin 全般 Name[ko]=Dolphin 일반 Name[nb]=Dolphin generelt Name[nl]=Dolphin algemeen @@ -36,6 +37,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[ja]=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. @@ -73,6 +75,7 @@ Name[fr]=Général Name[gl]=Xerais Name[id]=Umum Name[it]=Generale +Name[ja]=全般 Name[ko]=일반 Name[nb]=Generelt Name[nl]=Algemeen @@ -100,6 +103,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[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[pl]=Ustawienia ogólne zarządzania plikami |