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/kcmdolphinservices.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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 7e232ee52..25710e019 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -222,7 +222,7 @@ Comment[nds]=Dateipleger-Deensten instellen Comment[nl]=Bestandsbeheerderservices configureren Comment[nn]=Set opp tenester i filhandsamaren Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਸਰਵਿਸ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja usług zarządzania plikami +Comment[pl]=Ustawienia usług zarządzania plikami Comment[pt]=Configurar os serviços do gestor de ficheiros Comment[pt_BR]=Configura os serviços do gerenciador de arquivos Comment[ro]=Configurează serviciile gestionarului de fișiere |