diff options
| author | l10n daemon script <[email protected]> | 2019-11-11 05:17:33 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-11-11 05:17:33 +0100 |
| commit | b9a2df09fcb5f7e1e62b742d32e961437a988da8 (patch) | |
| tree | e3d2cdbdd9f54be9fb30aadd4715aad08787ba93 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 4c81a78bae9ed8f927334f6b1f0475dc9159cba7 (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 6a5d70bef..d3f19539a 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 bendrosios +Name[lv]=Dolphin vispārējs Name[ml]=പൊതു സജ്ജീകരണങ്ങള് Name[nb]=Dolphin generelt Name[nl]=Dolphin algemeen @@ -66,6 +67,7 @@ Comment[it]=Questo servizio permette di configurare le impostazioni generali di Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스를 통해 일반 Dolphin 설정을 구성할 수 있습니다. Comment[lt]=Ši paslauga leidžia bendrųjų Dolphin nuostatų konfigūravimą. +Comment[lv]=Šis serviss ļauj konfigurēt vispārējos Dolphin iestatījumus. 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. @@ -123,6 +125,7 @@ Name[it]=Generale Name[ja]=全般 Name[ko]=일반 Name[lt]=Bendrosios +Name[lv]=Vispārējs Name[ml]=പൊതുവായതു് Name[nb]=Generelt Name[nl]=Algemeen @@ -167,6 +170,7 @@ Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 구성 Comment[lt]=Konfigūruoti bendras failų tvarkytuvės nuostatas +Comment[lv]=Konfigurēt vispārējā datņu pārvaldnieka iestatījumus Comment[ml]=ഫയൽ മാനേജറിന്റെ പൊതുവായ സജ്ജീകരണങ്ങള് ക്രമീകരിയ്ക്കുക Comment[nb]=Sett opp generelle innstillinger for filbehandleren Comment[nl]=Algemene bestandsbeheerderinstellingen configureren @@ -212,6 +216,7 @@ X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=failų tvarkytuvė +X-KDE-Keywords[lv]=datņu pārvaldnieks X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder |