diff options
| author | l10n daemon script <[email protected]> | 2019-10-28 05:14:09 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-10-28 05:14:09 +0100 |
| commit | e6dc4739c3c7373f203a27cde2e31f8de1811e3a (patch) | |
| tree | 9efbf8d07ef03e85bc43f5b88e934a69bdca4d2e /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | a516f46b44b0ac5b770a2065a9da15ba97d4a3b0 (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, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 75a5aaf0c..6a5d70bef 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -64,7 +64,7 @@ Comment[ia]=Iste servicio permitte configuration del preferentias general de Dol 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[ko]=이 서비스를 통해 일반 Dolphin 설정을 구성할 수 있습니다. Comment[lt]=Ši paslauga leidžia bendrųjų Dolphin nuostatų konfigūravimą. Comment[ml]=പൊതുവായ ഡോള്ഫിന് സജ്ജീകരണങ്ങള് ക്രമീകരിയ്ക്കാന് ഈ സേവനം അനുവദിക്കുന്നു. Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin. @@ -165,7 +165,7 @@ Comment[ia]=Configura preferentias del gerente general de file Comment[id]=Konfigurasikan pengaturan pengelola file umum Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います -Comment[ko]=일반 파일 관리자 설정 +Comment[ko]=일반 파일 관리자 설정 구성 Comment[lt]=Konfigūruoti bendras failų tvarkytuvės nuostatas Comment[ml]=ഫയൽ മാനേജറിന്റെ പൊതുവായ സജ്ജീകരണങ്ങള് ക്രമീകരിയ്ക്കുക Comment[nb]=Sett opp generelle innstillinger for filbehandleren |