Merge remote-tracking branch 'origin/KDE/4.9' into frameworks

Conflicts:
	CMakeLists.txt [versioning]
	kio/kio/accessmanager.cpp [headers]
	tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT]
	tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT]

containment.cpp

@@ -552,6 +552,10 @@ void Containment::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
 void Containment::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+    //close a toolbox if exists, to emulate qmenu behavior
+    if (d->toolBox) {
+        d->toolBox.data()->setShowing(false);
+    }
     event->ignore();
     if (d->appletAt(event->scenePos())) {
         return; //no unexpected click-throughs
@@ -581,6 +585,7 @@ void Containment::mousePressEvent(QGraphicsSceneMouseEvent *event)
 void Containment::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     event->ignore();
+
     if (d->appletAt(event->scenePos())) {
         return; //no unexpected click-throughs
     }

data/services/plasma.protocol

@@ -27,7 +27,6 @@ Description[he]=פרוטוקול עבור הרכיבים של Plasma
 Description[hr]=Protokol za servise u Plasmi
 Description[hu]=Protokoll a Plazma-szolgáltatáshoz
 Description[ia]=un protocollo per servicios de Plasma
-Description[id]=Protokol untuk layanan Plasma
 Description[is]=Samskiptamáti fyrir Plasma-þjónustur
 Description[it]=Un protocollo per servizi plasma
 Description[ja]=Plasma サービスのためのプロトコル

data/servicetypes/plasma-service.desktop

@@ -21,10 +21,10 @@ Comment[fr]=Service Plasma
 Comment[ga]=Seirbhís Plasma
 Comment[gl]=Servizo do Plasma
 Comment[he]=שירות של Plasma
+Comment[hi]=प्लासमा सेवा
 Comment[hr]=Servis u Plasmi
 Comment[hu]=Plazma-szolgáltatás
 Comment[ia]=Servicio de Plasma
-Comment[id]=Layanan Plasma
 Comment[is]=Plasma-þjónusta
 Comment[it]=Servizio plasma
 Comment[ja]=Plasma サービス

data/servicetypes/plasma-toolbox.desktop

@@ -21,10 +21,10 @@ Comment[fr]=Boîte à outils Plasma
 Comment[ga]=Bosca uirlisí Plasma
 Comment[gl]=Barra de ferramentas do Plasma
 Comment[he]=ארגז כלים של Plasma
+Comment[hi]=प्लासमा औज़ारबक्सा
 Comment[hr]=Plasma alatni okvir
 Comment[hu]=Plazma-eszközkészlet
 Comment[ia]=Instrumentario de Plasma
-Comment[id]=Kotak alat Plasma
 Comment[is]=Plasma verkfærasafn
 Comment[it]=Barra degli strumenti plasma
 Comment[ja]=Plasma ツールボックス

data/servicetypes/plasma-wallpaper.desktop

@@ -28,6 +28,7 @@ Comment[ga]=Cúlbhrat Plasma
 Comment[gl]=Fondo de escritorio do Plasma
 Comment[gu]=પ્લાઝમા વોલપેપર
 Comment[he]=תמונת רקע של Plasma
+Comment[hi]=प्लाजमा वालपेपर
 Comment[hne]=प्लाज्मा वालपेपर
 Comment[hr]=Plasmina pozadinska slika
 Comment[hsb]=Tapeta za Plasma

tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop

@@ -19,10 +19,10 @@ Name[fr]=Test
 Name[ga]=Tástáil
 Name[gl]=Proba
 Name[he]=בדיקה
+Name[hi]=जांच
 Name[hr]=Test
 Name[hu]=Teszt
 Name[ia]=Essayo
-Name[id]=Tes
 Name[is]=Prófun
 Name[it]=Prova
 Name[ja]=テスト
@@ -84,7 +84,6 @@ Comment[he]=תוסף דמה לבדיקה
 Comment[hr]=Lažan priključak za testiranje
 Comment[hu]=Üres bővítmény teszteléshez
 Comment[ia]=Un plugin vacue pro essayar
-Comment[id]=Plugin palsu untuk pengujian
 Comment[is]=Tilraunaíforrit fyrir prófanir
 Comment[it]=Una estensione fittizia di prova
 Comment[ja]=テスト用のダミープラグイン

tests/testengine/plasma-dataengine-testengine.desktop

@@ -25,6 +25,7 @@ Name[ga]=Inneall Sonraí Tástála
 Name[gl]=Motor de datos de probas
 Name[gu]=ચકાસણી માહિતી એન્જિન
 Name[he]=בדיקה למנוע מידע
+Name[hi]=जाँच डाटा इंजिन
 Name[hne]=जांच डाटा इंजिन
 Name[hr]=Provjeri podatkovni mehanizam
 Name[hsb]=Test Data Engine