diff options
| author | l10n daemon script <[email protected]> | 2015-05-05 14:00:14 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-05 14:00:14 +0000 |
| commit | c1a2c0f1a76dd1df7109d11a9f511b8c33d85054 (patch) | |
| tree | 276378cbbfa4b733c3003bdede1059bd76a92721 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 (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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 8699d8b21..35ace3630 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -10,6 +10,7 @@ Name[id]=Dolphin Umum Name[it]=Impostazioni generali di Dolphin Name[ja]=Dolphin 全般 Name[ko]=Dolphin 일반 +Name[lt]=Dolphin bendrieji Name[nb]=Dolphin generelt Name[nl]=Dolphin algemeen Name[nn]=Generelt for Dolphin @@ -39,6 +40,7 @@ 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[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus. Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin. @@ -77,6 +79,7 @@ Name[id]=Umum Name[it]=Generale Name[ja]=全般 Name[ko]=일반 +Name[lt]=Bendra Name[nb]=Generelt Name[nl]=Algemeen Name[nn]=Generelt @@ -105,6 +108,7 @@ Comment[id]=Konfigurasi pengaturan manajer berkas umum Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 +Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as definições gerais do gestor de ficheiros @@ -130,6 +134,7 @@ 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[lt]=Failų tvarkyklė X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar |