diff options
| author | l10n daemon script <[email protected]> | 2019-05-22 05:14:39 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-05-22 05:14:39 +0200 |
| commit | 22f78c474acec7e2c4a81caa8a4a2d0025bec663 (patch) | |
| tree | 72496d0ecdcd3cc866da8fa7cb398083277f8829 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 1b985d1ef400de024ed221264a55fd58affdec0c (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 64c00713b..01163842b 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -21,6 +21,7 @@ Name[it]=Impostazioni generali di Dolphin Name[ja]=Dolphin 全般 Name[ko]=Dolphin 일반 Name[lt]=Dolphin bendrieji +Name[ml]=പൊതു സജ്ജീകരണങ്ങള് Name[nb]=Dolphin generelt Name[nl]=Dolphin algemeen Name[nn]=Generelt for Dolphin @@ -65,6 +66,7 @@ Comment[it]=Questo servizio permette di configurare le impostazioni generali di Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다. Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendrąsias nuostatas. +Comment[ml]=പൊതുവായ ഡോള്ഫിന് സജ്ജീകരണങ്ങള് ക്രമീകരിയ്ക്കാന് ഈ സേവനം അനുവദിക്കുന്നു. Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin. Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. Comment[nn]=Denne tenesta lèt deg setja opp generelle innstillingar for Dolphin. @@ -121,6 +123,7 @@ Name[it]=Generale Name[ja]=全般 Name[ko]=일반 Name[lt]=Bendra +Name[ml]=പൊതുവായതു് Name[nb]=Generelt Name[nl]=Algemeen Name[nn]=Generelt @@ -164,6 +167,7 @@ Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 Comment[lt]=Bendrųjų failų tvarkyklės nuostatų konfigūravimas +Comment[ml]=ഫയൽ മാനേജറിന്റെ പൊതുവായ സജ്ജീകരണങ്ങള് ക്രമീകരിയ്ക്കുക Comment[nb]=Sett opp generelle innstillinger for filbehandleren Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[nn]=Set opp generelle innstillingar for filhandsamaren @@ -208,6 +212,7 @@ X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė +X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar |