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

Conflicts:
	CMakeLists.txt [version number]
	kdecore/tests/kcharsetstest.cpp [deleted]

applet.cpp

@@ -1472,7 +1472,6 @@ void Applet::showConfigurationInterface()
     }
 
     if (immutability() != Mutable && !KAuthorized::authorize("plasma/allow_configure_when_locked")) {
-        //FIXME: in 4.3 add an explanatory dialog
         return;
     }
 
@@ -1706,7 +1705,7 @@ void AppletPrivate::configDialogFinished()
     }
 
 #ifdef ENABLE_REMOTE_WIDGETS
-    if (publishUI.publishCheckbox) {
+    if (KConfigDialog::exists(configDialogId()) && publishUI.publishCheckbox) {
         q->config().writeEntry("Share", publishUI.publishCheckbox->isChecked());
 
         if (publishUI.publishCheckbox->isChecked()) {

corona.cpp

@@ -517,8 +517,8 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig
             pos.setX(pos.x() + actualItem->boundingRect().width() - s.width());
         }
 
-        if (pos.x() + s.width() > v->geometry().right()) {
+        if (pos.x() + s.width() > v->geometry().x() + v->geometry().width()) {
-            pos.setX(v->geometry().right() - s.width());
+            pos.setX((v->geometry().x() + v->geometry().width()) - s.width());
         } else {
             pos.setX(qMax(pos.x(), v->geometry().left()));
         }
@@ -532,8 +532,8 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig
             pos.setY(pos.y() + actualItem->boundingRect().height() - s.height());
         }
 
-        if (pos.y() + s.height() > v->geometry().bottom()) {
+        if (pos.y() + s.height() > v->geometry().y() + v->geometry().height()) {
-            pos.setY(v->geometry().bottom() - s.height());
+            pos.setY((v->geometry().y() + v->geometry().height()) - s.height());
         } else {
             pos.setY(qMax(pos.y(), v->geometry().top()));
         }
@@ -568,10 +568,10 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig
         pos.setY(v->geometry().y() - s.height());
         break;
     case TopEdge:
-        pos.setY(v->geometry().bottom());
+        pos.setY(v->geometry().y() + v->geometry().height());
         break;
     case LeftEdge:
-        pos.setX(v->geometry().right());
+        pos.setX(v->geometry().x() + v->geometry().width());
         break;
     case RightEdge:
         pos.setX(v->geometry().x() - s.width());
@@ -586,12 +586,12 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig
 
     //kDebug() << "==> rect for" << screen << "is" << screenRect;
 
-    if (loc != LeftEdge && pos.x() + s.width() > screenRect.right()) {
+    if (loc != LeftEdge && pos.x() + s.width() > screenRect.x() + screenRect.width()) {
-        pos.rx() -= ((pos.x() + s.width()) - screenRect.right());
+        pos.rx() -= ((pos.x() + s.width()) - (screenRect.x() + screenRect.width()));
     }
 
-    if (loc != TopEdge && pos.y() + s.height() > screenRect.bottom()) {
+    if (loc != TopEdge && pos.y() + s.height() > screenRect.y() + screenRect.height()) {
-        pos.ry() -= ((pos.y() + s.height()) - screenRect.bottom());
+        pos.ry() -= ((pos.y() + s.height()) - (screenRect.y() + screenRect.height()));
     }
 
     pos.rx() = qMax(0, pos.x());

data/services/plasma.protocol

@@ -20,7 +20,9 @@ Description[et]=Plasma teenuste protokoll
 Description[eu]=Plasma zerbitzuentzako protokolo bat
 Description[fi]=Plasma-palvelujen yhteyskäytäntö
 Description[fr]=Un protocole pour les services Plasma
+Description[ga]=Prótacal le haghaidh seirbhísí Plasma
 Description[gl]=Un protocolo para servizos do Plasma
+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
@@ -42,11 +44,13 @@ Description[ro]=Un protocol pentru servicii Plasma
 Description[ru]=Протокол для служб Plasma
 Description[se]=Protokolla Plasma-bálvalusaid várás
 Description[sk]=Protokol pre Plasma služby
+Description[sl]=Protokol za storitve Plasme
 Description[sr]=Протокол за плазма сервисе
 Description[sr@ijekavian]=Протокол за плазма сервисе
 Description[sr@ijekavianlatin]=Protokol za plasma servise
 Description[sr@latin]=Protokol za plasma servise
 Description[sv]=Ett protokoll för Plasma-tjänster
+Description[tg]=Протоколи хидматҳои Plasma
 Description[tr]=Plasma servisleri için bir protokol
 Description[ug]=پلازما(Plasma) مۇلازىمىتىنىڭ كېلىشىمى
 Description[uk]=Протокол для служб Плазми

data/servicetypes/plasma-applet-popupapplet.desktop

@@ -24,6 +24,7 @@ Comment[fy]=Plasma scripting popup applet
 Comment[ga]=Feidhmchláirín aníos scriptithe Plasma
 Comment[gl]=Applet contextual de scripts de Plasma
 Comment[gu]=પ્લાઝમા સ્ક્રિપ્ટીંગ પોપઅપ એપ્લેટ
+Comment[he]=תפריט מוקפץ עבור יישומון תסריט של Plasma
 Comment[hr]=Plasmin skriptni skočni applet
 Comment[hu]=Szkriptkezelő kisalkalmazás a Plasmához
 Comment[ia]=Applet popup de scripting de Plasma

data/servicetypes/plasma-containmentactions.desktop

@@ -20,6 +20,7 @@ Comment[fi]=Plasma ContainmentActions
 Comment[fr]=Plasma d'actions contenantes
 Comment[ga]=Gníomhartha Coimeádán Plasma
 Comment[gl]=ContainmentActions de Plasma 
+Comment[he]=Plasma ContainmentActions
 Comment[hr]=Plasma ContainmentActions
 Comment[hu]=Plasma tartóműveletek
 Comment[ia]=Actiones  de continemento Plasma

data/servicetypes/plasma-dataengine.desktop

@@ -71,7 +71,7 @@ Comment[ta]=பிளாஸ்மா தரவு இயந்திரம்
 Comment[tg]=Системаи маълумотии Plasma
 Comment[th]=กลไกข้อมูลของพลาสมา
 Comment[tr]=Plasma Veri Motoru
-Comment[ug]=Plasma سانلىق مەلۇمات ماتورى
+Comment[ug]=Plasma سانلىق-مەلۇمات ماتورى
 Comment[uk]=Рушій даних Плазми
 Comment[vi]=Cơ chế dữ liệu Plasma
 Comment[wa]=Moteur di dnêyes di Plasma

data/servicetypes/plasma-service.desktop

@@ -17,7 +17,9 @@ Comment[et]=Plasma teenus
 Comment[eu]=Plasma zerbitzua
 Comment[fi]=Plasma-palvelu
 Comment[fr]=Service Plasma
+Comment[ga]=Seirbhís Plasma
 Comment[gl]=Servizo do Plasma
+Comment[he]=שירות של Plasma
 Comment[hr]=Servis u Plasmi
 Comment[hu]=Plazma-szolgáltatás
 Comment[ia]=Servicio de Plasma
@@ -41,11 +43,13 @@ Comment[ru]=Служба Plasma
 Comment[se]=Plasma-bálvalus
 Comment[si]=ප්ලස්මා සේවා
 Comment[sk]=Služba Plasma
+Comment[sl]=Storitev Plasme
 Comment[sr]=Плазма сервис
 Comment[sr@ijekavian]=Плазма сервис
 Comment[sr@ijekavianlatin]=Plasma servis
 Comment[sr@latin]=Plasma servis
 Comment[sv]=Plasma-tjänst
+Comment[tg]=Хидматҳои Plasma
 Comment[th]=บริการของพลาสมา
 Comment[tr]=Plasma servisi
 Comment[ug]=Plasma مۇلازىمىتى

data/servicetypes/plasma-toolbox.desktop

@@ -17,7 +17,9 @@ Comment[et]=Plasma tööriistakast
 Comment[eu]=Plasma tresna-kutxa
 Comment[fi]=Plasma-työkalurivi
 Comment[fr]=Boîte à outils Plasma
+Comment[ga]=Bosca uirlisí Plasma
 Comment[gl]=Barra de ferramentas do Plasma
+Comment[he]=ארגז כלים של Plasma
 Comment[hr]=Plasma alatni okvir
 Comment[hu]=Plazma-eszközkészlet
 Comment[ia]=Instrumentario de Plasma
@@ -42,12 +44,14 @@ Comment[ru]=Панель инструментов Plasma
 Comment[se]=Plasma-reaidoboksa
 Comment[si]=ප්ලස්මා මෙවලම් පෙට්ටිය
 Comment[sk]=Nástroje Plasma
+Comment[sl]=Orodjana v Plasmi
 Comment[sr]=Плазма алатница
 Comment[sr@ijekavian]=Плазма алатница
 Comment[sr@ijekavianlatin]=Plasma alatnica
 Comment[sr@latin]=Plasma alatnica
 Comment[sv]=Plasma verktygslåda
 Comment[ta]=பிளாஸ்மா கருவிப்பட்டி
+Comment[tg]=Лавҳаи воситаҳои Plasma
 Comment[th]=กล่องเครื่องมือของพลาสมา
 Comment[tr]=Plasma araç kutusu
 Comment[ug]=Plasma قورال ساندۇقى

tests/packagemetadatatest.desktop

@@ -23,7 +23,7 @@ Name[fy]=Package metadata testtriem
 Name[ga]=Comhad tástála le haghaidh PackageMetaData
 Name[gl]=Ficheiro de proba de metadatos de paquete
 Name[gu]=પેકેજ મેટાડેટા ચકાસણી ફાઇલ
-Name[he]=חבילת בדיקה של מטה־מידע
+Name[he]=חבילת בדיקה של מטא־מידע
 Name[hne]=पैकेज मेटाडाटा जांच फाइल
 Name[hr]=Paketna, metapodatkovna, probna datoteka
 Name[hsb]=Testowa dataja za metadata pakćika
@@ -64,7 +64,7 @@ Name[ta]=பொதியின் மூலத்தரவு சோதனைக
 Name[tg]=Файли санҷишии стсетмаи metadata
 Name[th]=แฟ้มทดสอบข้อมูลกำกับแพกเกจ
 Name[tr]=Paket metadata test dosyası
-Name[ug]=بوغچا مېتا سانلىق مەلۇمات سىناق ھۆججەت
+Name[ug]=بوغچا مېتا سانلىق-مەلۇمات سىناق ھۆججەت
 Name[uk]=Файл перевірки метаданих пакунка
 Name[vi]=Tập tin kiểm tra dữ liệu lý lịch Plasma
 Name[wa]=Fitchî d' asprouvaedje des meta-dnêyes do pacaedje

tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop

@@ -15,7 +15,9 @@ Name[eu]=Proba
 Name[fa]=آزمون
 Name[fi]=Testi
 Name[fr]=Test
+Name[ga]=Tástáil
 Name[gl]=Proba
+Name[he]=בדיקה
 Name[hr]=Test
 Name[hu]=Teszt
 Name[ia]=Essayo
@@ -40,14 +42,16 @@ Name[ru]=Проверка
 Name[se]=Geahččaleapmi
 Name[si]=පරීක්‍ෂණය
 Name[sk]=Test
+Name[sl]=Test
 Name[sr]=Проба
 Name[sr@ijekavian]=Проба
 Name[sr@ijekavianlatin]=Proba
 Name[sr@latin]=Proba
 Name[sv]=Test
+Name[tg]=Санҷиш
 Name[th]=ทดสอบ
 Name[tr]=Deneme
-Name[ug]=سىنا
+Name[ug]=سىناق
 Name[uk]=Тест
 Name[vi]=Kiểm tra
 Name[wa]=Sayî
@@ -69,7 +73,9 @@ Comment[et]=Libaplugin testimiseks
 Comment[eu]=Probatarako gezurretazko plugin bat
 Comment[fi]=Tyhjä testausliitännäinen
 Comment[fr]=Un module factice de test
+Comment[ga]=Bréagbhreiseán le haghaidh tástála
 Comment[gl]=Un engadido para probas
+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
@@ -93,11 +99,13 @@ Comment[ro]=Modul fictiv pentru testare
 Comment[ru]=Расширение для тестирования
 Comment[se]=Geahččalanlassemodula
 Comment[sk]=Ukážkový modul pre testovanie
+Comment[sl]=Prazen vstavek za testiranje
 Comment[sr]=Лажни прикључак за пробе
 Comment[sr@ijekavian]=Лажни прикључак за пробе
 Comment[sr@ijekavianlatin]=Lažni priključak za probe
 Comment[sr@latin]=Lažni priključak za probe
 Comment[sv]=Ett exempelinsticksprogram för test
+Comment[tg]=Воситаҳо барои санҷиш
 Comment[th]=โปรแกรมเสริมเทียมสำหรับทดสอบ
 Comment[tr]=Denemek için sahte bir eklenti
 Comment[ug]=سىناشقا ئىشلىتىدىغان قىستۇرما