File 4_1_BRANCH.diff of Package kdenetwork4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_1_BRANCH.diff of Package kdenetwork4 (Revision 735a568db71522ef6fda52f7597028c4)

Currently displaying revision 735a568db71522ef6fda52f7597028c4 , Show latest

package: kdenetwork-4.1.0.tar.bz2
kdemod: kdenetwork
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 847963
+svn di between //tags/KDE/4.1.0/kdenetwork and //branches/KDE/4.1/kdenetwork
--- krdc/vnc/vncview.cpp
+++ krdc/vnc/vncview.cpp
@@ -39,10 +39,18 @@
 #include <QPainter>
 #include <QMouseEvent>
 
+// Definition of key modifier mask constants
+#define KMOD_Alt_R 	0x01
+#define KMOD_Alt_L 	0x02
+#define KMOD_Meta_L 	0x04
+#define KMOD_Control_L 	0x08
+#define KMOD_Shift_L	0x10
+
 VncView::VncView(QWidget *parent, const KUrl &url)
         : RemoteView(parent),
         m_initDone(false),
         m_buttonMask(0),
+        m_modifiersMask(0),
         m_repaint(false),
         m_quitFlag(false),
         m_firstPasswordTry(true),
@@ -239,6 +247,14 @@
     m_w = w;
     m_h = h;
 
+    if (m_horizontalFactor != 1.0 || m_verticalFactor != 1.0) {
+        // If the view is scaled, grow the update rectangle to avoid artifacts
+        m_x-=1;
+        m_y-=1;
+        m_w+=2;
+        m_h+=2;
+    }
+
     m_frame = vncThread.image();
 
     if (!m_initDone) {
@@ -263,13 +279,13 @@
 #endif
     }
 
-    if ((y == 0 && x == 0) && (m_frame.size() != size())) {
+    if ((m_y == 0 && m_x == 0) && (m_frame.size() != size())) {
         resize(m_frame.width(), m_frame.height());
         emit changeSize(m_frame.width(), m_frame.height());
     }
 
     m_repaint = true;
-    repaint(qRound(x * m_horizontalFactor), qRound(y * m_verticalFactor), qRound(w * m_horizontalFactor), qRound(h * m_verticalFactor));
+    repaint(qRound(m_x * m_horizontalFactor), qRound(m_y * m_verticalFactor), qRound(m_w * m_horizontalFactor), qRound(m_h * m_verticalFactor));
     m_repaint = false;
 }
 
