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]

4 files changed, 7 insertions, 7 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
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index ea1516a1d..a9362a996 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -118,7 +118,7 @@ Comment[nds]=Mit dissen Deenst lett sik de Dolphin-Navigeren instellen.
 Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
 Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin.
 Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ।
-Comment[pl]=Ta usługa umożliwia konfigurację nawigacji w Dolphinie.
+Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.
 Comment[pt]=Este serviço permite-lhe configurar a navegação do Dolphin.
 Comment[pt_BR]=Este serviço permite configurar a navegação do Dolphin.
 Comment[ro]=Acest serviciu permite configurarea navigării Dolphin.
@@ -272,7 +272,7 @@ Comment[nds]=De Dateipleger-Navigeren instellen
 Comment[nl]=Bestandsbeheerdernavigatie configureren
 Comment[nn]=Set opp navigasjonen i filhandsamaren
 Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਨੇਵੀਗੇਸ਼ਨ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja nawigacji w zarządzaniu plikami
+Comment[pl]=Ustawienia nawigacji w zarządzaniu plikami
 Comment[pt]=Configurar a navegação do gestor de ficheiros
 Comment[pt_BR]=Configura a navegação do gerenciador de arquivos
 Comment[ro]=Configurează navigarea gestionarului de fișiere
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
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index d091aff22..3856fc676 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -116,7 +116,7 @@ Comment[nds]=Mit dissen Deenst laat sik de Dolphin-Ansichten instellen.
 Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
 Comment[nn]=Denne tenesta lèt deg setja opp Dolphin-visingar.
 Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਝਲਕ ਮੋਡ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ।
-Comment[pl]=Ta usługa umożliwia konfigurację trybów widoku Dolphina.
+Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.
 Comment[pt]=Este serviço permite-lhe configurar os modos de visualização do Dolphin.
 Comment[pt_BR]=Este serviço permite configurar os modos de exibição do Dolphin.
 Comment[ro]=Acest serviciu permite configurarea regimurilor de vizualizare Dolphin.
@@ -270,7 +270,7 @@ Comment[nds]=Den Dateipleger sien Ansichten instellen
 Comment[nl]=Bestandsbeheerderweergavemodussen configureren
 Comment[nn]=Set opp visingsmodusane i filhandsamaren
 Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਝਲਕ ਮੋਡ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja trybów widoku zarządzania plikami
+Comment[pl]=Ustawienia trybów widoku zarządzania plikami
 Comment[pt]=Configurar os modos de visualização do gestor de ficheiros
 Comment[pt_BR]=Configura os modos de exibição do gerenciador de arquivos
 Comment[ro]=Configurează regimurile de vizualizare ale gestionarului de fișiere