diff options
| author | Luca Beltrame <[email protected]> | 2014-08-03 18:49:43 +0200 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2014-08-03 18:49:43 +0200 |
| commit | df871967c948de1aeb4d635fafd937369121aef0 (patch) | |
| tree | 596ab2bb91a9388d950a204f083ceb546d83a344 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 228aadd4d99498639d1b09f7cf09812a8071097a (diff) | |
| parent | 9203fdc4d9945b391cf0722334934df446938867 (diff) | |
Merge branch 'master' into frameworks
Conflicts:
dolphin/src/panels/places/placesitemmodel.cpp
kdepasswd/kcm/CMakeLists.txt [deleted in frameworks]
kdepasswd/kcm/main.cpp [deleted in frameworks]
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 a14ec500b..a30b6b590 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -117,7 +117,7 @@ Comment[nds]=Mit dissen Deenst laat sik allmeen Dolphin-Optschonen instellen. 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[pa]=ਇਹ ਸਰਵਿਸ ਆਮ ਡਾਲਫਿਨ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ। -Comment[pl]=Ta usługa pozwala na konfigurację ogólnych ustawień Dolphina. +Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite-lhe configurar as opções gerais do Dolphin. Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin. Comment[ro]=Acest serviciu permite configurarea opțiunilor generale ale lui Dolphin. @@ -272,7 +272,7 @@ Comment[nds]=Den Dateipleger allmeen instellen Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[nn]=Set opp generelle innstillingar for filhandsamaren Comment[pa]=ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja ogólnych ustawień zarządzania plikami +Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as opções gerais do gestor de ficheiros Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos Comment[ro]=Configurează opțiunile generale ale gestionarul de fișiere |