@@ -354,7 +370,7 @@
 {
 //     kDebug(5011) << "focusOutEvent";
 
-    if (event->reason() == Qt::TabFocusReason) {
+    if (event->reason() == Qt::TabFocusReason || event->reason() == Qt::BacktabFocusReason) {
 //         kDebug(5011) << "event->reason() == Qt::TabFocusReason";
         event->ignore();
         setFocus(); // get focus back and send tab key event to remote desktop
@@ -433,8 +449,8 @@
     else
         eb |= 0x8;
 
-    int x = event->x();
-    int y = event->y();
+    int x = qRound(event->x() / m_horizontalFactor);
+    int y = qRound(event->y() / m_verticalFactor);
 
     vncThread.mouseEvent(x, y, eb | m_buttonMask);
     vncThread.mouseEvent(x, y, m_buttonMask);
@@ -444,6 +460,8 @@
 
 void VncView::keyEvent(QKeyEvent *e)
 {
+    int mask = 0;
+    
     rfbKeySym k = 0;
     switch (e->key()) {
     case Qt::Key_Backspace: k = XK_BackSpace; break;
@@ -483,30 +501,52 @@
     case Qt::Key_NumLock: k = XK_Num_Lock; break;
     case Qt::Key_CapsLock: k = XK_Caps_Lock; break;
     case Qt::Key_ScrollLock: k = XK_Scroll_Lock; break;
-    case Qt::Key_Shift: k = XK_Shift_L; break;
-    case Qt::Key_Control: k = XK_Control_L; break;
-    case Qt::Key_AltGr: k = XK_Alt_R; break;
-    case Qt::Key_Alt: k = XK_Alt_L; break;
-    case Qt::Key_Meta: k = XK_Meta_L; break;
+    case Qt::Key_Shift: k = XK_Shift_L; mask |= KMOD_Shift_L; break;
+    case Qt::Key_Control: k = XK_Control_L; mask |= KMOD_Control_L; break;
+    case Qt::Key_AltGr: k = XK_ISO_Level3_Shift; mask |= KMOD_Alt_R; break;
+    case Qt::Key_Alt: k = XK_Alt_L; mask |= KMOD_Alt_L; break;
+    case Qt::Key_Meta: k = XK_Meta_L; mask |= KMOD_Meta_L; break;
     case Qt::Key_Mode_switch: k = XK_Mode_switch; break;
     case Qt::Key_Help: k = XK_Help; break;
     case Qt::Key_Print: k = XK_Print; break;
     case Qt::Key_SysReq: k = XK_Sys_Req; break;
     default: break;
     }
+    
+    // Transform dead keys
+    if (e->key() >= Qt::Key_Dead_Grave && e->key() <= Qt::Key_Dead_Horn) {
+        k = e->key() - Qt::Key_Dead_Grave + XK_dead_grave;
+    }
+    
+    bool pressed = (e->type() == QEvent::KeyPress) ? true : false;
+    m_modifiersMask = pressed ? m_modifiersMask | mask : m_modifiersMask & ~mask;
+
+    bool hasShift = m_modifiersMask & KMOD_Shift_L;
+    bool hasOtherMod = m_modifiersMask & (KMOD_Alt_R | KMOD_Alt_L | KMOD_Meta_L | KMOD_Control_L);
+    bool isUpper = e->key() >= 'A' && e->key() <= 'Z';
+    // bool isLower = e->key() >= 'a' && e->key() <= 'z';
+    // bool isLetter = isLower || isUpper;
+    
+    // If shift is pressed, we receive Alt as Meta, but we want to actually send Alt.
+    if (k == XK_Meta_L && hasShift) k = XK_Alt_L;
 
     if (k == 0) {
-        if (e->key() < 0x100 && e->text().length() > 0)
-            k = QChar(e->text().at(0)).unicode(); //respect upper- / lowercase
-        else
-            rfbClientLog("Unknown keysym: %d\n", e->key());
+        if (hasOtherMod && (! isUpper || hasShift)) {
+            k = e->key();
+        } else {
+            if (e->key() < 0x100 && e->text().length() > 0)
+                k = QChar(e->text().at(0)).unicode(); //respect upper- / lowercase
+            else
+                rfbClientLog("Unknown keysym: 0x%x\n", e->key());
+        }
     }
 
     if (k < 26) // workaround for modified keys by pressing CTRL
         k += 96;
 
-    vncThread.keyEvent(k, (e->type() == QEvent::KeyPress) ? true : false);
+    //rfbClientLog("Key event(%s): orig: 0x%x, sent: 0x%x\n", pressed ? "P" : "R", e->key(), k);
 
+    vncThread.keyEvent(k, pressed);
     RemoteView::keyEvent(e);
 }
 
--- krdc/vnc/vncview.h
+++ krdc/vnc/vncview.h
@@ -79,6 +79,7 @@
     QClipboard *m_clipboard;
     bool m_initDone;
     int m_buttonMask;
+    int m_modifiersMask; // Stores the currently pressed modifier keys
     int m_x, m_y, m_w, m_h;
     bool m_repaint;
     bool m_quitFlag;
--- krdc/krdc.desktop
+++ krdc/krdc.desktop
@@ -24,6 +24,7 @@
 GenericName[ko]=원격 데스크톱 클라이언트
 GenericName[lt]=Nutolusio darbastalio klientas
 GenericName[lv]=Attālinātās darbvirsmas klients
+GenericName[nb]=Tilkobling til annet skrivebord
 GenericName[nds]=Schriefdisch-Feernverbinnen
 GenericName[nl]=Client voor verbinding met extern bureaublad
 GenericName[pl]=Klient zdalnego dostępu do pulpitu
--- krdc/mainwindow.cpp
+++ krdc/mainwindow.cpp
@@ -523,8 +523,10 @@
 
         KToggleFullScreenAction::setFullScreen(m_fullscreenWindow, true);
 
-        // show the toolbar after we have switched to fullscreen mode
-        QTimer::singleShot(100, this, SLOT(showRemoteViewToolbar()));
+        // show the toolbar after we have switched to fullscreen mode                                      
+        // Note: there is a race condition here, if the timer fires before the window is 
+        // resized, the toolbar is not shown.
+        QTimer::singleShot(500, this, SLOT(showRemoteViewToolbar()));
 
         m_mainWindowGeometry = saveGeometry();
         hide();
--- krdc/floatingtoolbar.cpp
+++ krdc/floatingtoolbar.cpp
@@ -33,11 +33,21 @@
 #include <QPainter>
 #include <QTimer>
 
-#define iconSize 22
-#define toolBarRBMargin 2
-#define toolBarOpacity 0.8
-#define visiblePixelWhenAutoHidden 6
-#define autoHideTimeout 2000
+static const int actionIconSize = 22;
+static const int toolBarRBMargin = 2;
+static const double toolBarOpacity = 0.8;
+static const int visiblePixelWhenAutoHidden = 6;
+static const int autoHideTimeout = 500;
+static const int  initialAutoHideTimeout = 2000;
+
+/**
+ * Denotes the verious states of the animation.
+ */
+enum AnimState {
+    Hiding,
+    Showing,
+    Still
+};
 
 class FloatingToolBarPrivate
 {
@@ -63,7 +73,7 @@
     QTimer *autoHideTimer;
     QPoint currentPosition;
     QPoint endPosition;
-    bool hiding;
+    AnimState animState;
     bool toDelete;
     bool visible;
     bool sticky;
@@ -79,10 +89,10 @@
     addWidget(d->offsetPlaceHolder);
 
     setMouseTracking(true);
-    setIconSize(QSize(iconSize, iconSize));
+    setIconSize(QSize(actionIconSize, actionIconSize));
     d->anchorWidget = anchorWidget;
     d->anchorSide = Left;
-    d->hiding = false;
+    d->animState = Still;
     d->toDelete = false;
     d->visible = false;
     d->sticky = false;
@@ -93,7 +103,6 @@
 
     d->autoHideTimer = new QTimer(this);
     connect(d->autoHideTimer, SIGNAL(timeout()), this, SLOT(hide()));
-    d->autoHideTimer->start(autoHideTimeout);
 
     // apply a filter to get notified when anchor changes geometry
     d->anchorWidget->installEventFilter(this);
@@ -128,13 +137,14 @@
 
     if (sticky)
         d->autoHideTimer->stop();
-    else
-        d->autoHideTimer->start(autoHideTimeout);
 }
 
 void FloatingToolBar::showAndAnimate()
 {
-    d->hiding = false;
+    if (d->animState == Showing)
+        return;
+
+    d->animState = Showing;
 
     show();
 
@@ -143,12 +153,19 @@
 
     // start scrolling in
     d->animTimer->start(20);
+
+    // This permits to show the toolbar for a while when going full screen.
+    if (!d->sticky) 
+        d->autoHideTimer->start(initialAutoHideTimeout);
 }
 
 void FloatingToolBar::hideAndDestroy()
 {
+    if (d->animState == Hiding)
+        return;
+
     // set parameters for sliding out
-    d->hiding = true;
+    d->animState = Hiding;
     d->toDelete = true;
     d->endPosition = d->getOuterPoint();
 
@@ -158,6 +175,9 @@
 
 void FloatingToolBar::hide()
 {
+    if (underMouse()) 
+        return;
+
     if (d->visible) {
         QPoint diff;
         switch (d->anchorSide) {
@@ -174,12 +194,12 @@
             diff = QPoint(0, -visiblePixelWhenAutoHidden);
             break;
         }
-        d->hiding = true;
+        d->animState = Hiding;
         d->endPosition = d->getOuterPoint() + diff;
-    }
 
-    // start scrolling out
-    d->animTimer->start(20);
+        // start scrolling out
+        d->animTimer->start(20);
+    }
 }
 
 bool FloatingToolBar::eventFilter(QObject *obj, QEvent *e)
@@ -187,16 +207,12 @@
     // if anchorWidget changed geometry reposition toolbar
     if (obj == d->anchorWidget && e->type() == QEvent::Resize) {
         d->animTimer->stop();
-        if (d->hiding && d->toDelete)
+        if ((d->animState == Hiding || !d->visible) && d->toDelete)
             deleteLater();
         else
             d->reposition();
     }
 
-    // keep toolbar visible when mouse is on it
-    if (e->type() == QEvent::MouseMove && d->autoHideTimer->isActive())
-        d->autoHideTimer->start(autoHideTimeout);
-
     return false;
 }
 
@@ -220,19 +236,9 @@
 
 void FloatingToolBar::mouseMoveEvent(QMouseEvent *e)
 {
-    // keep toolbar visible when mouse is on it
-    if (d->autoHideTimer->isActive())
-        d->autoHideTimer->start(autoHideTimeout);
-
     // show the toolbar again when it is auto-hidden
-    if (!d->visible && !d->animTimer->isActive()) {
-        d->hiding = false;
-        show();
-        d->endPosition = QPoint();
-        d->reposition();
-
-        d->animTimer->start(20);
-
+    if (!d->visible) {
+        showAndAnimate();
         return;
     }
 
@@ -260,6 +266,23 @@
     QToolBar::mouseMoveEvent(e);
 }
 
+void FloatingToolBar::enterEvent(QEvent *e)
+{
+    // Stop the autohide timer while the mouse is inside
+    d->autoHideTimer->stop();
+
+    if (!d->visible) 
+        showAndAnimate();
+    QToolBar::enterEvent(e);
+}
+
+void FloatingToolBar::leaveEvent(QEvent *e)
+{
+    if (!d->sticky) 
+        d->autoHideTimer->start(autoHideTimeout);
+    QToolBar::leaveEvent(e);
+}
+
 void FloatingToolBar::mouseReleaseEvent(QMouseEvent *e)
 {
     if (e->button() == Qt::LeftButton)
@@ -427,12 +450,20 @@
     // handle arrival to the end
     if (d->currentPosition == d->endPosition) {
         d->animTimer->stop();
-        if (d->hiding) {
+        switch (d->animState) {
+        case Hiding:
             d->visible = false;
+            d->animState = Still;
             if (d->toDelete)
                 deleteLater();
-        } else
+            break;
+        case Showing:
             d->visible = true;
+            d->animState = Still;
+            break;
+        default:
+            kDebug(5010) << "Illegal state";
+        }
     }
 }
 
--- krdc/remotedesktopsmodel.cpp
+++ krdc/remotedesktopsmodel.cpp
@@ -84,6 +84,7 @@
 
     switch (role) {
     case Qt::DisplayRole:
+    case Qt::ToolTipRole:
         return item->data(index.column());
     case Qt::DecorationRole:
         if (item->data(index.column()).toString().contains("://")) //TODO: clean impl
--- krdc/floatingtoolbar.h
+++ krdc/floatingtoolbar.h
@@ -62,6 +62,8 @@
     void paintEvent(QPaintEvent *);
     void mousePressEvent(QMouseEvent *e);
     void mouseMoveEvent(QMouseEvent *e);
+    void enterEvent(QEvent *e);
+    void leaveEvent(QEvent *e);
     void mouseReleaseEvent(QMouseEvent *e);
     void wheelEvent(QWheelEvent *e);
 
--- kopete/plugins/nowlistening/CMakeLists.txt
+++ kopete/plugins/nowlistening/CMakeLists.txt
@@ -23,7 +23,7 @@
 kde4_add_plugin(kopete_nowlistening ${kopete_nowlistening_PART_SRCS})
 
 
-target_link_libraries(kopete_nowlistening  ${KDE4_KDECORE_LIBS} kopete)
+target_link_libraries(kopete_nowlistening  ${KDE4_KIO_LIBS} kopete)
 
 if(XMMS_FOUND)
    target_link_libraries( kopete_nowlistening ${XMMS_LDFLAGS} )
--- kopete/plugins/pipes/kopete_pipes.desktop
+++ kopete/plugins/pipes/kopete_pipes.desktop
@@ -28,6 +28,7 @@
 Name[ko]=파이프
 Name[lt]=Perdavimas
 Name[lv]=Caurules
+Name[nb]=Rør
 Name[nds]=Ümledden
 Name[nl]=Doorvoeren
 Name[pl]=Potoki
@@ -56,11 +57,12 @@
 Comment[ko]=외부 프로그램이나 스크립트로 메시지를 파이프합니다
 Comment[lt]=Perduoti žinutes kitoms programoms ar scenarijams
 Comment[lv]=Padot ziņojumus uz ārēju programmu vai skriptu
+Comment[nb]=Send meldinger i rør gjennom et eksternt program eller skript
 Comment[nds]=Leddt Narichten dör en extern Programm oder Skript
 Comment[nl]=Voert berichten door naar een extern programma of script
 Comment[pl]=Przekazuje wiadomości potokami do zewnętrznego programu lub skryptu
 Comment[pt]=Encaminhar as mensagens por um programa externo
-Comment[pt_BR]=Encaminhar as mensagens por um programa externo
+Comment[pt_BR]=Fazer pipe através de um programa externo ou script
 Comment[sl]=Preusmerjanje sporočil skozi zunanji program ali skript
 Comment[sv]=Skicka meddelanden genom ett externt program eller skript
 Comment[tr]=İletileri bir dış uygulama ya da betik üzerinden borula
--- kopete/plugins/pipes/kopete_pipes_config.desktop
+++ kopete/plugins/pipes/kopete_pipes_config.desktop
@@ -23,6 +23,7 @@
 Name[ko]=파이프
 Name[lt]=Perdavimas
 Name[lv]=Caurules
+Name[nb]=Rør
 Name[nds]=Ümledden
 Name[nl]=Doorvoeren
 Name[pl]=Potoki
@@ -51,11 +52,12 @@
 Comment[ko]=외부 프로그램이나 스크립트로 메시지를 파이프합니다
 Comment[lt]=Perduoti žinutes kitoms programoms ar scenarijams
 Comment[lv]=Padot ziņojumus uz ārēju programmu vai skriptu
+Comment[nb]=Send meldinger i rør gjennom et eksternt program eller skript
 Comment[nds]=Leddt Narichten dör en extern Programm oder Skript
 Comment[nl]=Voert berichten door naar een extern programma of script
 Comment[pl]=Przekazuje wiadomości potokami do zewnętrznego programu lub skryptu
 Comment[pt]=Encaminhar as mensagens por um programa externo
-Comment[pt_BR]=Encaminhar as mensagens por um programa externo
+Comment[pt_BR]=Fazer pipe através de um programa externo ou script
 Comment[sl]=Preusmerjanje sporočil skozi zunanji program ali skript
 Comment[sv]=Skicka meddelanden genom ett externt program eller skript
 Comment[tr]=İletileri bir dış uygulama ya da betik üzerinden borula
--- kopete/plugins/pipes/CMakeLists.txt
+++ kopete/plugins/pipes/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 kde4_add_plugin( kopete_pipes ${kopete_pipes_PART_SRCS})
 
-target_link_libraries( kopete_pipes ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} kopete )
+target_link_libraries( kopete_pipes ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} kopete )
 
 install( TARGETS kopete_pipes DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -34,7 +34,7 @@
 
 kde4_add_plugin( kcm_kopete_pipes ${kcm_kopete_pipes_PART_SRCS} )
 
-target_link_libraries( kcm_kopete_pipes ${KDE4_KUTILS_LIBS} kopete )
+target_link_libraries( kcm_kopete_pipes ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} kopete )
 
 install( TARGETS kcm_kopete_pipes  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
--- kopete/plugins/alias/CMakeLists.txt
+++ kopete/plugins/alias/CMakeLists.txt
@@ -10,7 +10,7 @@
 kde4_add_plugin(kopete_alias ${kopete_alias_PART_SRCS})
 
 
-target_link_libraries(kopete_alias  ${KDE4_KDECORE_LIBS} kopete )
+target_link_libraries(kopete_alias  ${KDE4_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} kopete )
 
 install(TARGETS kopete_alias  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -25,7 +25,7 @@
 kde4_add_plugin(kcm_kopete_alias ${kcm_kopete_alias_PART_SRCS})
 
 
-target_link_libraries(kcm_kopete_alias  ${KDE4_KUTILS_LIBS} kopete )
+target_link_libraries(kcm_kopete_alias  ${KDE4_KUTILS_LIBS} kopete ${KDE4_KDE3SUPPORT_LIBS} )
 
 install(TARGETS kcm_kopete_alias  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/translator/CMakeLists.txt
+++ kopete/plugins/translator/CMakeLists.txt
@@ -15,7 +15,7 @@
 kde4_add_plugin(kopete_translator ${kopete_translator_PART_SRCS})
 
 
-target_link_libraries(kopete_translator  ${KDE4_KIO_LIBS} kopete )
+target_link_libraries(kopete_translator  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} kopete )
 
 install(TARGETS kopete_translator  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop
+++ kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop
@@ -34,7 +34,7 @@
 Name[pa]=URLPicPreview ਪਲੱਗਇਨ ਸੰਰਚਨਾ
 Name[pl]=Konfiguracja wtyczki URLPicPreview
 Name[pt]=Configuração do 'Plugin' de Antevisão dos URLs
-Name[pt_BR]=Configuração do 'Plugin' de Antevisão dos URLs
+Name[pt_BR]=Configuração do plugin URLPicPreview
 Name[ru]=Настройка модуля URLPicPreview
 Name[sl]=Nastavitve vstavka URLPicPreview
 Name[sv]=Inställning av insticksprogram för förhandsgranskning av bilder
--- kopete/plugins/urlpicpreview/CMakeLists.txt
+++ kopete/plugins/urlpicpreview/CMakeLists.txt
@@ -15,7 +15,7 @@
 kde4_add_plugin(kopete_urlpicpreview ${kopete_urlpicpreview_PART_SRCS})
 
 
-target_link_libraries(kopete_urlpicpreview  ${KDE4_KDECORE_LIBS} kopete )
+target_link_libraries(kopete_urlpicpreview  ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kopete )
 
 install(TARGETS kopete_urlpicpreview DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -32,7 +32,7 @@
 kde4_add_plugin(kcm_kopete_urlpicpreview ${kcm_kopete_urlpicpreview_PART_SRCS})
 
 
-target_link_libraries(kcm_kopete_urlpicpreview  ${KDE4_KUTILS_LIBS} kopete )
+target_link_libraries(kcm_kopete_urlpicpreview ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KUTILS_LIBS} kopete )
 
 install(TARGETS kcm_kopete_urlpicpreview  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/addbookmarks/CMakeLists.txt
+++ kopete/plugins/addbookmarks/CMakeLists.txt
@@ -11,7 +11,7 @@
 kde4_add_plugin(kopete_addbookmarks ${kopete_addbookmarks_PART_SRCS})
 
 
-target_link_libraries(kopete_addbookmarks  ${KDE4_KDECORE_LIBS} kopete )
+target_link_libraries(kopete_addbookmarks  ${KDE4_KIO_LIBS} kopete )
 
 install(TARGETS kopete_addbookmarks  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/texteffect/CMakeLists.txt
+++ kopete/plugins/texteffect/CMakeLists.txt
@@ -28,7 +28,7 @@
 kde4_add_plugin(kcm_kopete_texteffect ${kcm_kopete_texteffect_PART_SRCS})
 
 
-target_link_libraries(kcm_kopete_texteffect  ${KDE4_KUTILS_LIBS} kopete )
+target_link_libraries(kcm_kopete_texteffect  ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} kopete )
 
 install(TARGETS kcm_kopete_texteffect  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/webpresence/kopete_webpresence_config.desktop
+++ kopete/plugins/webpresence/kopete_webpresence_config.desktop
@@ -39,7 +39,7 @@
 Comment[lv]=Rāda jūsu kontaktu saraksta (vai daļas) statusu tīmekļa lapā
 Comment[mk]=Го прикажува статусот на (деловите на) вашата листа со контакти на вебстраница
 Comment[nb]=Vis tilstanden til (deler av) kontaktlista de på en nettside
-Comment[nds]=Wiest den Status (vun en poor) vun Dien Kontakten op en Nettsiet
+Comment[nds]=Wiest den Status (vun en Reeg) vun Dien Kontakten op en Nettsiet
 Comment[ne]=वेबपृष्ठमा तपाईँको सम्पर्क सूची (भागको) वस्तुस्थिति देखाउनुहोस्
 Comment[nl]=Toont de status van (delen van) uw contactenlijst op een webpagina
 Comment[nn]=Vis tilstanden til (delar av) kontaktlista på ei nettside
--- kopete/plugins/webpresence/CMakeLists.txt
+++ kopete/plugins/webpresence/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 kde4_add_plugin(kopete_webpresence ${kopete_webpresence_PART_SRCS})
 
-target_link_libraries(kopete_webpresence  ${KDE4_KDECORE_LIBS} kopete ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} )
+target_link_libraries(kopete_webpresence  ${KDE4_KIO_LIBS} kopete ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${QT_QTXML_LIBRARY})
 
 install(TARGETS kopete_webpresence  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -18,7 +18,7 @@
 kde4_add_ui_files(kcm_kopete_webpresence_PART_SRCS webpresenceprefs.ui )
 kde4_add_plugin(kcm_kopete_webpresence ${kcm_kopete_webpresence_PART_SRCS})
 
-target_link_libraries(kcm_kopete_webpresence  ${KDE4_KUTILS_LIBS} kopete )
+target_link_libraries(kcm_kopete_webpresence  ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} kopete )
 
 install(TARGETS kcm_kopete_webpresence  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/autoreplace/CMakeLists.txt
+++ kopete/plugins/autoreplace/CMakeLists.txt
@@ -27,7 +27,7 @@
 kde4_add_plugin(kcm_kopete_autoreplace ${kcm_kopete_autoreplace_PART_SRCS})
 
 
-target_link_libraries(kcm_kopete_autoreplace  ${KDE4_KUTILS_LIBS} kopete )
+target_link_libraries(kcm_kopete_autoreplace  ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} kopete )
 
 install(TARGETS kcm_kopete_autoreplace  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/otr/kopete_otr.desktop
+++ kopete/plugins/otr/kopete_otr.desktop
@@ -30,6 +30,7 @@
 Comment[ko]=Off-The-Record 암호화를 사용하여 대화 세션을 암호화합니다
 Comment[lt]=Pokalbio seansus šifruoti Off-the-Record kodu
 Comment[lv]=Šifrēt tērzēšanas sesijas ar Off-the-Record šifrēšanu
+Comment[nb]=Krypter prateøkter med Off-The-Record-kryptering
 Comment[nds]=Verslötelt Klööntörns mit "Off-The-Record"- (engl. Buten-Protokoll-)Verslöteln
 Comment[nl]=Versleutel gesprekken met Off-The-Record-versleuteling
 Comment[pl]=Szyfrowanie sesji czata za pomocą Off-The-Record
--- kopete/plugins/otr/kopete_otr_config.desktop
+++ kopete/plugins/otr/kopete_otr_config.desktop
@@ -25,6 +25,7 @@
 Comment[ko]=Off-The-Record 암호화를 사용하여 대화 세션을 암호화합니다
 Comment[lt]=Pokalbio seansus šifruoti Off-the-Record kodu
 Comment[lv]=Šifrēt tērzēšanas sesijas ar Off-the-Record šifrēšanu
+Comment[nb]=Krypter prateøkter med Off-The-Record-kryptering
 Comment[nds]=Verslötelt Klööntörns mit "Off-The-Record"- (engl. Buten-Protokoll-)Verslöteln
 Comment[nl]=Versleutel gesprekken met Off-The-Record-versleuteling
 Comment[pl]=Szyfrowanie sesji czata za pomocą Off-The-Record
--- kopete/plugins/highlight/CMakeLists.txt
+++ kopete/plugins/highlight/CMakeLists.txt
@@ -13,7 +13,7 @@
 kde4_add_plugin(kopete_highlight ${kopete_highlight_PART_SRCS})
 
 
-target_link_libraries(kopete_highlight  ${KDE4_KDECORE_LIBS} kopete )
+target_link_libraries(kopete_highlight  ${KDE4_KDECORE_LIBS} kopete ${QT_QTXML_LIBRARY})
 
 install(TARGETS kopete_highlight  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/latex/CMakeLists.txt
+++ kopete/plugins/latex/CMakeLists.txt
@@ -15,7 +15,7 @@
 kde4_add_plugin(kopete_latex ${kopete_latex_PART_SRCS})
 
 
-target_link_libraries(kopete_latex  ${KDE4_KDECORE_LIBS} kopete )
+target_link_libraries(kopete_latex  ${KDE4_KDEUI_LIBS} kopete )
 
 install(TARGETS kopete_latex  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/plugins/privacy/CMakeLists.txt
+++ kopete/plugins/privacy/CMakeLists.txt
@@ -26,7 +26,7 @@
 set(kcm_kopete_privacy_PART_SRCS privacypreferences.cpp contactselectorwidget.cpp )
 kde4_add_ui_files(kcm_kopete_privacy_PART_SRCS privacydialog.ui contactselectorwidget_base.ui )
 kde4_add_plugin(kcm_kopete_privacy ${kcm_kopete_privacy_PART_SRCS})
-target_link_libraries(kcm_kopete_privacy  ${KDE4_KUTILS_LIBS} kopete kopeteprivacy )
+target_link_libraries(kcm_kopete_privacy  ${KDE4_KUTILS_LIBS} ${QT_QT3SUPPORT_LIBRARY} kopete kopeteprivacy )
 install(TARGETS kcm_kopete_privacy  DESTINATION ${PLUGIN_INSTALL_DIR})

Property changes on: kopete/styles/Clear/Contents/Resources/Variants/No_avatars.css
___________________________________________________________________
Added: svn:mergeinfo

--- kopete/protocols/telepathy/kopete_telepathy.desktop
+++ kopete/protocols/telepathy/kopete_telepathy.desktop
@@ -20,6 +20,7 @@
 Name[km]=អ្នកទូរចិត្ត
 Name[ne]=टेलिप्याथी
 Name[pa]=ਟੈਲੀਪਾਥੀ
+Name[pt_BR]=Telepatia
 Name[tr]=Telepati
 Name[x-test]=xxTelepathyxx
 Comment=Messaging using Telepathy connection managers.
@@ -36,7 +37,7 @@
 Comment[ga]=Teachtaireachtaí SMS le bainisteoirí ceangail Telepathy.
 Comment[gl]=Mensaxeiría empregando xestores de conexón de Telepathy. 
 Comment[hu]=Telepathy üzenetküldő.
-Comment[it]=Invia messaggi usando i gestori di connessione Telepaty.
+Comment[it]=Invia messaggi usando i gestori di connessione Telepathy.
 Comment[ja]=Telepathy 接続マネージャを使うメッセージング
 Comment[km]=ផ្ញើសារដោយប្រើកម្មវិធីគ្រប់គ្រងការតភ្ជាប់ទូរចិត្ត ។
 Comment[ko]=Telepathy 연결 관리자를 사용하는 메시징.
--- kopete/protocols/yahoo/kopete_yahoo.desktop
+++ kopete/protocols/yahoo/kopete_yahoo.desktop
@@ -49,7 +49,7 @@
 Comment[nl]=Yahoo! Messenger IM en videoconversatie
 Comment[pl]=Komunikator Yahoo! Messenger i rozmowa wideo
 Comment[pt]=Conversa IM e de vídeo do Yahoo! Messenger
-Comment[pt_BR]=Conversa IM e de vídeo do Yahoo! Messenger
+Comment[pt_BR]=Mensagens instantâneas e bate-papo com vídeo do Yahoo! Messenger
 Comment[ru]=Служба мгновенных сообщений и видеочат Yahoo!
 Comment[sl]=Yahoo! Messenger IM in video klepet
 Comment[sv]=Yahoo! Messenger-direktmeddelande och -videochatt
--- kopete/protocols/yahoo/CMakeLists.txt
+++ kopete/protocols/yahoo/CMakeLists.txt
@@ -49,9 +49,9 @@
 kde4_add_plugin(kopete_yahoo ${kopete_yahoo_PART_SRCS})
 
 if(WIN32)
-  target_link_libraries(kopete_yahoo ${KDE4_KDEUI_LIBS} kopete kyahoo)
+  target_link_libraries(kopete_yahoo ${KDE4_KIO_LIBS} kopete kyahoo ${QT_QT3SUPPORT_LIBS})
 else(WIN32)
-  target_link_libraries(kopete_yahoo ${KDE4_KDEUI_LIBS} kopete_videodevice kopete kyahoo)
+  target_link_libraries(kopete_yahoo ${KDE4_KIO_LIBS} kopete_videodevice kopete kyahoo ${QT_QT3SUPPORT_LIBS})
 endif(WIN32)
 
 install(TARGETS kopete_yahoo  DESTINATION ${PLUGIN_INSTALL_DIR})
--- kopete/protocols/gadu/CMakeLists.txt
+++ kopete/protocols/gadu/CMakeLists.txt
@@ -46,7 +46,7 @@
 kde4_add_plugin(kopete_gadu ${kopete_gadu_PART_SRCS})
 
 
-target_link_libraries(kopete_gadu ${KDE4_KDEUI_LIBS} ${QT_QTNETWORK_LIBRARY} gadu_kopete kopete )
+target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} gadu_kopete kopete )
 
 install(TARGETS kopete_gadu  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/protocols/qq/kopete_qq.desktop
+++ kopete/protocols/qq/kopete_qq.desktop
@@ -42,7 +42,7 @@
 Comment[nl]=Een populair Chinees IM-systeem
 Comment[pl]=Popularny chiński komunikator
 Comment[pt]=Um sistema de IM popular na China
-Comment[pt_BR]=Um sistema de IM popular na China
+Comment[pt_BR]=Um sistema Chines de mensagem instantânea
 Comment[ru]=Популярная китайская система обмена сообщениями
 Comment[sl]=Popularen kitajski sistem IM
 Comment[sv]=Ett populärt kinesiskt direktmeddelandesystem
--- kopete/protocols/qq/CMakeLists.txt
+++ kopete/protocols/qq/CMakeLists.txt
@@ -40,9 +40,9 @@
 kde4_add_plugin(kopete_qq ${kopete_qq_PART_SRCS})
 
 if(WIN32)
-target_link_libraries(kopete_qq ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} kopete )
+target_link_libraries(kopete_qq ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} kopete )
 else(WIN32)
-target_link_libraries(kopete_qq ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} kopete kopete_videodevice )
+target_link_libraries(kopete_qq ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} kopete kopete_videodevice )
 endif(WIN32)
 
 install(TARGETS kopete_qq DESTINATION ${PLUGIN_INSTALL_DIR} )
--- kopete/protocols/sms/CMakeLists.txt
+++ kopete/protocols/sms/CMakeLists.txt
@@ -31,7 +31,7 @@
 
 kde4_add_plugin(kopete_sms ${kopete_sms_PART_SRCS})
 
-target_link_libraries(kopete_sms  ${KDE4_KIO_LIBS} kopete )
+target_link_libraries(kopete_sms  ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} kopete )
 
 install(TARGETS kopete_sms  DESTINATION ${PLUGIN_INSTALL_DIR})
 install( FILES kopete_sms.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
--- kopete/protocols/groupwise/CMakeLists.txt
+++ kopete/protocols/groupwise/CMakeLists.txt
@@ -56,7 +56,7 @@
 
 link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libgroupwise )
 
-target_link_libraries(kopete_groupwise  ${KDE4_KDECORE_LIBS} qgroupwise kopete ${QCA2_LIBRARIES})
+target_link_libraries(kopete_groupwise  ${KDE4_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} qgroupwise kopete ${QCA2_LIBRARIES})
 
 install(TARGETS kopete_groupwise  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -81,7 +81,7 @@
 		mMainWidget->lblAwayMessage->hide();
 
 		userInfoView=0L;
-		mMainWidget->userInfoFrame->setFrameStyle(Q3Frame::NoFrame | Q3Frame::Plain);
+		mMainWidget->userInfoFrame->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
 		QVBoxLayout *l = new QVBoxLayout(mMainWidget->userInfoFrame);
 		l->setContentsMargins( 0, 0, 0, 0 );
 		userInfoEdit = new KTextEdit(QString(), mMainWidget->userInfoFrame);
@@ -99,7 +99,7 @@
 	else
 	{
 		userInfoEdit=0L;
-		mMainWidget->userInfoFrame->setFrameStyle(Q3Frame::NoFrame | Q3Frame::Plain);
+		mMainWidget->userInfoFrame->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
 		QVBoxLayout *l = new QVBoxLayout(mMainWidget->userInfoFrame);
 		l->setContentsMargins( 0, 0, 0, 0 );
 		userInfoView = new KTextBrowser(mMainWidget->userInfoFrame);
--- kopete/protocols/oscar/aim/CMakeLists.txt
+++ kopete/protocols/oscar/aim/CMakeLists.txt
@@ -37,7 +37,7 @@
 kde4_add_plugin(kopete_aim ${kopete_aim_PART_SRCS})
 
 
-target_link_libraries(kopete_aim  ${KDE4_KDECORE_LIBS} kopete_oscar kopete )
+target_link_libraries(kopete_aim  ${KDE4_KDECORE_LIBS} kopete_oscar oscar kopete ${QT_QTXML_LIBRARY} )
 
 install(TARGETS kopete_aim  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/protocols/oscar/aim/ui/aiminfobase.ui
+++ kopete/protocols/oscar/aim/ui/aiminfobase.ui
@@ -160,7 +160,7 @@
     </widget>
    </item>
    <item row="6" column="0" colspan="4" >
-    <widget class="Q3Frame" native="1" name="userInfoFrame" >
+    <widget class="QFrame" native="1" name="userInfoFrame" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
        <horstretch>0</horstretch>
@@ -184,12 +184,6 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>Q3Frame</class>
-   <extends></extends>
-   <header>Qt3Support/Q3Frame</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>KTextBrowser</class>
    <extends></extends>
    <header>ktextbrowser.h</header>
--- kopete/protocols/oscar/icq/kopete_icq.desktop
+++ kopete/protocols/oscar/icq/kopete_icq.desktop
@@ -44,7 +44,7 @@
 Comment[nl]=Zoeken en converseren met ICQ
 Comment[pl]=Szukaj i rozmawiaj za pomocą ICQ
 Comment[pt]=Procurar e Conversar com o ICQ
-Comment[pt_BR]=Procurar e Conversar com o ICQ
+Comment[pt_BR]=Procurar e bater papo com o ICQ
 Comment[ru]=Поиск друзей и разговор в IСQ
 Comment[sl]=Išči in klepetaj z ICQ
 Comment[sv]=Sök och chatta med ICQ
--- kopete/protocols/oscar/icq/CMakeLists.txt
+++ kopete/protocols/oscar/icq/CMakeLists.txt
@@ -60,7 +60,7 @@
 kde4_add_plugin(kopete_icq ${kopete_icq_PART_SRCS})
 
 
-target_link_libraries(kopete_icq ${KDE4_KDECORE_LIBS} kopete_oscar kopete )
+target_link_libraries(kopete_icq ${KDE4_KDECORE_LIBS} kopete_oscar oscar kopete ${QT_QTNETWORK_LIBRARY} )
 
 install(TARGETS kopete_icq  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/protocols/oscar/CMakeLists.txt
+++ kopete/protocols/oscar/CMakeLists.txt
@@ -36,7 +36,7 @@
 
 kde4_add_library(kopete_oscar SHARED ${kopete_oscar_LIB_SRCS})
 
-target_link_libraries(kopete_oscar ${KDE4_KIO_LIBS} kopete oscar )
+target_link_libraries(kopete_oscar ${KDE4_KIO_LIBS} kopete oscar ${QT_QT3SUPPORT_LIBRARY})
 
 set_target_properties(kopete_oscar PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS kopete_oscar ${INSTALL_TARGETS_DEFAULT_ARGS})
--- kopete/protocols/msn/CMakeLists.txt
+++ kopete/protocols/msn/CMakeLists.txt
@@ -63,7 +63,7 @@
 if(WIN32)
   target_link_libraries(kopete_msn_shared  ${KDE4_KIO_LIBS} kopete)
 else(WIN32)
-  target_link_libraries(kopete_msn_shared  ${KDE4_KIO_LIBS} kopete kopete_videodevice)
+  target_link_libraries(kopete_msn_shared  ${KDE4_KIO_LIBS} kopete kopete_videodevice ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KUTILS_LIBS})
 endif(WIN32)
 
 set_target_properties(kopete_msn_shared PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
--- kopete/kopete/kopete.notifyrc
+++ kopete/kopete/kopete.notifyrc
@@ -368,11 +368,12 @@
 Name[ko]=활성화된 대화에서 메시지 받음
 Name[lt]=Aktyviame lange gauta žinutė
 Name[lv]=Ienākusi ziņa aktīvajā sarunā
+Name[nb]=Innkommende melding i aktiv prat
 Name[nds]=Ankamen Naricht binnen aktiev Klöönsnack
 Name[nl]=Inkomend bericht in actief gesprek
 Name[pl]=Wiadomość przychodząca na aktywnym czacie
 Name[pt]=Mensagem Recebida na Conversa Activa
-Name[pt_BR]=Mensagem Recebida na Conversa Activa
+Name[pt_BR]=Mensagem recebida no bate-papo ativo
 Name[ru]=Входящее сообщение в активной беседе
 Name[sl]=Prihajajoče sporočilo v aktivnem klepetu
 Name[sv]=Inkommande meddelande i aktiv chatt
@@ -398,11 +399,12 @@
 Comment[ko]=활성화된 대화 창에 새 메시지가 들어옴
 Comment[lt]=Lange su aktyviu pokalbiu gauta nauja žinutė
 Comment[lv]=Ir saņemts ienākošs ziņojums aktīvajā sarunas logā
+Comment[nb]=En innkommende melding er mottatt i et aktivt pratevindu
 Comment[nds]=En Naricht keem na't aktive Klöönfinster rin
 Comment[nl]=Er is een inkomend bericht ontvangen in het actieve gespreksvenster
 Comment[pl]=Nadeszła nowa wiadomość w aktywnym oknie czatu
 Comment[pt]=Foi recebida uma mensagem na janela de conversação activa
-Comment[pt_BR]=Foi recebida uma mensagem na janela de conversação activa
+Comment[pt_BR]=Uma mensagem chegou na janela de bate-papo ativa
 Comment[ru]=Получено новое сообщение в активном окне беседы
 Comment[sl]=Prejeto je bilo prihajajoče sporočilo v oknu aktivnega klepeta
 Comment[sv]=Ett inkommande meddelande i det aktiva chattfönstret har anlänt
@@ -2003,6 +2005,7 @@
 Name[ko]=서비스 메시지
 Name[lt]=Tarnybos pranešimas
 Name[lv]=Servisa ziņojums
+Name[nb]=Tjenestemelding
 Name[nds]=Deenst-Mellen
 Name[nl]=Dienstmededeling
 Name[pl]=Wiadomość usługowa
@@ -2033,6 +2036,7 @@
 Comment[ko]=인증 요청 같은 서비스 메시지를 받음
 Comment[lt]=Gautas tarnybos pranešimas (pvz., prašymas patvirtinti)
 Comment[lv]=Saņemts servisa ziņojums (piem. autorizācijas pieprasījums)
+Comment[nb]=En tjenestemelding er mottatt (f.eks. forespørsel om autorisasjon)
 Comment[nds]=En Deenst-Mellen keem rin (a.B. en Identifikatschoonanfraag)
 Comment[nl]=Er is een dienstmededeling (zoals een autorisatieverzoek) ontvangen
 Comment[pl]=Otrzymano wiadomość usługową (np. żądanie uwierzytelnienia)
--- kopete/kopete/statusmenu/CMakeLists.txt
+++ kopete/kopete/statusmenu/CMakeLists.txt
@@ -19,7 +19,7 @@
 )
 
 kde4_add_library( kopetestatusmenu SHARED ${kopetestatusmenu_SRCS} )
-target_link_libraries( kopetestatusmenu kopete ${KDE4_KDEUI_LIBS} )
+target_link_libraries( kopetestatusmenu kopete ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS} )
 set_target_properties( kopetestatusmenu PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 install(TARGETS kopetestatusmenu ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- kopete/kopete/addaccountwizard/CMakeLists.txt
+++ kopete/kopete/addaccountwizard/CMakeLists.txt
@@ -16,7 +16,7 @@
 )
 
 kde4_add_library( kopeteaddaccountwizard SHARED ${kopeteaddaccountwizard_SRCS} )
-target_link_libraries( kopeteaddaccountwizard kopete ${KDE4_KDEUI_LIBS} )
+target_link_libraries( kopeteaddaccountwizard kopete ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
 set_target_properties( kopeteaddaccountwizard PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 install(TARGETS kopeteaddaccountwizard ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- kopete/kopete/kopeteapplication.cpp
+++ kopete/kopete/kopeteapplication.cpp
@@ -104,7 +104,6 @@
 
 	delete m_fileEngineHandler;
 	delete m_emoticonHandler;
-	delete m_mainWindow;
 	//kDebug( 14000 ) << "Done";
 }
 
@@ -311,6 +310,12 @@
 			break;
 		}
 	}
+
+	if ( m_isShuttingDown && m_mainWindow )
+	{
+		m_mainWindow->deleteLater();
+		m_mainWindow = 0;
+	}
 }
 
 
--- kopete/kopete/config/status/kopete_statusconfig.desktop
+++ kopete/kopete/config/status/kopete_statusconfig.desktop
@@ -48,6 +48,7 @@
 Comment[ko]=상태를 관리합니다
 Comment[lt]=Tvarkyti visas būsenas
 Comment[lv]=Pārvaldīt jūsu statusus
+Comment[nb]=Rediger dine statuser
 Comment[nds]=Dien Statussen plegen
 Comment[nl]=Beheer uw statussen
 Comment[pl]=Zarządzanie statusami
--- kopete/kopete/config/status/CMakeLists.txt
+++ kopete/kopete/config/status/CMakeLists.txt
@@ -16,7 +16,7 @@
 
 kde4_add_plugin(kcm_kopete_statusconfig ${kcm_kopete_statusconfig_PART_SRCS})
 
-target_link_libraries(kcm_kopete_statusconfig  ${KDE4_KUTILS_LIBS} kopete)
+target_link_libraries(kcm_kopete_statusconfig  ${KDE4_KUTILS_LIBS} ${QT_QTXML_LIBRARY} kopete)
 
 install(TARGETS kcm_kopete_statusconfig  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/kopete/config/avdevice/avdeviceconfig_videodevice.ui
+++ kopete/kopete/config/avdevice/avdeviceconfig_videodevice.ui
@@ -114,7 +114,7 @@
            <item>
             <widget class="QLabel" name="standardLabel" >
              <property name="text" >
-              <string>Standard:</string>
+	      <string comment="Label of a combo box containing video standards like PAL-B, NTSC-M, etc" >Standard:</string>
              </property>
             </widget>
            </item>
--- kopete/kopete/config/chatwindow/CMakeLists.txt
+++ kopete/kopete/config/chatwindow/CMakeLists.txt
@@ -21,7 +21,7 @@
 kde4_add_plugin(kcm_kopete_chatwindowconfig ${kcm_kopete_chatwindowconfig_PART_SRCS})
 
 
-target_link_libraries(kcm_kopete_chatwindowconfig ${KDE4_KUTILS_LIBS} kopete kopetechatwindow_shared ${KDE4_KNEWSTUFF2_LIBS} )
+target_link_libraries(kcm_kopete_chatwindowconfig ${KDE4_KUTILS_LIBS} kopete kopetechatwindow_shared ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KHTML_LIBS})
 
 install(TARGETS kcm_kopete_chatwindowconfig DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/kopete/chatwindow/chatmessagepart.cpp
+++ kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -884,28 +884,13 @@
 	// Replace userIconPath
 	if( message.from() )
 	{
-		QString photoPath;
-#if 0
-		photoPath = message.from()->property(Kopete::Global::Properties::self()->photo().key()).value().toString();
-		// If the photo path is empty, set the default buddy icon for the theme
+		QString photoPath = photoForContact( message.from() );
 		if( photoPath.isEmpty() )
 		{
 			if(message.direction() == Kopete::Message::Inbound)
-				photoPath = QLatin1String("Incoming/buddy_icon.png");
+				photoPath = d->currentChatStyle->getStyleBaseHref() + QLatin1String("Incoming/buddy_icon.png");
 			else if(message.direction() == Kopete::Message::Outbound)
-				photoPath = QLatin1String("Outgoing/buddy_icon.png");
-		}
-#endif
-		if( !message.from()->metaContact()->picture().isNull() )
-		{
-			photoPath = QString( "data:image/png;base64," ) + message.from()->metaContact()->picture().base64();
-		}
-		else
-		{
-			if(message.direction() == Kopete::Message::Inbound)
-				photoPath = QLatin1String("Incoming/buddy_icon.png");
-			else if(message.direction() == Kopete::Message::Outbound)
-				photoPath = QLatin1String("Outgoing/buddy_icon.png");
+				photoPath = d->currentChatStyle->getStyleBaseHref() + QLatin1String("Outgoing/buddy_icon.png");
 		}
 		resultHTML = resultHTML.replace(QLatin1String("%userIconPath%"), photoPath);
 	}
@@ -1007,40 +992,19 @@
 			resultHTML = resultHTML.replace( pos , timeRegExp.cap(0).length() , timeKeyword );
 		}
 		// Get contact image paths
-#if 0
-		QString photoIncomingPath, photoOutgoingPath;
-		photoIncomingPath = remoteContact->property( Kopete::Global::Properties::self()->photo().key()).value().toString();
-		photoOutgoingPath = d->manager->myself()->property(Kopete::Global::Properties::self()->photo().key()).value().toString();
-
-		if( photoIncomingPath.isEmpty() )
-			photoIncomingPath = QLatin1String("Incoming/buddy_icon.png");
-		if( photoOutgoingPath.isEmpty() )
-			photoOutgoingPath = QLatin1String("Outgoing/buddy_icon.png");
-
-		resultHTML = resultHTML.replace( QLatin1String("%incomingIconPath%"), photoIncomingPath);
-		resultHTML = resultHTML.replace( QLatin1String("%outgoingIconPath%"), photoOutgoingPath);
-#endif
-		QString photoIncoming, photoOutgoing;
-		if( remoteContact->metaContact() && !remoteContact->metaContact()->picture().isNull() )
-		{
-			photoIncoming = QString("data:image/png;base64,%1").arg( remoteContact->metaContact()->picture().base64() );
-		}
-		else
+		QString photoIncoming = photoForContact( remoteContact );
+		QString photoOutgoing = photoForContact( d->manager->myself() );
+		if( photoIncoming.isEmpty() )
 		{
-			photoIncoming = QLatin1String("Incoming/buddy_icon.png");
+			photoIncoming = d->currentChatStyle->getStyleBaseHref() + QLatin1String("Incoming/buddy_icon.png");
 		}
 
-		if( d->manager->myself()->metaContact() && !d->manager->myself()->metaContact()->picture().isNull() )
-		{
-			photoOutgoing =  QString("data:image/png;base64,%1").arg( d->manager->myself()->metaContact()->picture().base64() );
-		}
-		else
+		if( photoOutgoing.isEmpty() )
 		{
-			photoOutgoing = QLatin1String("Outgoing/buddy_icon.png");
+			photoOutgoing = d->currentChatStyle->getStyleBaseHref() + QLatin1String("Outgoing/buddy_icon.png");
 		}
 
-
-		resultHTML = resultHTML.replace( QLatin1String("%incomingIconPath%"), photoIncoming);
+		resultHTML = resultHTML.replace( QLatin1String("%incomingIconPath%"), photoIncoming );
 		resultHTML = resultHTML.replace( QLatin1String("%outgoingIconPath%"), photoOutgoing );
 	}
 
@@ -1219,6 +1183,25 @@
 	}
 	return styleVariant;
 }
+
+QString ChatMessagePart::photoForContact( const Kopete::Contact *contact ) const
+{
+	QString photo;
+	if ( !contact )
+		return photo;
+	
+	if( contact->metaContact() == Kopete::ContactList::self()->myself() )
+	{ // all myself contacts have the same metaContact so take photo directly from contact otherwise the photo could be wrong.
+		photo = contact->property(Kopete::Global::Properties::self()->photo().key()).value().toString();
+	}
+	else if( !contact->metaContact()->picture().isNull() )
+	{
+		photo = QString( "data:image/png;base64," ) + contact->metaContact()->picture().base64();
+	}
+	
+	return photo;
+}
+
 #include "chatmessagepart.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
--- kopete/kopete/chatwindow/chatmessagepart.h
+++ kopete/kopete/chatwindow/chatmessagepart.h
@@ -258,6 +258,12 @@
 	 */
 	QString adjustStyleVariantForChatSession( const QString & styleVariant ) const;
 
+	/**
+	 * Find photo for given contact.
+	 * @return the photo path or base64 photo data
+	 */
+	QString photoForContact( const Kopete::Contact *contact ) const;
+
 	class Private;
 	Private *d;
 };
--- kopete/kopete/chatwindow/CMakeLists.txt
+++ kopete/kopete/chatwindow/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 kde4_add_kcfg_files(kopetechatwindow_shared_SRCS GENERATE_MOC kopetechatwindowsettings.kcfgc )
 kde4_add_library(kopetechatwindow_shared SHARED ${kopetechatwindow_shared_SRCS})
-target_link_libraries(kopetechatwindow_shared kopete ${KDE4_KHTML_LIBS} )
+target_link_libraries(kopetechatwindow_shared kopete ${KDE4_KHTML_LIBS} ${KDE4_KUTILS_LIBS} )
 set_target_properties(kopetechatwindow_shared PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 install(TARGETS kopetechatwindow_shared ${INSTALL_TARGETS_DEFAULT_ARGS})
 
@@ -31,8 +31,7 @@
 
 kde4_add_plugin(krichtexteditpart WITH_PREFIX ${krichtexteditpart_PART_SRCS})
 
-
-target_link_libraries(krichtexteditpart  kopete ${KDE4_KPARTS_LIBS})
+target_link_libraries(krichtexteditpart kopete ${KDE4_KPARTS_LIBS} )
 
 install(TARGETS krichtexteditpart  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -45,7 +44,7 @@
 kde4_add_plugin(kopete_chatwindow ${kopete_chatwindow_PART_SRCS})
 
 
-target_link_libraries(kopete_chatwindow  ${KDE4_KDEUI_LIBS} kopete kopetechatwindow_shared)
+target_link_libraries(kopete_chatwindow  ${KDE4_KDEUI_LIBS} kopete kopetechatwindow_shared ${KDE4_KHTML_LIBS} ${QT_QT3SUPPORT_LIBRARY})
 
 install(TARGETS kopete_chatwindow  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -58,7 +57,7 @@
 kde4_add_plugin(kopete_emailwindow ${kopete_emailwindow_PART_SRCS})
 
 
-target_link_libraries(kopete_emailwindow  ${KDE4_KDEUI_LIBS} kopete kopetechatwindow_shared)
+target_link_libraries(kopete_emailwindow  ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} kopete kopetechatwindow_shared)
 
 install(TARGETS kopete_emailwindow  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- kopete/libkopete/kopeteaccount.cpp
+++ kopete/libkopete/kopeteaccount.cpp
@@ -90,7 +90,7 @@
 	KConfigGroup *configGroup;
 	QString customIcon;
 	Kopete::OnlineStatus restoreStatus;
-	QString restoreMessage;
+	Kopete::StatusMessage restoreMessage;
 };
 
 Account::Account( Protocol *parent, const QString &accountId )
@@ -104,7 +104,7 @@
 	d->priority = d->configGroup->readEntry( "Priority", 0 );
 
 	d->restoreStatus = Kopete::OnlineStatus::Online;
-	d->restoreMessage = "";
+	d->restoreMessage = Kopete::StatusMessage();
 
 	QObject::connect( &d->suppressStatusTimer, SIGNAL( timeout() ),
 		this, SLOT( slotStopSuppression() ) );
@@ -128,7 +128,9 @@
 
 void Account::reconnect()
 {
-	kDebug( 14010 ) << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage;
+	kDebug( 14010 ) << "account " << d->id << " restoreStatus " << d->restoreStatus.status()
+	                << " restoreTitle " << d->restoreMessage.title()
+	                << " restoreMessage " << d->restoreMessage.message();
 	setOnlineStatus( d->restoreStatus, d->restoreMessage );
 }
 
@@ -487,8 +489,8 @@
 	if ( !isOffline )
 	{
 		d->restoreStatus = newStatus;
-		d->restoreMessage = identity()->property( Kopete::Global::Properties::self()->statusMessage() ).value().toString();
-//		kDebug( 14010 ) << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage;
+		d->restoreMessage.setTitle( identity()->property( Kopete::Global::Properties::self()->statusTitle() ).value().toString() );
+		d->restoreMessage.setMessage( identity()->property( Kopete::Global::Properties::self()->statusMessage() ).value().toString() );
 	}
 
 /*	kDebug(14010) << "account " << d->id << " changed status. was "
@@ -515,11 +517,10 @@
 void Account::slotContactPropertyChanged( PropertyContainer * /* contact */,
 	const QString &key, const QVariant &old, const QVariant &newVal )
 {
-	if ( key == Kopete::Global::Properties::self()->statusMessage().key() && old != newVal && isConnected() )
-	{
-		d->restoreMessage = newVal.toString();
-//		kDebug( 14010 ) << "account " << d->id << " restoreMessage " << d->restoreMessage;
-	}
+	if ( key == Kopete::Global::Properties::self()->statusTitle().key() && old != newVal && isConnected() )
+		d->restoreMessage.setTitle( newVal.toString() );
+	else if ( key == Kopete::Global::Properties::self()->statusMessage().key() && old != newVal && isConnected() )
+		d->restoreMessage.setMessage( newVal.toString() );
 }
 
 void Account::slotStopSuppression()
--- kopete/libkopete/CMakeLists.txt
+++ kopete/libkopete/CMakeLists.txt
@@ -131,7 +131,8 @@
 
 kde4_add_library(kopete SHARED ${kopete_LIB_SRCS})
 
-target_link_libraries(kopete ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KABC_LIBS} ${KDE4_SOLID_LIBS})
+target_link_libraries(kopete ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KABC_LIBS} ${KDE4_SOLID_LIBS} ${X11_LIBRARIES})
+
 if(Q_WS_X11 AND X11_Xss_FOUND)
    target_link_libraries(kopete ${X11_Xss_LIB} ${X11_LIBRARIES})
 endif(Q_WS_X11 AND X11_Xss_FOUND)
