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/kcmdolphinnavigation.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/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 425375800..3536ed494 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -10,6 +10,7 @@ Name[id]=Navigasi Dolphin Name[it]=Navigazione di Dolphin Name[ja]=Dolphin ナビゲーション Name[ko]=Dolphin 탐색 +Name[lt]=Dolphin navigacija Name[nb]=Navigasjon i Dolphin Name[nl]=Dolphin-navigatie Name[nn]=Navigasjon i Dolphin @@ -39,6 +40,7 @@ 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[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją. Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren. Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie. Comment[pt]=Este serviço permite a configuração da navegação do Dolphin. @@ -76,6 +78,7 @@ Name[id]=Navigasi Name[it]=Navigazione Name[ja]=ナビゲーション Name[ko]=탐색 +Name[lt]=Navigacija Name[nb]=Navigasjon Name[nl]=Navigatie Name[nn]=Navigasjon @@ -105,6 +108,7 @@ Comment[id]=Konfigurasi navigasi manajer berkas Comment[it]=Configura la navigazione col gestore dei file Comment[ja]=ファイルマネージャでのナビゲーションを設定します Comment[ko]=파일 관리자 탐색 설정 +Comment[lt]=Konfigūruokite failų tvarkyklės navigaciją Comment[nb]=Sett opp navigasjon i filbehandleren Comment[nl]=Bestandsbeheerdernavigatie configureren Comment[nn]=Set opp navigasjonen i filhandsamaren @@ -133,6 +137,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 |