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/kcmdolphingeneral.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/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 b57c6711e..a1cb745bd 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -20,6 +20,7 @@ Name[hi]=डॉल्फ़िन साधारण Name[hu]=Dolphin: Általános Name[ia]=Dolphin General Name[id]=Dolphin Umum +Name[is]=Almennt um Dolphin Name[it]=Impostazioni generali 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 általános beállításainak módosítását. Comment[ia]=Iste servicio permitte configuration del preferentias general de Dolphin. Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin. +Comment[is]=Þessi þjónusta leyfir breytingar á almennum stillingum á Dolphin. Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin. Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스를 통해 일반 Dolphin 설정을 구성할 수 있습니다. @@ -134,6 +136,7 @@ Name[hi]=साधारण Name[hu]=Általános Name[ia]=General Name[id]=Umum +Name[is]=Almennt Name[it]=Generale Name[ja]=全般 Name[ko]=일반 @@ -186,6 +189,7 @@ Comment[hi]=साधारण फ़ाइल प्रबंधक सेट� Comment[hu]=A fájlkezelő általános beállításainak módosítása Comment[ia]=Configura preferentias del gerente general de file Comment[id]=Konfigurasikan pengaturan pengelola file umum +Comment[is]=Sýsla með almennar stillingar skráastjóra Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 구성 @@ -238,6 +242,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]=파일 관리자 |