diff options
| author | l10n daemon script <[email protected]> | 2015-12-08 10:05:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-08 10:05:01 +0000 |
| commit | c0d5537afb10f09aaa6b47a994e8f8024c1006b4 (patch) | |
| tree | 8487c351a74f6c737759ba63b609f1ad30aff821 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 9c432e6905c41193e0dff759ba5c61ac295e41ac (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index d75020e03..e810ebff9 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -59,6 +59,7 @@ Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다. Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus. 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. Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin. Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin. @@ -147,6 +148,7 @@ Comment[ko]=일반 파일 관리자 설정 Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas Comment[nb]=Sett opp generelle innstillinger for filbehandleren Comment[nl]=Algemene bestandsbeheerderinstellingen configureren +Comment[nn]=Set opp generelle innstillingar for filhandsamaren Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as definições gerais do gestor de ficheiros Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos |