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

corona.cpp

@@ -540,8 +540,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()) {
-            pos.setX(v->geometry().right() - s.width());
+        if (pos.x() + s.width() > v->geometry().x() + v->geometry().width()) {
+            pos.setX((v->geometry().x() + v->geometry().width()) - s.width());
         } else {
             pos.setX(qMax(pos.x(), v->geometry().left()));
         }
@@ -555,8 +555,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()) {
-            pos.setY(v->geometry().bottom() - s.height());
+        if (pos.y() + s.height() > v->geometry().y() + v->geometry().height()) {
+            pos.setY((v->geometry().y() + v->geometry().height()) - s.height());
         } else {
             pos.setY(qMax(pos.y(), v->geometry().top()));
         }
@@ -591,10 +591,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());
@@ -609,12 +609,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()) {
-        pos.rx() -= ((pos.x() + s.width()) - screenRect.right());
+    if (loc != LeftEdge && pos.x() + s.width() > screenRect.x() + screenRect.width()) {
+        pos.rx() -= ((pos.x() + s.width()) - (screenRect.x() + screenRect.width()));
     }
 
-    if (loc != TopEdge && pos.y() + s.height() > screenRect.bottom()) {
-        pos.ry() -= ((pos.y() + s.height()) - screenRect.bottom());
+    if (loc != TopEdge && pos.y() + s.height() > screenRect.y() + screenRect.height()) {
+        pos.ry() -= ((pos.y() + s.height()) - (screenRect.y() + screenRect.height()));
     }
 
     pos.rx() = qMax(0, pos.x());

data/services/plasma.protocol

@@ -20,6 +20,7 @@ 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[hr]=Protokol za servise u Plasmi
 Description[hu]=Protokoll a Plazma-szolgáltatáshoz

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,6 +17,7 @@ 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[hr]=Servis u Plasmi
 Comment[hu]=Plazma-szolgáltatás

data/servicetypes/plasma-toolbox.desktop

@@ -17,6 +17,7 @@ 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[hr]=Plasma alatni okvir
 Comment[hu]=Plazma-eszközkészlet

tests/packagemetadatatest.desktop

@@ -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,6 +15,7 @@ Name[eu]=Proba
 Name[fa]=آزمون
 Name[fi]=Testi
 Name[fr]=Test
+Name[ga]=Tástáil
 Name[gl]=Proba
 Name[hr]=Test
 Name[hu]=Teszt
@@ -47,7 +48,7 @@ Name[sr@latin]=Proba
 Name[sv]=Test
 Name[th]=ทดสอบ
 Name[tr]=Deneme
-Name[ug]=سىنا
+Name[ug]=سىناق
 Name[uk]=Тест
 Name[vi]=Kiểm tra
 Name[wa]=Sayî
@@ -69,6 +70,7 @@ 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[hr]=Lažan priključak za testiranje
 Comment[hu]=Üres bővítmény teszteléshez