@@ -139,6 +140,7 @@
 set_target_properties(kopete PROPERTIES
     VERSION ${GENERIC_LIB_VERSION}
     SOVERSION ${GENERIC_LIB_SOVERSION}
+    ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdeui"
     )
 if(MSVC)
   set_target_properties(kopete PROPERTIES
--- kopete/libkopete/kopeteversion.h
+++ kopete/libkopete/kopeteversion.h
@@ -14,10 +14,10 @@
 #ifndef _KOPETE_VERSION_H_
 #define _KOPETE_VERSION_H_
 
-#define KOPETE_VERSION_STRING "0.50.80"
+#define KOPETE_VERSION_STRING "0.60.1"
 #define KOPETE_VERSION_MAJOR 0
-#define KOPETE_VERSION_MINOR 50
-#define KOPETE_VERSION_RELEASE 80
+#define KOPETE_VERSION_MINOR 60
+#define KOPETE_VERSION_RELEASE 1
 #define KOPETE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 
 #define KOPETE_VERSION \
--- kopete/libkopete/ui/kopetelistviewitem.cpp
+++ kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -1188,12 +1188,9 @@
 	// PASTED FROM KLISTVIEWITEM:
 	// set the alternate cell background colour if necessary
 	QColorGroup _cg = cg;
-	if (isAlternate())
-		if (listView()->viewport()->backgroundMode()==Qt::FixedColor)
-			_cg.setColor(QPalette::Background, static_cast< K3ListView* >(listView())->alternateBackground());
-		else
-			_cg.setColor(QPalette::Base, static_cast< K3ListView* >(listView())->alternateBackground());
-	// PASTED FROM QLISTVIEWITEM
+	_cg.setColor( listView()->backgroundRole(), backgroundColor(column) );
+
+// PASTED FROM QLISTVIEWITEM
 	{
 		QPainter *p = &paint;
 
--- kget/core/plugin/kget_plugin.desktop
+++ kget/core/plugin/kget_plugin.desktop
@@ -18,6 +18,7 @@
 Name[ko]=KGet 플러그인
 Name[lt]=KGet įskiepis
 Name[lv]=KGet spraudnis
+Name[nb]=Programtillegg for KGet
 Name[nds]=KGet-Moduul
 Name[nl]=KGet-plugin
 Name[pl]=Wtyczka KGet
--- kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop
+++ kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop
@@ -10,7 +10,8 @@
 Name[fr]=TransferFactory MirrorSearch
 Name[ga]=TransferFactory MirrorSearch
 Name[lt]=MirrorSearch siuntimo sistema
-Name[nds]=Spegelsöök-Överdreegmoduul
+Name[nb]=MirrorSearch overføringsfabrikk
+Name[nds]=MirrorSearch-Överdreegmoduul
 Name[pt]=Factory de Transferências do MirrorSearch
 Name[pt_BR]=Procura por mirror  Gerador de transferência
 Name[sv]=Mirrorsearch-överföringsgenerering
--- kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop
+++ kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop
@@ -23,7 +23,6 @@
 Name[nds]=Mehrsegment-KIO-Överdreegmoduul
 Name[ne]=बहुँविध खण्ड कियो स्थानान्तरण फ्याक्ट्री
 Name[pt]=Factory de Transferências do KIO Multi-Segmentos
-Name[pt_BR]=Factory de Transferências do KIO Multi-Segmentos
 Name[sv]=Flersegments I/O-slav överföringsgenerering
 Name[tr]=Çok Parçalı KIO TransferFactory
 Name[uk]=Багатосегментний KIO TransferFactory
--- kget/transfer-plugins/metalink/kget_metalinkfactory.desktop
+++ kget/transfer-plugins/metalink/kget_metalinkfactory.desktop
@@ -17,7 +17,6 @@
 Name[nds]=MetaLink-Överdreegmoduul
 Name[ne]=मेटालिङ्क स्थानान्तरण फ्याक्ट्री
 Name[pt]=Factory de Transferências do MetaLink
-Name[pt_BR]=Factory de Transferências do MetaLink
 Name[sv]=Metalink-överföringsgenerering
 Name[x-test]=xxMetaLink TransferFactoryxx
 Name[zh_CN]=MetaLink 传输工厂
--- kget/transfer-plugins/bittorrent/CMakeLists.txt
+++ kget/transfer-plugins/bittorrent/CMakeLists.txt
@@ -238,13 +238,13 @@
 if (GMP_FOUND AND QCA2_FOUND AND ENABLE_EMBEDDED_TORRENT_SUPPORT)
     kde4_add_kcfg_files(kget_bittorrentfactory_PART_SRCS bittorrentsettings.kcfgc)
     kde4_add_plugin(kget_bittorrentfactory ${kget_bittorrentfactory_PART_SRCS} ${libbtcore_SRC})
-    target_link_libraries(kget_bittorrentfactory ${KDE4_KDEUI_LIBS} ${GMP_LIBRARIES} ${QCA2_LIBRARIES} kgetcore)
+    target_link_libraries(kget_bittorrentfactory ${KDE4_KIO_LIBS} ${GMP_LIBRARIES} ${QCA2_LIBRARIES} kgetcore)
     install(TARGETS kget_bittorrentfactory DESTINATION  ${PLUGIN_INSTALL_DIR})
     install(FILES kget_bittorrentfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 else (GMP_FOUND AND QCA2_FOUND AND ENABLE_EMBEDDED_TORRENT_SUPPORT)
     kde4_add_kcfg_files(kget_bittorrentfactory_PART_SRCS bittorrentsettings.kcfgc)
     kde4_add_plugin(kget_bittorrentfactory ${kget_bittorrentfactory_PART_SRCS})
-    target_link_libraries(kget_bittorrentfactory ${KDE4_KDEUI_LIBS} ${BTCORE_LIBRARIES} kgetcore)
+    target_link_libraries(kget_bittorrentfactory ${KDE4_KIO_LIBS} ${BTCORE_LIBRARIES} kgetcore)
     install(TARGETS kget_bittorrentfactory DESTINATION  ${PLUGIN_INSTALL_DIR})
     install(FILES kget_bittorrentfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 endif (GMP_FOUND AND QCA2_FOUND AND ENABLE_EMBEDDED_TORRENT_SUPPORT)
--- kget/transfer-plugins/mms/kget_mmsfactory.desktop
+++ kget/transfer-plugins/mms/kget_mmsfactory.desktop
@@ -10,6 +10,7 @@
 Name[fr]=TransferFactory MMS
 Name[ga]=TransferFactory MMS
 Name[lt]=MMS siuntimo sistema
+Name[nb]=MMS overføringsfabrikk
 Name[nds]=MMS-Överdreegmoduul
 Name[pt]=Factory de Transferências de MMS
 Name[pt_BR]=Gerador de transferência MMS
--- kget/main.cpp
+++ kget/main.cpp
@@ -86,9 +86,9 @@
         QString destUrl;
         if (l.count() >= 2 && l.last().isLocalFile()) {
             if (!QFileInfo(l.last().path()).isDir())
-                destUrl = l.last().directory();
+                destUrl = l.last().directory(KUrl::AppendTrailingSlash);
             else
-                destUrl = l.last().path();
+                destUrl = l.last().path(KUrl::AddTrailingSlash);
 
             l.removeLast();
             KGet::addTransfer(l, destUrl, QString(), true);
--- kget/desktop/kget.desktop
+++ kget/desktop/kget.desktop
@@ -74,3 +74,4 @@
 GenericName[zh_TW]=下載管理員
 Categories=Qt;KDE;Network;FileTransfer;
 X-DBUS-ServiceType=Unique
+X-DocPath=kget/index.html
--- kget/plasma/applet/plasma-kget-default.desktop
+++ kget/plasma/applet/plasma-kget-default.desktop
@@ -25,6 +25,7 @@
 Comment[ko]=KGet 다운로드 모니터
 Comment[lt]=KGet siuntimų stebėjimas
 Comment[lv]=KGet lejupielāžu novērotājs
+Comment[nb]=KGet nedlastingsovervåker
 Comment[nds]=Daallaadkieker för KGet
 Comment[nl]=KGet-downloadsmonitor
 Comment[pl]=Monitor pobierania KGet
--- kppp/DB/Provider/Slovenia/.directory
+++ kppp/DB/Provider/Slovenia/.directory
@@ -27,7 +27,7 @@
 Name[pa]=ਸਲੋਵੀਨਿਆ
 Name[pl]=Słowenia
 Name[pt]=Eslovénia
-Name[pt_BR]=Eslovénia
+Name[pt_BR]=Eslovênia
 Name[ru]=Словения
 Name[sk]=Slovinsko
 Name[sl]=Slovenija
--- kppp/DB/Provider/Czech_Republic/.directory
+++ kppp/DB/Provider/Czech_Republic/.directory
@@ -28,7 +28,7 @@
 Name[pa]=ਚੈਕ
 Name[pl]=Czechy
 Name[pt]=República Checa
-Name[pt_BR]=República Checa
+Name[pt_BR]=República Tcheca
 Name[ru]=Чехия
 Name[sk]=Česko
 Name[sl]=Češka
--- kppp/DB/Provider/Yugoslavia/.directory
+++ kppp/DB/Provider/Yugoslavia/.directory
@@ -28,7 +28,7 @@
 Name[pa]=ਯੂਗੋਸਲਾਵੀਆ
 Name[pl]=Jugosławia
 Name[pt]=Jugoslávia
-Name[pt_BR]=Jugoslávia
+Name[pt_BR]=Iugoslávia
 Name[ru]=Югославия
 Name[sk]=Juhoslávia
 Name[sl]=Jugoslavija
--- kppp/DB/Provider/Taiwan/.directory
+++ kppp/DB/Provider/Taiwan/.directory
@@ -18,7 +18,6 @@
 Name[pa]=ਤਾਈਵਾਨ
 Name[pl]=Tajwan
 Name[pt]=Formosa
-Name[pt_BR]=Formosa
 Name[ru]=Тайвань
 Name[sk]=Tajvan
 Name[sl]=Tajvan
--- kppp/DB/Provider/Belarus/.directory
+++ kppp/DB/Provider/Belarus/.directory
@@ -30,7 +30,7 @@
 Name[pa]=ਬੇਲਾਰੂਸ
 Name[pl]=Białoruś
 Name[pt]=Bielorrússia
-Name[pt_BR]=Bielorrússia
+Name[pt_BR]=Bielo-Rússia
 Name[ru]=Беларусь
 Name[sk]=Bielorusko
 Name[sl]=Belorusija

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
   +

Places

File 4_1_BRANCH.diff of Package kdenetwork4 (Revision 735a568db71522ef6fda52f7597028c4)

Places