diff options
| author | l10n daemon script <[email protected]> | 2021-10-09 01:19:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-10-09 01:19:17 +0000 |
| commit | 1937681d50d12a8c1a7f21c854aa99d3f4b0277b (patch) | |
| tree | a9c8c03264e9e339c927575e95c020a719d13bcd /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | ec031d0f7dfecfe0fb1cd7c17e0e60296f308c3d (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 6df10ac24..f532647c5 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -20,6 +20,7 @@ Name[hi]=डॉल्फ़िन संचालन Name[hu]=Dolphin: Navigáció Name[ia]=Navigation de Dolphin Name[id]=Navigasi Dolphin +Name[is]=Flakk í Dolphin Name[it]=Navigazione di Dolphin Name[ja]=Dolphin ナビゲーション Name[ko]=Dolphin 탐색 @@ -73,6 +74,7 @@ Comment[hi]=यह सेवा डॉल्फिन संचालन के Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin navigálásának beállítását. Comment[ia]=Iste servicio permitte le configuration del navigation de Dolphin. Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin. +Comment[is]=Þessi þjónusta leyfir stillingar á flakkstýringum Dolphin. Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin. Comment[ja]=Dolphin でのナビゲーションを設定します Comment[ko]=이 서비스를 통해 Dolphin 탐색을 설정할 수 있습니다. @@ -133,6 +135,7 @@ Name[hi]=संचालन Name[hu]=Navigálás Name[ia]=Navigation Name[id]=Navigasi +Name[is]=Flakk Name[it]=Navigazione Name[ja]=ナビゲーション Name[ko]=탐색 @@ -186,6 +189,7 @@ Comment[hi]=फ़ाइल प्रबंधक संचालन विन� Comment[hu]=A fájlkezelő navigálásának beállítása Comment[ia]=Configura navigation del gerente de file Comment[id]=Konfigurasikan navigasi pengelola file +Comment[is]=Stilla flakkstýringu í skráastjóra Comment[it]=Configura la navigazione col gestore dei file Comment[ja]=ファイルマネージャでのナビゲーションを設定します Comment[ko]=파일 관리자 탐색 설정 @@ -239,6 +243,7 @@ X-KDE-Keywords[hi]=फ़ाइल प्रबंधक X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[id]=pengelola file +X-KDE-Keywords[is]=skráastjóri X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 |