Merge remote branch 'mainline/4.8'

Conflicts:
	tools/qdoc3/cppcodemarker.cpp
	tools/qdoc3/node.cpp

65 files changed, 1888 insertions, 985 deletions

diff --git a/configure b/configure
index a0e237e..b590507 100755
--- a/configure
+++ b/configure
@@ -9017,6 +9017,10 @@ for file in .projects .projects.3; do
             if [ "$CFG_NOPROCESS" = "yes" ] || [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
                 continue
             fi;;
+        *activeqt/*)
+            if [ "$PLATFORM" = "win32-g++" ] || [ "$XPLATFORM" = "win32-g++" ]; then
+                continue
+            fi;;
         *examples/activeqt/*) continue ;;
         */qmake/qmake.pro) continue ;;
         *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;
diff --git a/demos/gradients/gradients.cpp b/demos/gradients/gradients.cpp
index d8b739b..338d8eb 100644
--- a/demos/gradients/gradients.cpp
+++ b/demos/gradients/gradients.cpp
@@ -219,7 +219,7 @@ void GradientEditor::pointsUpdated()
 
     for (int i=0; i<points.size(); ++i) {
         qreal x = int(points.at(i).x());
-        if (i < points.size() - 1 && x == points.at(i+1).x())
+        if (i+1 < points.size() && x == points.at(i+1).x())
             continue;
         QColor color((0x00ff0000 & m_red_shade->colorAt(int(x))) >> 16,
                      (0x0000ff00 & m_green_shade->colorAt(int(x))) >> 8,
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc
index 2f68f3d..5204cc6 100644
--- a/doc/src/deployment/qt-conf.qdoc
+++ b/doc/src/deployment/qt-conf.qdoc
@@ -48,7 +48,7 @@
 
     \o \c :/qt/etc/qt.conf using the resource system
 
-    \o on Mac OS X, in the Resource directory inside the appliction
+    \o on Mac OS X, in the Resource directory inside the application
     bundle, for example \c assistant.app/Contents/Resources/qt.conf
 
     \o in the directory containing the application executable, i.e.
diff --git a/doc/src/template/style/offline.css b/doc/src/template/style/offline.css
index 44abb3c..d33d8e7 100644
--- a/doc/src/template/style/offline.css
+++ b/doc/src/template/style/offline.css
@@ -74,8 +74,7 @@
 
     body
     {
-        margin-left: 0.5em;
-        margin-right: 0.5em;
+        margin: 0px;
         font-family: sans-serif;
         line-height: normal
     }
@@ -238,7 +237,9 @@
 
     .header .content
     {
-        margin-bottom: 0.5em
+        margin-left: 5px; 
+        margin-top: 5px;
+        margin-bottom: 0.5em;
     }
 
     .header .breadcrumb
@@ -413,6 +414,11 @@
     .flowList dd a{
     }
 
+    .mainContent
+    {
+        padding-left:5px;
+    }
+
     .content .flowList p{
         padding:0px;
     }
diff --git a/examples/webkit/simplewebplugin/csvfactory.h b/examples/webkit/simplewebplugin/csvfactory.h
index 0b046c5..e3013b1 100644
--- a/examples/webkit/simplewebplugin/csvfactory.h
+++ b/examples/webkit/simplewebplugin/csvfactory.h
@@ -44,8 +44,10 @@
 #include <QNetworkRequest>
 #include <QWebPluginFactory>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
+QT_END_NAMESPACE
 
 //! [plugin factory]
 class CSVFactory : public QWebPluginFactory
diff --git a/examples/webkit/simplewebplugin/csvview.h b/examples/webkit/simplewebplugin/csvview.h
index 0a136f3..f457d0a 100644
--- a/examples/webkit/simplewebplugin/csvview.h
+++ b/examples/webkit/simplewebplugin/csvview.h
@@ -46,8 +46,10 @@
 #include <QTableView>
 #include <QWebPluginFactory>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
+QT_END_NAMESPACE
 
 //! [definition]
 class CSVView : public QTableView
diff --git a/examples/webkit/webftpclient/downloader.h b/examples/webkit/webftpclient/downloader.h
index 8201cea..dd2f8ec 100644
--- a/examples/webkit/webftpclient/downloader.h
+++ b/examples/webkit/webftpclient/downloader.h
@@ -46,10 +46,12 @@
 #include <QObject>
 #include <QUrl>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkRequest;
 class QNetworkReply;
 class QWidget;
+QT_END_NAMESPACE
 
 class Downloader : public QObject
 {
diff --git a/examples/webkit/webftpclient/ftpreply.h b/examples/webkit/webftpclient/ftpreply.h
index becd4e4..ca0a271 100644
--- a/examples/webkit/webftpclient/ftpreply.h
+++ b/examples/webkit/webftpclient/ftpreply.h
@@ -44,8 +44,7 @@
 #include <QNetworkReply>
 #include <QStringList>
 #include <QUrlInfo>
-
-class QFtp;
+#include <QFtp>
 
 //! [class definition]
 class FtpReply : public QNetworkReply
diff --git a/examples/webkit/webftpclient/ftpview.h b/examples/webkit/webftpclient/ftpview.h
index 2538812..544c0a9 100644
--- a/examples/webkit/webftpclient/ftpview.h
+++ b/examples/webkit/webftpclient/ftpview.h
@@ -41,7 +41,6 @@
 #include <QWebView>
 
 class Downloader;
-class QNetworkAccessManager;
 
 class FtpView : public QWebView
 {
diff --git a/examples/webkit/webplugin/csvfactory.h b/examples/webkit/webplugin/csvfactory.h
index 5a44c50..d1d6b9c 100644
--- a/examples/webkit/webplugin/csvfactory.h
+++ b/examples/webkit/webplugin/csvfactory.h
@@ -44,8 +44,10 @@
 #include <QNetworkRequest>
 #include <QWebPluginFactory>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
+QT_END_NAMESPACE
 class QWebView;
 
 class CSVFactory : public QWebPluginFactory
diff --git a/examples/webkit/webplugin/csvview.h b/examples/webkit/webplugin/csvview.h
index bf8918b..4cbb069 100644
--- a/examples/webkit/webplugin/csvview.h
+++ b/examples/webkit/webplugin/csvview.h
@@ -46,8 +46,10 @@
 #include <QTableView>
 #include <QWebPluginFactory>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
+QT_END_NAMESPACE
 class QWebFrame;
 
 //! [definition]
diff --git a/examples/widgets/orientation/mainwindow.h b/examples/widgets/orientation/mainwindow.h
index 400a6a5..745497c 100644
--- a/examples/widgets/orientation/mainwindow.h
+++ b/examples/widgets/orientation/mainwindow.h
@@ -41,13 +41,11 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QWidget>
+#include <QAbstractButton>
 
 #include "ui_landscape.h"
 #include "ui_portrait.h"
 
-class QAbstractButton;
-
 //! [0]
 class MainWindow : public QWidget
 {
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 00f6b4a..eda489f 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -784,7 +784,7 @@ MakefileGenerator::init()
             (*it) = Option::fixPathToLocalOS((*it));
     }
 
-    { //get the output_dir into the pwd
+    if(!project->isActiveConfig("no_include_pwd")) { //get the output_dir into the pwd
         if(Option::output_dir != qmake_getpwd())
             project->values("INCLUDEPATH").append(".");
     }
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp
index d6dab0b..f9cbed1 100644
--- a/qmake/generators/makefiledeps.cpp
+++ b/qmake/generators/makefiledeps.cpp
@@ -499,7 +499,7 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file)
                             } else if(*(buffer+x) == '*') { //c style comment
                                 for(++x; x < buffer_len; ++x) {
                                     if(*(buffer+x) == '*') {
-                                        if(x < buffer_len-1 && *(buffer + (x+1)) == '/') {
+                                        if(x+1 < buffer_len && *(buffer + (x+1)) == '/') {
                                             ++x;
                                             break;
                                         }
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index c0c62e1..d9086c1 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -2008,7 +2008,7 @@ QString QDir::cleanPath(const QString &path)
     const QChar *p = name.unicode();
     for (int i = 0, last = -1, iwrite = 0; i < len; ++i) {
         if (p[i] == QLatin1Char('/')) {
-            while (i < len-1 && p[i+1] == QLatin1Char('/')) {
+            while (i+1 < len && p[i+1] == QLatin1Char('/')) {
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) //allow unc paths
                 if (!i)
                     break;
@@ -2016,9 +2016,9 @@ QString QDir::cleanPath(const QString &path)
                 i++;
             }
             bool eaten = false;
-            if (i < len - 1 && p[i+1] == QLatin1Char('.')) {
+            if (i+1 < len && p[i+1] == QLatin1Char('.')) {
                 int dotcount = 1;
-                if (i < len - 2 && p[i+2] == QLatin1Char('.'))
+                if (i+2 < len && p[i+2] == QLatin1Char('.'))
                     dotcount++;
                 if (i == len - dotcount - 1) {
                     if (dotcount == 1) {
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 8e4fb32..e1b4232 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -2788,6 +2788,8 @@ int QDateTime::secsTo(const QDateTime &other) const
 }
 
 /*!
+    \since 4.7
+
     Returns the number of milliseconds from this datetime to the \a other
     datetime. If the \a other datetime is earlier than this datetime,
     the value returned is negative.
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 4eb05d6..9f7b23f 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -769,25 +769,32 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::clear()
 template <typename T>
 Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t)
 {
-    detachShared();
+    int index = indexOf(_t);
+    if (index == -1)
+        return 0;
+
     const T t = _t;
-    int removedCount=0, i=0;
-    Node *n;
-    while (i < p.size())
-        if ((n = reinterpret_cast<Node *>(p.at(i)))->t() == t) {
-            node_destruct(n);
-            p.remove(i);
-            ++removedCount;
-        } else {
-            ++i;
-        }
+    detach();
+
+    Node *i = reinterpret_cast<Node *>(p.at(index));
+    Node *e = reinterpret_cast<Node *>(p.end());
+    Node *n = i;
+    node_destruct(i);
+    while (++i != e) {
+        if (i->t() == t)
+            node_destruct(i);
+        else
+            *n++ = *i;
+    }
+
+    int removedCount = e - n;
+    d->end -= removedCount;
     return removedCount;
 }
 
 template <typename T>
 Q_OUTOFLINE_TEMPLATE bool QList<T>::removeOne(const T &_t)
 {
-    detachShared();
     int index = indexOf(_t);
     if (index != -1) {
         removeAt(index);
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 805ca4d..7127173 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -3600,8 +3600,8 @@ void QDeclarativeItem::setSize(const QSizeF &size)
 bool QDeclarativeItem::hasActiveFocus() const
 {
     Q_D(const QDeclarativeItem);
-    return focusItem() == this ||
-           (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0);
+    return (focusItem() && focusItem()->isVisible()) && (focusItem() == this ||
+           (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0));
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 2ac2bdf..0c218fc 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1171,24 +1171,26 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, const Q
     // Update focus scope item ptr in new scope.
     QGraphicsItem *newFocusScopeItem = subFocusItem ? subFocusItem : parentFocusScopeItem;
     if (newFocusScopeItem && newParent) {
-        if (subFocusItem) {
-            // Find the subFocusItem's topmost focus scope.
-            QGraphicsItem *ancestorScope = 0;
-            QGraphicsItem *p = subFocusItem->d_ptr->parent;
-            while (p) {
-                if (p->d_ptr->flags & QGraphicsItem::ItemIsFocusScope)
-                    ancestorScope = p;
-                if (p->d_ptr->flags & QGraphicsItem::ItemIsPanel)
-                    break;
-                p = p->d_ptr->parent;
-            }
-            if (ancestorScope)
-                newFocusScopeItem = ancestorScope;
-        }
-
         QGraphicsItem *p = newParent;
         while (p) {
             if (p->d_ptr->flags & QGraphicsItem::ItemIsFocusScope) {
+                if (subFocusItem && subFocusItem != q_ptr) {
+                    // Find the subFocusItem's topmost focus scope within the new parent's focusscope
+                    QGraphicsItem *ancestorScope = 0;
+                    QGraphicsItem *p2 = subFocusItem->d_ptr->parent;
+                    while (p2 && p2 != p) {
+                        if (p2->d_ptr->flags & QGraphicsItem::ItemIsFocusScope)
+                            ancestorScope = p2;
+                        if (p2->d_ptr->flags & QGraphicsItem::ItemIsPanel)
+                            break;
+                        if (p2 == q_ptr)
+                            break;
+                        p2 = p2->d_ptr->parent;
+                    }
+                    if (ancestorScope)
+                        newFocusScopeItem = ancestorScope;
+                }
+
                 p->d_ptr->focusScopeItem = newFocusScopeItem;
                 newFocusScopeItem->d_ptr->focusScopeItemChange(true);
                 // Ensure the new item is no longer the subFocusItem. The
@@ -3297,7 +3299,7 @@ void QGraphicsItemPrivate::setFocusHelper(Qt::FocusReason focusReason, bool clim
     }
 
     if (climb) {
-        while (f->d_ptr->focusScopeItem && f->d_ptr->focusScopeItem->isVisible() && f->d_ptr->focusScopeItem != f)
+        while (f->d_ptr->focusScopeItem && f->d_ptr->focusScopeItem->isVisible())
             f = f->d_ptr->focusScopeItem;
     }
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 9826689..36786c4 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3552,7 +3552,7 @@ void QRasterPaintEngine::drawBitmap(const QPointF &pos, const QImage &image, QSp
                     spans[n].y = y;
                     spans[n].coverage = 255;
                     int len = 1;
-                    while (src_x < w-1 && src[(src_x+1) >> 3] & (0x1 << ((src_x+1) & 7))) {
+                    while (src_x+1 < w && src[(src_x+1) >> 3] & (0x1 << ((src_x+1) & 7))) {
                         ++src_x;
                         ++len;
                     }
@@ -3578,7 +3578,7 @@ void QRasterPaintEngine::drawBitmap(const QPointF &pos, const QImage &image, QSp
                     spans[n].y = y;
                     spans[n].coverage = 255;
                     int len = 1;
-                    while (src_x < w-1 && src[(src_x+1) >> 3] & (0x80 >> ((src_x+1) & 7))) {
+                    while (src_x+1 < w && src[(src_x+1) >> 3] & (0x80 >> ((src_x+1) & 7))) {
                         ++src_x;
                         ++len;
                     }
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index 147d2ec..17d141c 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -2333,7 +2333,7 @@ static QPainterPath path_for_glyphs(const QVarLengthArray<glyph_t> &glyphs,
                 bool set = src[x >> 3] & (0x80 >> (x & 7));
                 if (set) {
                     QRect r(xp + x, yp - h, 1, 1);
-                    while (x < glyph->width-1 && src[(x+1) >> 3] & (0x80 >> ((x+1) & 7))) {
+                    while (x+1 < glyph->width && src[(x+1) >> 3] & (0x80 >> ((x+1) & 7))) {
                         ++x;
                         r.setRight(r.right()+1);
                     }
diff --git a/src/gui/painting/qtessellator.cpp b/src/gui/painting/qtessellator.cpp
index c469438..94a5128 100644
--- a/src/gui/painting/qtessellator.cpp
+++ b/src/gui/painting/qtessellator.cpp
@@ -893,7 +893,7 @@ void QTessellatorPrivate::processIntersections()
             QDEBUG() << "    adding edge on left";
             --min;
         }
-        while (max < scanline.size - 1 && scanline.edges[max + 1]->positionAt(y) <=  xmax) {
+        while (max + 1 < scanline.size && scanline.edges[max + 1]->positionAt(y) <=  xmax) {
             QDEBUG() << "    adding edge on right";
             ++max;
         }
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index a70aec1..8d81acb 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -155,6 +155,7 @@ public:
     struct FaceId {
         FaceId() : index(0), encoding(0) {}
         QByteArray filename;
+        QByteArray uuid;
         int index;
         int encoding;
     };
@@ -295,7 +296,7 @@ inline bool operator ==(const QFontEngine::FaceId &f1, const QFontEngine::FaceId
 
 inline uint qHash(const QFontEngine::FaceId &f)
 {
-    return qHash((f.index << 16) + f.encoding) + qHash(f.filename);
+    return qHash((f.index << 16) + f.encoding) + qHash(f.filename + f.uuid);
 }
 
 
diff --git a/src/gui/text/qrawfont_ft.cpp b/src/gui/text/qrawfont_ft.cpp
index 5bba221..1666df3 100644
--- a/src/gui/text/qrawfont_ft.cpp
+++ b/src/gui/text/qrawfont_ft.cpp
@@ -45,6 +45,7 @@
 
 #include "qrawfont_p.h"
 #include "qfontengine_ft_p.h"
+#include "quuid.h"
 
 #if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
 #  include "qfontengine_x11_p.h"
@@ -87,6 +88,7 @@ public:
         FaceId faceId;
         faceId.filename = "";
         faceId.index = 0;
+        faceId.uuid = QUuid::createUuid().toByteArray();
 
         return init(faceId, true, Format_None, fontData);
     }
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 16e4aad..8faf156 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -171,7 +171,7 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const
 
     if (tabIndex > 0 && tabIndex - 1 == d->currentIndex)
         option->selectedPosition = QStyleOptionTab::PreviousIsSelected;
-    else if (tabIndex < totalTabs - 1 && tabIndex + 1 == d->currentIndex)
+    else if (tabIndex + 1 < totalTabs && tabIndex + 1 == d->currentIndex)
         option->selectedPosition = QStyleOptionTab::NextIsSelected;
     else
         option->selectedPosition = QStyleOptionTab::NotAdjacent;
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 76b7d41..ab09932 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -783,22 +783,24 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
 // These certificates are known to be fraudulent and were created during the comodo
 // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
 static const char *certificate_blacklist[] = {
-    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
-    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
-    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
-    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
-    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
-    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
-    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
-    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
-    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
+    "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // DigiNotar
     0
 };
 
 bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
 {
     for (int a = 0; certificate_blacklist[a] != 0; a++) {
-        if (certificate.serialNumber() == certificate_blacklist[a])
+        if (certificate.serialNumber() == certificate_blacklist[a++] &&
+            certificate.subjectInfo(QSslCertificate::CommonName) == QString::fromUtf8(certificate_blacklist[a]))
             return true;
     }
     return false;
diff --git a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
index 8a40b24..aca28f1 100644
--- a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
@@ -41,7 +41,7 @@
 
 #include "qdirectfbglcontext.h"
 
-#include <directfb/directfbgl.h>
+#include <directfbgl.h>
 
 #include <QDebug>
 
diff --git a/src/qt3support/itemviews/q3listbox.cpp b/src/qt3support/itemviews/q3listbox.cpp
index 796a3b8..f1574df 100644
--- a/src/qt3support/itemviews/q3listbox.cpp
+++ b/src/qt3support/itemviews/q3listbox.cpp
@@ -3531,9 +3531,9 @@ void Q3ListBox::refreshSlot()
     int col = columnAt(x);
     int row = rowAt(y);
     int top = row;
-    while(col < (int)d->columnPos.size()-1 && d->columnPos[col+1] < x)
+    while(col+1 < (int)d->columnPos.size() && d->columnPos[col+1] < x)
         col++;
-    while(top < (int)d->rowPos.size()-1 && d->rowPos[top+1] < y)
+    while(top+1 < (int)d->rowPos.size() && d->rowPos[top+1] < y)
         top++;
     Q3ListBoxItem * i = item(col * numRows() + row);
 
@@ -3684,7 +3684,7 @@ int Q3ListBox::columnAt(int x) const
         return numColumns() - 1;
 
     int col = 0;
-    while(col < (int)d->columnPos.size()-1 && d->columnPos[col+1] < x)
+    while(col+1 < (int)d->columnPos.size() && d->columnPos[col+1] < x)
         col++;
     return col;
 }
diff --git a/src/qt3support/sql/q3datatable.cpp b/src/qt3support/sql/q3datatable.cpp
index 39ef1d9..35e9fda 100644
--- a/src/qt3support/sql/q3datatable.cpp
+++ b/src/qt3support/sql/q3datatable.cpp
@@ -710,7 +710,7 @@ bool Q3DataTable::eventFilter( QObject *o, QEvent *e )
 	    return true;
 	}
 	if ( d->dat.mode() != QSql::None ) {
-	    if ( (ke->key() == Qt::Key_Tab) && (c < numCols() - 1) && (!isColumnReadOnly( c+1 ) || d->dat.mode() == QSql::Insert) )
+	    if ( (ke->key() == Qt::Key_Tab) && (c+1 < numCols()) && (!isColumnReadOnly( c+1 ) || d->dat.mode() == QSql::Insert) )
 		d->continuousEdit = true;
 	    else if ( (ke->key() == Qt::Key_BackTab) && (c > 0) && (!isColumnReadOnly( c-1 ) || d->dat.mode() == QSql::Insert) )
 		d->continuousEdit = true;
diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp
index dc1476c..c367c0c 100644
--- a/src/qt3support/text/q3richtext.cpp
+++ b/src/qt3support/text/q3richtext.cpp
@@ -121,7 +121,7 @@ static inline bool isBreakable(Q3TextString *string, int pos)
 {
     if (string->at(pos).nobreak)
         return false;
-    return (pos < string->length()-1 && string->at(pos+1).softBreak);
+    return (pos+1 < string->length() && string->at(pos+1).softBreak);
 }
 
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/src/scripttools/debugging/qscriptcompletiontask.cpp b/src/scripttools/debugging/qscriptcompletiontask.cpp
index fb250b7..3c94a21 100644
--- a/src/scripttools/debugging/qscriptcompletiontask.cpp
+++ b/src/scripttools/debugging/qscriptcompletiontask.cpp
@@ -172,7 +172,7 @@ void QScriptCompletionTaskPrivate::completeScriptExpression()
     while ((pos > 0) && isIdentChar(contents.at(pos-1)))
         --pos;
     int pos2 = cursorPosition - 1;
-    while ((pos2 < contents.size()-1) && isIdentChar(contents.at(pos2+1)))
+    while ((pos2+1 < contents.size()) && isIdentChar(contents.at(pos2+1)))
         ++pos2;
     QString ident = contents.mid(pos, pos2 - pos + 1);
     position = pos;
diff --git a/src/scripttools/debugging/qscriptdebuggercodeview.cpp b/src/scripttools/debugging/qscriptdebuggercodeview.cpp
index 7c99723..65fd366 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeview.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodeview.cpp
@@ -233,7 +233,7 @@ bool QScriptDebuggerCodeView::event(QEvent *e)
             return false;
         }
         int pos2 = linePosition - 1;
-        while ((pos2 < contents.size()-1) && isIdentChar(contents.at(pos2+1)))
+        while ((pos2+1 < contents.size()) && isIdentChar(contents.at(pos2+1)))
             ++pos2;
         QString ident = contents.mid(pos, pos2 - pos + 1);
 
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index f2b2ccf..71a81c0 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -183,7 +183,7 @@ QString QSqlResultPrivate::namedToPositionalBinding()
         QChar ch = sql.at(i);
         if (ch == QLatin1Char(':') && !inQuote
                 && (i == 0 || sql.at(i - 1) != QLatin1Char(':'))
-                && (i < n - 1 && qIsAlnum(sql.at(i + 1)))) {
+                && (i + 1 < n && qIsAlnum(sql.at(i + 1)))) {
             int pos = i + 2;
             while (pos < n && qIsAlnum(sql.at(pos)))
                 ++pos;
@@ -618,7 +618,7 @@ bool QSqlResult::prepare(const QString& query)
         QChar ch = query.at(i);
         if (ch == QLatin1Char(':') && !inQuote
                 && (i == 0 || query.at(i - 1) != QLatin1Char(':'))
-                && (i < n - 1 && qIsAlnum(query.at(i + 1)))) {
+                && (i + 1 < n && qIsAlnum(query.at(i + 1)))) {
             int pos = i + 2;
             while (pos < n && qIsAlnum(query.at(pos)))
                 ++pos;
diff --git a/src/src.pro b/src/src.pro
index 9e29b89..9314fbd 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,7 +11,7 @@ nacl: SRC_SUBDIRS -= src_network src_testlib
 !wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
 
 !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro)
-win32:SRC_SUBDIRS += src_activeqt
+win32:!win32-g++*:SRC_SUBDIRS += src_activeqt
 
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl
 contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 13f57f5..9309db1 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -216,8 +216,8 @@ Type Moc::parseType()
             QByteArray templ = lexemUntil(RANGLE);
             for (int i = 0; i < templ.size(); ++i) {
                 type.name += templ.at(i);
-                if ((templ.at(i) == '<' && i < templ.size()-1 && templ.at(i+1) == ':')
-                    || (templ.at(i) == '>' && i < templ.size()-1 && templ.at(i+1) == '>')) {
+                if ((templ.at(i) == '<' && i+1 < templ.size() && templ.at(i+1) == ':')
+                    || (templ.at(i) == '>' && i+1 < templ.size() && templ.at(i+1) == '>')) {
                     type.name += ' ';
                 }
             }
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index 362a8ff..2fdeb71 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -90,6 +90,7 @@ private slots:
     void testQtQuick11Attributes();
     void testQtQuick11Attributes_data();
     void qtbug_16871();
+    void qtbug_21045();
 private:
     QDeclarativeEngine engine;
 };
@@ -1238,6 +1239,18 @@ void tst_QDeclarativeItem::qtbug_16871()
     delete o;
 }
 
+void tst_QDeclarativeItem::qtbug_21045()
+{
+    QDeclarativeComponent component(&engine);
+    QGraphicsScene scene;
+    component.setData("import QtQuick 1.1\nItem{visible: false; focus: true}", QUrl::fromLocalFile("file:"));
+    QObject *o = component.create();
+    QDeclarativeItem* i = qobject_cast<QDeclarativeItem*>(o);
+    QVERIFY(i);
+    scene.addItem(i);
+    QVERIFY(!i->hasActiveFocus());
+}
+
 QTEST_MAIN(tst_QDeclarativeItem)
 
 #include "tst_qdeclarativeitem.moc"
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 3665b10..9b834d5 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -475,6 +475,7 @@ private slots:
     void QTBUG_12112_focusItem();
     void QTBUG_13473_sceneposchange();
     void QTBUG_16374_crashInDestructor();
+    void QTBUG_20699_focusScopeCrash();
 
 private:
     QList<QGraphicsItem *> paintedItems;
@@ -11265,5 +11266,36 @@ void tst_QGraphicsItem::QTBUG_16374_crashInDestructor()
     QTest::qWaitForWindowShown(&view);
 }
 
+void tst_QGraphicsItem::QTBUG_20699_focusScopeCrash()
+{
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    QGraphicsPixmapItem fs;
+    fs.setFlags(QGraphicsItem::ItemIsFocusScope | QGraphicsItem::ItemIsFocusable);
+    scene.addItem(&fs);
+    QGraphicsPixmapItem* fs2 = new QGraphicsPixmapItem(&fs);
+    fs2->setFlags(QGraphicsItem::ItemIsFocusScope | QGraphicsItem::ItemIsFocusable);
+    QGraphicsPixmapItem* fi2 = new QGraphicsPixmapItem(&fs);
+    fi2->setFlags(QGraphicsItem::ItemIsFocusable);
+    QGraphicsPixmapItem* fi = new QGraphicsPixmapItem(fs2);
+    fi->setFlags(QGraphicsItem::ItemIsFocusable);
+    fs.setFocus();
+    fi->setFocus();
+
+    view.show();
+    QTest::qWaitForWindowShown(&view);
+
+    fi->setParentItem(fi2);
+    fi->setFocus();
+    fs.setFocus();
+    fi->setParentItem(fs2);
+    fi->setFocus();
+    fs2->setFocus();
+    fs.setFocus();
+    fi->setParentItem(fi2);
+    fi->setFocus();
+    fs.setFocus();
+}
+
 QTEST_MAIN(tst_QGraphicsItem)
 #include "tst_qgraphicsitem.moc"
diff --git a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 839612e..4ffb00b 100644
--- a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -116,7 +116,7 @@ void tst_QNetworkProxyFactory::systemProxyForQuery() const
     QNetworkProxy proxy;
 
     QList<QNetworkProxy> nativeProxyList;
-    nativeProxyList << QNetworkProxy(QNetworkProxy::HttpProxy, QString("http://test.proxy.com"), 8080) << QNetworkProxy::NoProxy;
+    nativeProxyList << QNetworkProxy(QNetworkProxy::HttpProxy, QString("test.proxy.com"), 8080) << QNetworkProxy::NoProxy;
 
     foreach (proxy, systemProxyList) {
         if (!nativeProxyList.contains(proxy)) {
diff --git a/tests/auto/qrawfont/tst_qrawfont.cpp b/tests/auto/qrawfont/tst_qrawfont.cpp
index e0680c4..eb78057 100644
--- a/tests/auto/qrawfont/tst_qrawfont.cpp
+++ b/tests/auto/qrawfont/tst_qrawfont.cpp
@@ -47,7 +47,6 @@
 class tst_QRawFont: public QObject
 {
     Q_OBJECT
-
 #if !defined(QT_NO_RAWFONT)
 private slots:
     void invalidRawFont();
@@ -94,6 +93,11 @@ private slots:
 
     void rawFontSetPixelSize_data();
     void rawFontSetPixelSize();
+
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
+    void multipleRawFontsFromData();
+#endif
+
 #endif // QT_NO_RAWFONT
 };
 
@@ -843,6 +847,25 @@ void tst_QRawFont::rawFontSetPixelSize()
     QCOMPARE(rawFont.pixelSize(), 24.0);
 }
 
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
+void tst_QRawFont::multipleRawFontsFromData()
+{
+    QFile file(QString::fromLatin1(SRCDIR "testfont.ttf"));
+    QRawFont testFont;
+    if (file.open(QIODevice::ReadOnly)) {
+        testFont.loadFromData(file.readAll(), 11, QFont::PreferDefaultHinting);
+        file.close();
+    }
+    file.setFileName(QLatin1String(SRCDIR "testfont_bold_italic.ttf"));
+    QRawFont testFontBoldItalic;
+    if (file.open(QIODevice::ReadOnly))
+        testFontBoldItalic.loadFromData(file.readAll(), 11, QFont::PreferDefaultHinting);
+
+    QVERIFY(testFont.familyName() != (testFontBoldItalic.familyName())
+            || testFont.styleName() != (testFontBoldItalic.styleName()));
+}
+#endif
+
 #endif // QT_NO_RAWFONT
 
 QTEST_MAIN(tst_QRawFont)
diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/qshortcut/tst_qshortcut.cpp
index a78e8cf..d761b19 100644
--- a/tests/auto/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/qshortcut/tst_qshortcut.cpp
@@ -1124,7 +1124,8 @@ void tst_QShortcut::context()
 // ------------------------------------------------------------------
 void tst_QShortcut::clearAllShortcuts()
 {
-    qDeleteAll(shortcuts);
+    QList<QShortcut *> shortcutsCpy = shortcuts;
+    qDeleteAll(shortcutsCpy);
     shortcuts.clear();
 }
 
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem
new file mode 100644
index 0000000..12bbcae
--- /dev/null
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFKDCCBBCgAwIBAgIQBeLmpM0J6lTWZbB1/iKiVjANBgkqhkiG9w0BAQUFADBm
+MQswCQYDVQQGEwJOTDESMBAGA1UEChMJRGlnaU5vdGFyMSEwHwYDVQQDExhEaWdp
+Tm90YXIgUHVibGljIENBIDIwMjUxIDAeBgkqhkiG9w0BCQEWEWluZm9AZGlnaW5v
+dGFyLm5sMB4XDTExMDcxMDE5MDYzMFoXDTEzMDcwOTE5MDYzMFowajELMAkGA1UE
+BhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxFjAUBgNVBAcTDU1vdW50YWluIFZp
+ZXcxFzAVBgNVBAUTDlBLMDAwMjI5MjAwMDAyMRUwEwYDVQQDEwwqLmdvb2dsZS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNbeKubCV0aCxhOiOS
+CSQ/w9HXTYuD5BLKuiqXNw3setdTymeJz2L8aWOHo3nicFNDVwWTgwWomGNr2J6Q
+7g1iINNSW0rR4E1l2szRkcnAY6c6i/Eke93nF4i2hDsnIBveolF5yjpuRm73uQQD
+ulHjA3BFRF/PTi0fw2/Yt+8ieoMuNcMWN6Eou5Gqt5YZkWv176ofeCbsBmMrP87x
+OhhtTDckCapk4VQZG2XrfzZcV6tdzCp5TI8uHdu17cdzXm1imZ8tyvzFeiCEOQN8
+vPNzB/fIr3CJQ5q4uM5aKT3DD5PeVzf4rfJKQNgCTWiIBc9XcWEUuszwAsnmg7e2
+EJRdAgMBAAGjggHMMIIByDA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUHMAGGHmh0
+dHA6Ly92YWxpZGF0aW9uLmRpZ2lub3Rhci5ubDAfBgNVHSMEGDAWgBTfM8Cvkv43
+/LbYFhbQ2bGR1fpupTAJBgNVHRMEAjAAMIHGBgNVHSAEgb4wgbswgbgGDmCEEAGH
+aQEBAQIEAQICMIGlMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2lub3Rhci5u
+bC9jcHMwegYIKwYBBQUHAgIwbhpsQ29uZGl0aW9ucywgYXMgbWVudGlvbmVkIG9u
+IG91ciB3ZWJzaXRlICh3d3cuZGlnaW5vdGFyLm5sKSwgYXJlIGFwcGxpY2FibGUg
+dG8gYWxsIG91ciBwcm9kdWN0cyBhbmQgc2VydmljZXMuMEkGA1UdHwRCMEAwPqA8
+oDqGOGh0dHA6Ly9zZXJ2aWNlLmRpZ2lub3Rhci5ubC9jcmwvcHVibGljMjAyNS9s
+YXRlc3RDUkwuY3JsMA4GA1UdDwEB/wQEAwIEsDAbBgNVHREEFDASgRBhZG1pbkBn
+b29nbGUuY29tMB0GA1UdDgQWBBQHSn0WJzIo0eMBMQUNsMqN6eF/7TANBgkqhkiG
+9w0BAQUFAAOCAQEAAs5dL7N9wzRJkI4Aq4lC5t8j5ZadqnqUcgYLADzSv4ExytNH
+UY2nH6iVTihC0UPSsILWraoeApdT7Rphz/8DLQEBRGdeKWAptNM3EbiXtQaZT2uB
+pidL8UoafX0kch3f71Y1scpBEjvu5ZZLnjg0A8AL0tnsereOVdDpU98bKqdbbrnM
+FRmBlSf7xdaNca6JJHeEpga4E9Ty683CmccrSGXdU2tTCuHEJww+iOAUtPIZcsum
+U7/eYeY1pMyGLyIjbNgRY7nDzRwvM/BsbL9eh4/mSQj/4nncqJd22sVQpCggQiVK
+baB2sVGcVNBkK55bT8gPqnx8JypubyUvayzZGg==
+-----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted1.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted1.pem
index 3945aea..7fc0a05 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted1.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted1.pem
@@ -2,18 +2,18 @@
 MIIDDzCCAnigAwIBAgIQBH7L6fylX3vQnq424QyuHjANBgkqhkiG9w0BAQUFADBf
 MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRgwFgYDVQQDEw9tYWlsLmdvb2dsZS5jb20w
-HhcNMTEwMzI0MTMwNjI1WhcNMTEwNDIzMTMwNjI1WjBfMQswCQYDVQQGEwJBVTET
+HhcNMTEwODMwMTAxOTI2WhcNMjEwODI3MTAxOTI2WjBfMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRgwFgYDVQQDEw9tYWlsLmdvb2dsZS5jb20wgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAOeAGV2FbGnT4rLjTvCNEEDjj0/iIUATa6RT8WKF2PVaOzbE
-oceiODx6hTStvBnCgs+h/d3eVKgp+uAyBde5sW/HlOwHrNgKF3ZDvxegzIOEHaVI
-ndNtBpFS3UyOEkO0NxfioBatNRYpeTRU/DVmazu3yvzgrV1V2mDsrNngVWxJAgMB
-AAGjgcswgcgwHQYDVR0OBBYEFHcF1eqRpm7B78aY8ZjseN6zSYbvMIGYBgNVHSME
-gZAwgY2AFHcF1eqRpm7B78aY8ZjseN6zSYbvoWOkYTBfMQswCQYDVQQGEwJBVTET
+BQADgY0AMIGJAoGBANOvJQGm9vyX8f61SP1XDp23sEDS2SAsDNIxdeONmFthfQRh
+EBlJMNDByegnImZPMN4tA2T2iKcvdkxyQhC9vnQ+HEqJxxu0EhOwO+UdsSII7Lns
+yQZVj2QAoTvC0+MFHPo+wl39JEe3ZytNwQZLjfZSLdS/j0cAyoTkFNconK0bAgMB
+AAGjgcswgcgwHQYDVR0OBBYEFGFxxhfk1fvT8zPfLKPE0YYp9HZEMIGYBgNVHSME
+gZAwgY2AFGFxxhfk1fvT8zPfLKPE0YYp9HZEoWOkYTBfMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRgwFgYDVQQDEw9tYWlsLmdvb2dsZS5jb22CEAR+y+n8pV970J6uNuEM
-rh4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBEb1iF+EbhAJli5Sj2
-+iEdJ5xMP8R6FtgqAYknqXD8+tyEyXxJXdN186qdAWuTD9N22AUqi61BPWxUkufW
-xH8FYMEHdFCkitvYE0321+GT5pJz6ON/d5Co+wusumt7T5oSjzj8Ax9V+nmo3Nkb
-dSANM4/Lnc6moijcpJZq+GC1ng==
+rh4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAldVSTJ4lNG9Qxx2GG
+/y/ccH/BBYkpPXBklKP/U528Zk48jypWsbnZ07rQrPIlSXYQHffdNH3JsEiF/el9
+bIu+6tGJzmjqvtl5fD5S+yBvI3ySx3Fz6lWmUlqT6UY1X8Oob2PsR6u6mfT8Q1da
+d02x97EUSiAzYvzxndqD6g8R1w==
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted2.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted2.pem
index 4b8d059..3c8489f 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted2.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted2.pem
@@ -2,18 +2,18 @@
 MIIDDjCCAnegAwIBAgIRAPXIavNhYvE6ZPVPbclYfAYwDQYJKoZIhvcNAQEFBQAw
 XjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGElu
 dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEXMBUGA1UEAxMOd3d3Lmdvb2dsZS5jb20w
-HhcNMTEwMzI0MTMwNzExWhcNMTEwNDIzMTMwNzExWjBeMQswCQYDVQQGEwJBVTET
+HhcNMTEwODMwMTAxOTUxWhcNMjEwODI3MTAxOTUxWjBeMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRcwFQYDVQQDEw53d3cuZ29vZ2xlLmNvbTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAy1fNDFl65Njfcd1EUJeaxvyiKln+JKlqUmk1x4mrE1BQoa0C
-QZaiXAF21rDhivWejZWBiEQ4IWbg3b12ANY74G1KqAfLC4BNKS9UP94hy18vezRA
-pFc+m/HAClwc8AdACpl8eZpQW8cMgdvnMBMZTrQkgV0JYykX+uDD9Tb+QNUCAwEA
-AaOByzCByDAdBgNVHQ4EFgQUSelG6IVRj2ZQbp049zkQ0X/Po9wwgZgGA1UdIwSB
-kDCBjYAUSelG6IVRj2ZQbp049zkQ0X/Po9yhYqRgMF4xCzAJBgNVBAYTAkFVMRMw
+AAOBjQAwgYkCgYEAriNo6jkVPi+gyynL2YiPBqDsBa4MuM4rQwM7vcHDRO9GizKi
+6gV7/loaqvr7zqKnHmoARP6OqxDMMEWfZ4QGJjToVKS6srE7dPJEh1lRzK+bsl02
+xGCP/RKJqnZcW1oUpFUceRBQ8TWynZ1L7cE/YUlOhqXnMO9aPibqbWj8AGcCAwEA
+AaOByzCByDAdBgNVHQ4EFgQUo/E6UVU6oRgxQF8yftx0/9dvzMgwgZgGA1UdIwSB
+kDCBjYAUo/E6UVU6oRgxQF8yftx0/9dvzMihYqRgMF4xCzAJBgNVBAYTAkFVMRMw
 EQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0
 eSBMdGQxFzAVBgNVBAMTDnd3dy5nb29nbGUuY29tghEA9chq82Fi8Tpk9U9tyVh8
-BjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBALQyDC/AMQMNj2fa6E8L
-umILCklWJwG1K1p/1bUAgm0CB8zm94n1xrh/ZK4+HS+k2a9OQmvLRbFyJn8Wua8p
-3UU0267UNkCanA1FKHuO3Mo18wLvjMLWjjCQ4g1C9IvJx6P+8EFDQFG+MJBV/w2k
-gJXXVl3q1T1dvahIgfav9QBL
+BjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAESHOPB9eAsTKkO4lY8d
+EKr2XrRqUkk5KqMFraAHWRekJFwl0R39Q6MDjRHr6NpPJkSKuBPppkr9nk6WDfpt
+TG+oN3Yb1rFmJv6eZw8ud9btoquc8jAtaQnihbjFPEP9cCLBw3Gz1C/JBjDw1tgK
+zXKNU+jMZYk7c5Z64DocggBH
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted3.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted3.pem
index e47ece6..fa458cc 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted3.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted3.pem
@@ -2,18 +2,18 @@
 MIIDETCCAnqgAwIBAgIRANdVj9r18RBbshMoK3B3KaMwDQYJKoZIhvcNAQEFBQAw
 XzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGElu
 dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEYMBYGA1UEAxMPbG9naW4ueWFob28uY29t
-MB4XDTExMDMyNDEzMDg0MloXDTExMDQyMzEzMDg0MlowXzELMAkGA1UEBhMCQVUx
+MB4XDTExMDgzMDEwMjAzNloXDTIxMDgyNzEwMjAzNlowXzELMAkGA1UEBhMCQVUx
 EzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMg
 UHR5IEx0ZDEYMBYGA1UEAxMPbG9naW4ueWFob28uY29tMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQCosFLKRvGtxjvdAjWdEAHYycFTa4VtdpXmCNhNHf2xbeLn
-xzde10KjEe44pQxNI+UUD1rJkyuH6wUfloyefn0D2Mu+MvusmvOEzFosa4EDbK9s
-BAAlsSiyJgrp/GgbEPq/XOl4XJRBIVP1WC6LllduNbskFCipDqS+HQwifXmmwQID
-AQABo4HMMIHJMB0GA1UdDgQWBBSEgWnsoYtd5GEx/MGJvKxuIuROJzCBmQYDVR0j
-BIGRMIGOgBSEgWnsoYtd5GEx/MGJvKxuIuROJ6FjpGEwXzELMAkGA1UEBhMCQVUx
+AQUAA4GNADCBiQKBgQC3TVwiPfNClgadKYuX50szBlIaVWDd+UFHsakbGk0bgqlu
+YKgC/cmbjgOyrmsEC2HbJISceTz9CK6mCewEgGFWuq6gjYi4UnSFk1o6h6WJV86A
+tLpeVti7lN9/04IW7XHyxuhvS71V+JWlqfu3zboyaVoMIlHDrPFtRiAh7vTTjQID
+AQABo4HMMIHJMB0GA1UdDgQWBBQrVExlI4rixsrub6IMDDsLPNB4ezCBmQYDVR0j
+BIGRMIGOgBQrVExlI4rixsrub6IMDDsLPNB4e6FjpGEwXzELMAkGA1UEBhMCQVUx
 EzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMg
 UHR5IEx0ZDEYMBYGA1UEAxMPbG9naW4ueWFob28uY29tghEA11WP2vXxEFuyEygr
-cHcpozAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKNpIrzTOxIykKZt
-EE6HU2nW1lrWUkIMjwjL8ntw7QI4JLMDN1ADVIxWaGTeQ+U/eXFou6dDNAYVAijK
-ONDXgOItxW2YvSw0wOZsZj6INX2x88/0yRH+19TqaL/r+Y1D1h/0zefkHgfXufnY
-Ex7BHju/rGBTp6R1mr+Tlh1tewva
+cHcpozAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFB5SF2ujZzH9KMj
+m4ZDTsyy94/YQZdwgLncKUYTxmZe4BdX+42j799pCG+UeQGwqz9hU/soPgibAvGT
+1KCEGQ6qtWSqKJYmC8VKenYvvEFIySj5cbSFmId5aNwhjl8AYoLuM0E+2FRVJQ6a
+pWyzYUIOqhsCkt9hEPsDVP4hIhP+
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted4.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted4.pem
index 64c7d41..53761bb 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted4.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted4.pem
@@ -2,18 +2,18 @@
 MIIDDzCCAnigAwIBAgIQOSpDTw4H3x+KowXeNODCKTANBgkqhkiG9w0BAQUFADBf
 MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRgwFgYDVQQDEw9sb2dpbi55YWhvby5jb20w
-HhcNMTEwMzI0MTMwOTE1WhcNMTEwNDIzMTMwOTE1WjBfMQswCQYDVQQGEwJBVTET
+HhcNMTEwODMwMTAyMTE5WhcNMjEwODI3MTAyMTE5WjBfMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRgwFgYDVQQDEw9sb2dpbi55YWhvby5jb20wgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBANO2gz9x2H92xz5OvZSEul9gHxqqd+kdjeoS2exyvjC9wzqb
-gYXqNmAsbtNp4WmieEQFd0riCAEkIAn8JpHTCsMHN4rHhS+W+4D5a/drI2jfnZEF
-orNYJG1PHSQV/rvh6d7wkVdT+0SYOjrFTAA2biGWaK3W9ztf2yX577w+uQtBAgMB
-AAGjgcswgcgwHQYDVR0OBBYEFJjDp8Prs7oReRmskIeFixp0vDkGMIGYBgNVHSME
-gZAwgY2AFJjDp8Prs7oReRmskIeFixp0vDkGoWOkYTBfMQswCQYDVQQGEwJBVTET
+BQADgY0AMIGJAoGBAML+Z5hpY4VfSeTPbMCGaqe5shwcw3yW/egYY6cXcfxtUkjs
+Eai48hP/sqtQeFwi3puJ7HO2iGUX72/UnO0t9qwEGtGOHS1qqAYdTcncY5pTpO9L
+e4Tn6CkPwFE4VNXVU96xPlUjP/KBZ43VH6gW3M1xDI0DmNh2QUXHN5ErQE8nAgMB
+AAGjgcswgcgwHQYDVR0OBBYEFI+gG6PT7vQtUVn2xf+wCYZV5Ht8MIGYBgNVHSME
+gZAwgY2AFI+gG6PT7vQtUVn2xf+wCYZV5Ht8oWOkYTBfMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRgwFgYDVQQDEw9sb2dpbi55YWhvby5jb22CEDkqQ08OB98fiqMF3jTg
-wikwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAZyo0Q3leeM1+lxeCd
-Wp0ZYHMSW11ANc6nuMWOmJC+nIQGlyGiP3IqeUvIfekwboV638bahVPwcl2HYWsS
-/l01Bgyd25Zn6VTQBfMK01dILyxscjVwdHuojzYBN05sl+qkVoqQr5EroQQbgDc9
-6I88p6Kjajv3IusCwfK6wlqISw==
+wikwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA3eZG/dOXrL7YBPCA8
+joDGfhra98T1iCpul4/L/L4dt/9+QVAu+agbZmHWLYzuAvuB1zj8go0BLIE7b4ap
+HPLFYXV3iAWjIRhNEix4FWohlds1B+IwpvWdsl3Op1pZfHQ0yq8wFGawdQTAKUII
+lLu1cd6E8B6pCfWwSr+9h6gnTg==
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted5.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted5.pem
index c7ddbf2..81211ee 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted5.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted5.pem
@@ -2,18 +2,18 @@
 MIIDDzCCAnigAwIBAgIQPnXO1GtpMCEhiDCuhqgqcTANBgkqhkiG9w0BAQUFADBf
 MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRgwFgYDVQQDEw9sb2dpbi55YWhvby5jb20w
-HhcNMTEwMzI0MTMwOTQ4WhcNMTEwNDIzMTMwOTQ4WjBfMQswCQYDVQQGEwJBVTET
+HhcNMTEwODMwMTAyMTQ4WhcNMjEwODI3MTAyMTQ4WjBfMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRgwFgYDVQQDEw9sb2dpbi55YWhvby5jb20wgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBALkiHG9TgTw/00CMW8D23NBDAa3331AL5kTkAaXbAWg2R/1o
-yKQfXq3hgHbyWGPccUT+tU6FmaBf3bIndLK7iGx81RGzGgXeoQ5mpgnJ50iCeW73
-G99VlVwutPia7d9qqui84YdcG9t+P2Fuxv+xRqAB6lKOaa4qTPIbH50PgwOvAgMB
-AAGjgcswgcgwHQYDVR0OBBYEFBWJrs8bnZ5fikfaLbTxK0ssj69MMIGYBgNVHSME
-gZAwgY2AFBWJrs8bnZ5fikfaLbTxK0ssj69MoWOkYTBfMQswCQYDVQQGEwJBVTET
+BQADgY0AMIGJAoGBAL5IeUbbQ7HxCBLQaOASV2HyI1tRwPm/7JNsRfh5ipM1sCWE
+xnPoqFznX6ZUKi8d61/EIycwUd+FvOp9zoRxDlngoRdhqMCTTG3JfxNf6ZXJPCYd
+qPjOKAkMwyG8bbhGCsoCws9b2rpN9536qVXc2QR39F9/ZE5t73oKtEd1fyNnAgMB
+AAGjgcswgcgwHQYDVR0OBBYEFNXCkfGdW3WYzBBqB2jWppl6sL99MIGYBgNVHSME
+gZAwgY2AFNXCkfGdW3WYzBBqB2jWppl6sL99oWOkYTBfMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRgwFgYDVQQDEw9sb2dpbi55YWhvby5jb22CED51ztRraTAhIYgwroao
-KnEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCIfqqs1a7RzdmV8U00
-v/xAsxscKvQvmu6BK+HwvY5iL2pSwXTYgRLJLoj5QGOd3mmgOFsyW3BPSCP1+fVE
-M1ROhU2u8wHub+hGGds18Fx6F4yZjdh8pNUoOUR9A0Ym+VDJr2p50oUNTTy0RbH8
-9ns/gbemx84cjF9DD2G5stQhYg==
+KnEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCOeih7N7fmkqECWZD/
+bYsFLtbKOwD4YMPIV2wayvaLg2dFwqhBkGml+5ulOh5KTiUh0/nnGmGAU/3K9nt5
+TCMjwMGHm/C5pp7THQriiY8Qw0QVtnFiJGnjblhAbJVIvBJJ42/Qq7T4IzEwqShW
+hO2g1M0MUGiOw4vyXJRGc4dg2w==
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted6.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted6.pem
index bc2be2a..4264a67 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted6.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted6.pem
@@ -2,18 +2,18 @@
 MIIDETCCAnqgAwIBAgIRAOkCi5V45BXcGnEKK4gVREcwDQYJKoZIhvcNAQEFBQAw
 XzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGElu
 dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEYMBYGA1UEAxMPbG9naW4uc2t5cGUuY29t
-MB4XDTExMDMyNDEzMTAxNloXDTExMDQyMzEzMTAxNlowXzELMAkGA1UEBhMCQVUx
+MB4XDTExMDgzMDEwMjIxOFoXDTIxMDgyNzEwMjIxOFowXzELMAkGA1UEBhMCQVUx
 EzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMg
 UHR5IEx0ZDEYMBYGA1UEAxMPbG9naW4uc2t5cGUuY29tMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDFq06qqRl86pP7GRX3m7FMMSaSU6zlNGAo+WPoRfYAzB6x
-5KpvlfxMCo3T/nWtInX3Bw9TBWCZSweQ2GEjggO0irjw5UX3MiToLxK+rwzWztm9
-H3LBxTWR0cOOa78kRFvNQ1onvNHbs8fJzXjG7b2IJDOIwG1HAT1LK80oPXZc1wID
-AQABo4HMMIHJMB0GA1UdDgQWBBTiGNxw0ImW/wfW0mD3eA65PY5CAzCBmQYDVR0j
-BIGRMIGOgBTiGNxw0ImW/wfW0mD3eA65PY5CA6FjpGEwXzELMAkGA1UEBhMCQVUx
+AQUAA4GNADCBiQKBgQDAAkuUFRdz1bm95jFsyQRb4PBrly4pJK4f5pSZy99eY8FM
+iZbr7brnkiheN4qeJfS1dv/B/B4kAVoGD2Y0KmpZ5ZZYmm3TxopoP0Yeg6juWNKa
+iFlfKQIvk0GEmD8oGfEqW1+72p040jAuTn+OQx+7VpydqB/RJoY8qK3zEXbB7wID
+AQABo4HMMIHJMB0GA1UdDgQWBBSE9drle8VwSlwYIX5mKaIEvQYX/zCBmQYDVR0j
+BIGRMIGOgBSE9drle8VwSlwYIX5mKaIEvQYX/6FjpGEwXzELMAkGA1UEBhMCQVUx
 EzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMg
 UHR5IEx0ZDEYMBYGA1UEAxMPbG9naW4uc2t5cGUuY29tghEA6QKLlXjkFdwacQor
-iBVERzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAHdb1QY/oxuro/4x
-GX9jbm930ysoeXkWZSKVtVxoxrPIferu8jVpb1SLRjGcMnmjJoNWNFpvnbZgoYei
-f3wdSWun7ndyQBh61k8eM7UABDOUXUHOsHuHj7s1koMKtet4gykmMfd6VxBkwBvN
-ZXOll4X+TKe8nrxbnGUByIwQaRM+
+iBVERzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBACm4/Q6e001Fg9uu
+ieqHOAxfBafkOsXtgKqTFFdpt9Hbmo9j/BfvrtvfFN5Ph4fV46useGjW79P1IeNK
++KqcaqOKy2q6j1em4j8C5Mx6S4ksZJC25jIPEM7cdxiDGcV505X5mynlu1+WkZAf
+nQhnJpA8o3p462ON4S+GXTfOLfoN
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted7.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted7.pem
index 19d4353..03ab7d4 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted7.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted7.pem
@@ -2,18 +2,18 @@
 MIIDGjCCAoOgAwIBAgIRAJI51TSPQNFpWnRUcOHyP0MwDQYJKoZIhvcNAQEFBQAw
 YjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGElu
 dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEbMBkGA1UEAxMSYWRkb25zLm1vemlsbGEu
-b3JnMB4XDTExMDMyNDEzMTA0NFoXDTExMDQyMzEzMTA0NFowYjELMAkGA1UEBhMC
+b3JnMB4XDTExMDgzMDEwMjIzOVoXDTIxMDgyNzEwMjIzOVowYjELMAkGA1UEBhMC
 QVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdp
 dHMgUHR5IEx0ZDEbMBkGA1UEAxMSYWRkb25zLm1vemlsbGEub3JnMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQC1lsoAcZTwF8Pf0E9do5avLdobB/O7EhhrCMs2
-/EMO07aIlrLwl3UP/Fmu/cAkKuX8Mx+Eif9x+XT3ZqGKGYKiqPTJcNfeZvgwbn0j
-wXDtEo4DuURrwtBU9okS+v4dF6F4RtHQKAGcsXoOjhR7ah71kve+PG2GG0sJ167V
-klK1xwIDAQABo4HPMIHMMB0GA1UdDgQWBBRgGDJ4Qp0WFyLIzm4Nz5wgqDSSxjCB
-nAYDVR0jBIGUMIGRgBRgGDJ4Qp0WFyLIzm4Nz5wgqDSSxqFmpGQwYjELMAkGA1UE
+SIb3DQEBAQUAA4GNADCBiQKBgQC9Yo3DJvs+vewelK5qoK+0Xn4zeRIQ/wJCrQBg
+5tNXja+NZsHb0/enlwAZ3dAwCfI0G12mTowgSuZyDX7oN2+G+k6Q5LPnGhj1E5s5
+OJ+ZYsAjTdU0SCAPquva55+jyhqo5w/B5Il7w84mppUrAZgqEGhYkhXeDOULe1Vm
+4iLMQwIDAQABo4HPMIHMMB0GA1UdDgQWBBSb8lAIgOnUitVOuZIx3s+5MN1sBzCB
+nAYDVR0jBIGUMIGRgBSb8lAIgOnUitVOuZIx3s+5MN1sB6FmpGQwYjELMAkGA1UE
 BhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdp
 ZGdpdHMgUHR5IEx0ZDEbMBkGA1UEAxMSYWRkb25zLm1vemlsbGEub3JnghEAkjnV
-NI9A0WladFRw4fI/QzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBACeE
-DHMQ+LWEuoa/6z2EgrgM1k9rvBbUtCR+rjTuyzVW4OLXdpiVwZPOAiKphpq7q8Sb
-TQ3zwsCoPLLJk5VolwcPfcD8Y2/tYK3NCYl+HzGxxnzPDFVaZM5Jh8RI861Hc00D
-hVoQaptPK/V/lr0KEevqjhusAdFZbwlWA923zASa
+NI9A0WladFRw4fI/QzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFpg
+tcp6ynOZ/hwr2axTYK+4rtXmTUJdsg7NUHhXSwGANAuYuc7PYwqtmz3B2W90t3TA
+D3pNMRBEXrBXufC0p9vu/hQgb+mdQ7DG6j1Gkkpq4Sq/Puv1bO96KpAufmevnWWB
+48kzCgAdfk/N04k7kdPHCp5MjjgmY3kGdsg+jroj
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted8.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted8.pem
index aedf3f7..acef06f 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted8.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted8.pem
@@ -2,18 +2,18 @@
 MIIDDjCCAnegAwIBAgIRALC3Ez7Qlvm1b66RyHS9OsAwDQYJKoZIhvcNAQEFBQAw
 XjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGElu
 dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEXMBUGA1UEAxMObG9naW4ubGl2ZS5jb20w
-HhcNMTEwMzI0MTMxMTA2WhcNMTEwNDIzMTMxMTA2WjBeMQswCQYDVQQGEwJBVTET
+HhcNMTEwODMwMTAyMzA0WhcNMjEwODI3MTAyMzA0WjBeMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRcwFQYDVQQDEw5sb2dpbi5saXZlLmNvbTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEA3OVNj9ijzMewvDeZYzgCWoKtyjclyIHxrQfHZpcexaKbxUap
-1MtF6L0ayjtRWpiBYuPteUSy/Ja4Oh6zZz8K6z5rVgXhmy3xPIYuOoWaTKEOhb0Z
-oHTBtGh8aWWai1XWw37HIm2FP8cmfgdH4lZwVvpTZIUxYidsyqyjB9IrhiMCAwEA
-AaOByzCByDAdBgNVHQ4EFgQU4CcQcIvEhJC0tqHlNFMkv6MlDN4wgZgGA1UdIwSB
-kDCBjYAU4CcQcIvEhJC0tqHlNFMkv6MlDN6hYqRgMF4xCzAJBgNVBAYTAkFVMRMw
+AAOBjQAwgYkCgYEA5JK77+1zFatj8xeItZaDW5XaU+ssc5jq2Ww4ANaxJi+wdRVU
+qVLauEJPKEXC51fuYHa7U8yoSTgJZA7JL07cdSxgsVj8RR4Uf5k4Jf5Vdz5w8+TT
+W33I3zurA2xB+wfup2VPmS8Alg07w6POrzlQYgtcUcELZhjcdypk96NOdPECAwEA
+AaOByzCByDAdBgNVHQ4EFgQUTWM20msyZUcNEYOyNbgevBPIoF8wgZgGA1UdIwSB
+kDCBjYAUTWM20msyZUcNEYOyNbgevBPIoF+hYqRgMF4xCzAJBgNVBAYTAkFVMRMw
 EQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0
 eSBMdGQxFzAVBgNVBAMTDmxvZ2luLmxpdmUuY29tghEAsLcTPtCW+bVvrpHIdL06
-wDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAMNzIStXDNSNQ8ayxrcj
-4RrUMsHWUG/6XPrgfYqCP5TfPGAa5qBfNb9LfUbiS4b0flJVN1RlHVwwRo0yf9v4
-LGg0dSuPQAOWlLeUR1GminO1jHZw7E4dYfR7QEmiiOgaQU+CbxLsf5vCaKInN9Gu
-jv/5xytVCbMoLoZ4EBVb0tka
+wDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBACQqnu1KywflnNiqIU01
+95z/qjmZTvSWafM/HLOFUg8ls7g32l5gCCrsc8ypiCff+S3+9teYQOII7oW3hzw4
+BH10m0LTRxGig5U9XVkH4076SALkPoky1z+onMmLk7AE96kSJ+rq30VvcSSl9BaW
+DwcQGIhCZANgZrNW9AJ+cweQ
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted9.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted9.pem
index d179b29..cc99b08 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted9.pem
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted9.pem
@@ -2,18 +2,18 @@
 MIIDDjCCAnegAwIBAgIRANjzX063hystqwaS4xU4L7AwDQYJKoZIhvcNAQEFBQAw
 XjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGElu
 dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEXMBUGA1UEAxMOZ2xvYmFsIHRydXN0ZWUw
-HhcNMTEwMzI0MTMxMTM3WhcNMTEwNDIzMTMxMTM3WjBeMQswCQYDVQQGEwJBVTET
+HhcNMTEwODMwMTAyMzI1WhcNMjEwODI3MTAyMzI1WjBeMQswCQYDVQQGEwJBVTET
 MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ
 dHkgTHRkMRcwFQYDVQQDEw5nbG9iYWwgdHJ1c3RlZTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEArHCVym7AEZDBhDkrUSG3Q94a+caNcCk5fE6ltZHiZHv096xr
-cixHYvSGvms780bkI+oot2xI/e9awwkV+7VjWNvr0HrajzBWeimwk+myjP+3ddMY
-Kmr0eI6bmvmPHtOFJE5Ar8/62FwD0wlLogRIx56JtXcCpkiUQktJVPz2gtMCAwEA
-AaOByzCByDAdBgNVHQ4EFgQUUJwC/qSGBmcB+DVrd43ovRLdLmQwgZgGA1UdIwSB
-kDCBjYAUUJwC/qSGBmcB+DVrd43ovRLdLmShYqRgMF4xCzAJBgNVBAYTAkFVMRMw
+AAOBjQAwgYkCgYEAw0CpZXrd6oI8/PHo8/bnNwB7UA7OKsRFuqKljr9F5lCJAVkT
+zRDlXuTDeXGfQiYhJTF7GRunPRJ7O5SsflwoxktH/F91yFpgxY5DqRZ1ZHdZgW3b
+W0uweBxJv9684ihXY4YR3Yznf0js7YAgVd8a3qhOUODiC/Beb8tmDBNL2c0CAwEA
+AaOByzCByDAdBgNVHQ4EFgQU/rUvQ2rG7pg2muUiLm6V93ZgmGcwgZgGA1UdIwSB
+kDCBjYAU/rUvQ2rG7pg2muUiLm6V93ZgmGehYqRgMF4xCzAJBgNVBAYTAkFVMRMw
 EQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0
 eSBMdGQxFzAVBgNVBAMTDmdsb2JhbCB0cnVzdGVlghEA2PNfTreHKy2rBpLjFTgv
-sDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBACAYxI+r3+JNelL6SBB0
-Pda3LkbCm+schP64NBYDdGl2Kus2b2QZ83T7xENBFEhyNoXvc6pRI4/Oh6JDxmG1
-7WmqOVStS/4JeAu6ygiyI1ImRKq2/MvJx/kaKh6IiXanB5nW1U+fhDV6kMOEfpwV
-i6FBibpHboPQoqzPPRe7qHSL
+sDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBALvmmUx47DcUAIsPkI0Y
+DTvcXV6k2JHwdrdlPsrn9A5TLppfxPNrDMiweitr8cMkKEtkm6LRTt2yvDFcMIwy
+/+F5+XO0k9sKde6xHfWvOvndIycj3Lt4tIRW8jUauJENyMa4M57qpqkgkJEmflkI
+/pb9fQZbfg70o9wvbNK0RONo
 -----END CERTIFICATE-----
diff --git a/tests/benchmarks/corelib/tools/qlist/main.cpp b/tests/benchmarks/corelib/tools/qlist/main.cpp
new file mode 100644
index 0000000..22aaf49
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qlist/main.cpp
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QList>
+#include <QTest>
+
+static const int N = 1000;
+
+struct MyBase
+{
+    MyBase(int i_)
+        : isCopy(false)
+    {
+        ++liveCount;
+
+        i = i_;
+    }
+
+    MyBase(const MyBase &other)
+        : isCopy(true)
+    {
+        if (isCopy)
+            ++copyCount;
+        ++liveCount;
+
+        i = other.i;
+    }
+
+    MyBase &operator=(const MyBase &other)
+    {
+        if (!isCopy) {
+            isCopy = true;
+            ++copyCount;
+        } else {
+            ++errorCount;
+        }
+
+        i = other.i;
+        return *this;
+    }
+
+    ~MyBase()
+    {
+        if (isCopy) {
+            if (!copyCount)
+                ++errorCount;
+            else
+                --copyCount;
+        }
+        if (!liveCount)
+            ++errorCount;
+        else
+            --liveCount;
+    }
+
+    bool operator==(const MyBase &other) const
+    { return i == other.i; }
+
+protected:
+    ushort i;
+    bool isCopy;
+
+public:
+    static int errorCount;
+    static int liveCount;
+    static int copyCount;
+};
+
+int MyBase::errorCount = 0;
+int MyBase::liveCount = 0;
+int MyBase::copyCount = 0;
+
+struct MyPrimitive : public MyBase
+{
+    MyPrimitive(int i = -1) : MyBase(i)
+    { ++errorCount; }
+    MyPrimitive(const MyPrimitive &other) : MyBase(other)
+    { ++errorCount; }
+    ~MyPrimitive()
+    { ++errorCount; }
+};
+
+struct MyMovable : public MyBase
+{
+    MyMovable(int i = -1) : MyBase(i) {}
+};
+
+struct MyComplex : public MyBase
+{
+    MyComplex(int i = -1) : MyBase(i) {}
+};
+
+QT_BEGIN_NAMESPACE
+
+Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(MyComplex, Q_COMPLEX_TYPE);
+
+QT_END_NAMESPACE
+
+
+class tst_QList: public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void removeAll_primitive_data();
+    void removeAll_primitive();
+    void removeAll_movable_data();
+    void removeAll_movable();
+    void removeAll_complex_data();
+    void removeAll_complex();
+};
+
+template <class T>
+void removeAll_test(const QList<int> &i10, ushort valueToRemove, int itemsToRemove)
+{
+    bool isComplex = QTypeInfo<T>::isComplex;
+
+    MyBase::errorCount = 0;
+    MyBase::liveCount = 0;
+    MyBase::copyCount = 0;
+    {
+        QList<T> list;
+        QCOMPARE(MyBase::liveCount, 0);
+        QCOMPARE(MyBase::copyCount, 0);
+
+        for (int i = 0; i < 10 * N; ++i) {
+            T t(i10.at(i % 10));
+            list.append(t);
+        }
+        QCOMPARE(MyBase::liveCount, isComplex ? list.size() : 0);
+        QCOMPARE(MyBase::copyCount, isComplex ? list.size() : 0);
+
+        T t(valueToRemove);
+        QCOMPARE(MyBase::liveCount, isComplex ? list.size() + 1 : 1);
+        QCOMPARE(MyBase::copyCount, isComplex ? list.size() : 0);
+
+        int removedCount;
+        QList<T> l;
+
+        QBENCHMARK {
+            l = list;
+            removedCount = l.removeAll(t);
+        }
+        QCOMPARE(removedCount, itemsToRemove * N);
+        QCOMPARE(l.size() + removedCount, list.size());
+        QVERIFY(!l.contains(valueToRemove));
+
+        QCOMPARE(MyBase::liveCount, isComplex ? l.isDetached() ? list.size() + l.size() + 1 : list.size() + 1 : 1);
+        QCOMPARE(MyBase::copyCount, isComplex ? l.isDetached() ? list.size() + l.size() : list.size() : 0);
+    }
+    if (isComplex)
+        QCOMPARE(MyBase::errorCount, 0);
+}
+
+Q_DECLARE_METATYPE(QList<int>);
+
+void tst_QList::removeAll_primitive_data()
+{
+    qRegisterMetaType<QList<int> >();
+
+    QTest::addColumn<QList<int> >("i10");
+    QTest::addColumn<int>("valueToRemove");
+    QTest::addColumn<int>("itemsToRemove");
+
+    QTest::newRow("0%")   << (QList<int>() << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0) << 5 << 0;
+    QTest::newRow("10%")  << (QList<int>() << 0 << 0 << 0 << 0 << 5 << 0 << 0 << 0 << 0 << 0) << 5 << 1;
+    QTest::newRow("90%")  << (QList<int>() << 5 << 5 << 5 << 5 << 0 << 5 << 5 << 5 << 5 << 5) << 5 << 9;
+    QTest::newRow("100%") << (QList<int>() << 5 << 5 << 5 << 5 << 5 << 5 << 5 << 5 << 5 << 5) << 5 << 10;
+}
+
+void tst_QList::removeAll_primitive()
+{
+    QFETCH(QList<int>, i10);
+    QFETCH(int, valueToRemove);
+    QFETCH(int, itemsToRemove);
+
+    removeAll_test<MyPrimitive>(i10, valueToRemove, itemsToRemove);
+}
+
+void tst_QList::removeAll_movable_data()
+{
+    removeAll_primitive_data();
+}
+
+void tst_QList::removeAll_movable()
+{
+    QFETCH(QList<int>, i10);
+    QFETCH(int, valueToRemove);
+    QFETCH(int, itemsToRemove);
+
+    removeAll_test<MyMovable>(i10, valueToRemove, itemsToRemove);
+}
+
+void tst_QList::removeAll_complex_data()
+{
+    removeAll_primitive_data();
+}
+
+void tst_QList::removeAll_complex()
+{
+    QFETCH(QList<int>, i10);
+    QFETCH(int, valueToRemove);
+    QFETCH(int, itemsToRemove);
+
+    removeAll_test<MyComplex>(i10, valueToRemove, itemsToRemove);
+}
+
+QTEST_APPLESS_MAIN(tst_QList)
+
+#include "main.moc"
diff --git a/tests/benchmarks/corelib/tools/qlist/qlist.pro b/tests/benchmarks/corelib/tools/qlist/qlist.pro
new file mode 100644
index 0000000..902e72e
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qlist/qlist.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+TARGET = tst_qlist
+QT = core
+
+SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/tools/tools.pro b/tests/benchmarks/corelib/tools/tools.pro
index 681a6c6..44e8973 100644
--- a/tests/benchmarks/corelib/tools/tools.pro
+++ b/tests/benchmarks/corelib/tools/tools.pro
@@ -3,6 +3,7 @@ SUBDIRS = \
         containers-associative \
         containers-sequential \
         qbytearray \
+        qlist \
         qrect \
         qregexp \
         qstring \
diff --git a/tools/designer/src/plugins/plugins.pro b/tools/designer/src/plugins/plugins.pro
index bcebb82..64763a9 100644
--- a/tools/designer/src/plugins/plugins.pro
+++ b/tools/designer/src/plugins/plugins.pro
@@ -3,7 +3,7 @@ CONFIG += ordered
 
 REQUIRES = !CONFIG(static,shared|static)
 contains(QT_CONFIG, qt3support): SUBDIRS += widgets
-win32: SUBDIRS += activeqt
+win32:!win32-g++*: SUBDIRS += activeqt
 # contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
 contains(QT_CONFIG, webkit): SUBDIRS += qwebview
 contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index 0fc30bc..75d6094 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -483,10 +483,10 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner,
                                         "",
                                         "public function",
                                         "public functions");
-            FastSection publicSignals(classe, "Signals", "", "signal", "signal");
-            FastSection publicSlots(classe, "Public Slots", "", "public slot", "public slots");
-            FastSection publicTypes(classe, "Public Types", "", "public type", "public types");
-            FastSection publicVariables(classe,
+	    FastSection publicSignals(classe, "Signals", "", "signal", "signals");
+	    FastSection publicSlots(classe, "Public Slots", "", "public slot", "public slots");
+	    FastSection publicTypes(classe, "Public Types", "", "public type", "public types");
+	    FastSection publicVariables(classe,
                                         "Public Variables",
                                         "",
                                         "public variable",
@@ -878,28 +878,6 @@ static const char * const keywordTable[] = {
     "signals", "slots", "emit", 0
 };
 
-#if 0
-static QString untabified(const QString &in)
-{
-    QString res;
-    int col = 0;
-    int i = 0;
-
-    for (; i < (int) in.length(); i++) {
-	if (in[i] == QChar('\t')) {
-	    res += QString("        " + (col & 0x7));
-	    col = (col + 8) & ~0x7;
-	} else {
-	    res += in[i];
-	    if (in[i] == QChar('\n'))
-		col = 0;
-	}
-    }
-
-    return res;
-}
-#endif
-
 /*
     @char
     @class
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index b1d94e2..589ff60 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -1724,39 +1724,6 @@ bool QmlPropertyNode::fromTrool(Trool troolean, bool defaultValue)
     }
 }
 
-#if 0
-static QString valueType(const QString &n)
-{
-    if (n == "QPoint")
-        return "QDeclarativePointValueType";
-    if (n == "QPointF")
-        return "QDeclarativePointFValueType";
-    if (n == "QSize")
-        return "QDeclarativeSizeValueType";
-    if (n == "QSizeF")
-        return "QDeclarativeSizeFValueType";
-    if (n == "QRect")
-        return "QDeclarativeRectValueType";
-    if (n == "QRectF")
-        return "QDeclarativeRectFValueType";
-    if (n == "QVector2D")
-        return "QDeclarativeVector2DValueType";
-    if (n == "QVector3D")
-        return "QDeclarativeVector3DValueType";
-    if (n == "QVector4D")
-        return "QDeclarativeVector4DValueType";
-    if (n == "QQuaternion")
-        return "QDeclarativeQuaternionValueType";
-    if (n == "QMatrix4x4")
-        return "QDeclarativeMatrix4x4ValueType";
-    if (n == "QEasingCurve")
-        return "QDeclarativeEasingValueType";
-    if (n == "QFont")
-        return "QDeclarativeFontValueType";
-    return QString();
-}
-#endif
-
 /*!
   Returns true if a QML property or attached property is
   read-only. The algorithm for figuring this out is long
diff --git a/tools/tools.pro b/tools/tools.pro
index 7eecebd..b23df4b 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -21,7 +21,7 @@ TEMPLATE        = subdirs
             }
         }
         unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
-        win32:!wince*:SUBDIRS += activeqt
+        win32:!wince*:!win32-g++*:SUBDIRS += activeqt
     }
     contains(QT_CONFIG, declarative) {
         SUBDIRS += qml
diff --git a/translations/assistant_ja.ts b/translations/assistant_ja.ts
index 5c990de..0ebfec8 100644
--- a/translations/assistant_ja.ts
+++ b/translations/assistant_ja.ts
@@ -76,10 +76,6 @@ Reason:
         <translation>コレクションファイル &apos;%1&apos; の作成中にエラーが発生しました: %2。</translation>
     </message>
     <message>
-        <source>Error reading collection file &apos;%1&apos;: %2</source>
-        <translation type="obsolete">コレクションファイル &apos;%1&apos; の読み込み中にエラーが発生しました: %2</translation>
-    </message>
-    <message>
         <source>Cannot load sqlite database driver!</source>
         <translation>SQLite データベース ドライバーをロードできません!</translation>
     </message>
@@ -87,10 +83,6 @@ Reason:
 <context>
     <name>BookmarkDialog</name>
     <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">ブックマーク</translation>
-    </message>
-    <message>
         <source>Add Bookmark</source>
         <translation>ブックマークの追加</translation>
     </message>
@@ -111,10 +103,6 @@ Reason:
         <translation>新しいフォルダ</translation>
     </message>
     <message>
-        <source>Delete Folder</source>
-        <translation type="obsolete">フォルダを削除</translation>
-    </message>
-    <message>
         <source>Rename Folder</source>
         <translation>フォルダの名前変更</translation>
     </message>
@@ -133,10 +121,6 @@ Reason:
 <context>
     <name>BookmarkManager</name>
     <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">ブックマーク</translation>
-    </message>
-    <message>
         <source>Untitled</source>
         <translation>タイトルなし</translation>
     </message>
@@ -184,10 +168,6 @@ Reason:
         <source>Rename Bookmark</source>
         <translation>ブックマークの名前変更</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation type="obsolete">新しいフォルダ</translation>
-    </message>
 </context>
 <context>
     <name>BookmarkManagerWidget</name>
@@ -279,6 +259,10 @@ Reason:
         <translation>アドレス</translation>
     </message>
     <message>
+        <source>Toolbar Menu</source>
+        <translation>ツールバーメニュー</translation>
+    </message>
+    <message>
         <source>Bookmarks Menu</source>
         <translation>ブックマークメニュー</translation>
     </message>
@@ -294,30 +278,6 @@ Reason:
         <translation>削除</translation>
     </message>
     <message>
-        <source>Delete Folder</source>
-        <translation type="obsolete">フォルダを削除</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation type="obsolete">フォルダの名前変更</translation>
-    </message>
-    <message>
-        <source>Show Bookmark</source>
-        <translation type="obsolete">ブックマークを開く</translation>
-    </message>
-    <message>
-        <source>Show Bookmark in New Tab</source>
-        <translation type="obsolete">ブックマークを新しいタブで開く</translation>
-    </message>
-    <message>
-        <source>Delete Bookmark</source>
-        <translation type="obsolete">ブックマークを削除</translation>
-    </message>
-    <message>
-        <source>Rename Bookmark</source>
-        <translation type="obsolete">ブックマークの名前変更</translation>
-    </message>
-    <message>
         <source>Add</source>
         <translation>追加</translation>
     </message>
@@ -329,41 +289,9 @@ Reason:
 <context>
     <name>CentralWidget</name>
     <message>
-        <source>Add new page</source>
-        <translation>新しいページの追加</translation>
-    </message>
-    <message>
-        <source>Close current page</source>
-        <translation>現在のページを閉じる</translation>
-    </message>
-    <message>
         <source>Print Document</source>
         <translation>ドキュメントを印刷</translation>
     </message>
-    <message>
-        <source>unknown</source>
-        <translation>不明</translation>
-    </message>
-    <message>
-        <source>Add New Page</source>
-        <translation>新しいページの追加</translation>
-    </message>
-    <message>
-        <source>Close This Page</source>
-        <translation>このページを閉じる</translation>
-    </message>
-    <message>
-        <source>Close Other Pages</source>
-        <translation>他のページを閉じる</translation>
-    </message>
-    <message>
-        <source>Add Bookmark for this Page...</source>
-        <translation>このページをブックマークに追加...</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>検索</translation>
-    </message>
 </context>
 <context>
     <name>CmdLineParser</name>
@@ -617,10 +545,6 @@ Reason:
         <translation>大文字/小文字を区別する</translation>
     </message>
     <message>
-        <source>Whole words</source>
-        <translation type="obsolete">単語単位で検索する</translation>
-    </message>
-    <message>
         <source>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
         <translation>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;見つからなければ先頭から検索する</translation>
     </message>
@@ -699,6 +623,49 @@ Reason:
     </message>
 </context>
 <context>
+    <name>GlobalActions</name>
+    <message>
+        <source>&amp;Back</source>
+        <translation>戻る(&amp;B)</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>進む(&amp;F)</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>ホーム(&amp;H)</translation>
+    </message>
+    <message>
+        <source>ALT+Home</source>
+        <translation>ALT+Home</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;in</source>
+        <translation>拡大(&amp;I)</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;out</source>
+        <translation>縮小(&amp;O)</translation>
+    </message>
+    <message>
+        <source>&amp;Copy selected Text</source>
+        <translation>選択中の文字をコピー(&amp;C)</translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation>印刷(&amp;P)...</translation>
+    </message>
+    <message>
+        <source>&amp;Find in Text...</source>
+        <translation>検索(&amp;F)...</translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation>検索(&amp;F)</translation>
+    </message>
+</context>
+<context>
     <name>HelpEngineWrapper</name>
     <message>
         <source>Unfiltered</source>
@@ -715,14 +682,6 @@ Reason:
 <context>
     <name>HelpViewer</name>
     <message>
-        <source>Help</source>
-        <translation type="obsolete">ヘルプ</translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="obsolete">OK</translation>
-    </message>
-    <message>
         <source>&lt;title&gt;about:blank&lt;/title&gt;</source>
         <translation>&lt;title&gt;about:blank&lt;/title&gt;</translation>
     </message>
@@ -731,22 +690,28 @@ Reason:
         <translation>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;ページが見つかりませんでした&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
     </message>
     <message>
+        <source>Open Link</source>
+        <translation>リンクを開く</translation>
+    </message>
+    <message>
         <source>Copy &amp;Link Location</source>
         <translation>リンクのURLをコピー(&amp;L)</translation>
     </message>
     <message>
-        <source>Open Link in New Tab	Ctrl+LMB</source>
-        <translation>リンクを新しいタブで開く	Ctrl+LMB</translation>
+        <source>Copy</source>
+        <translation>コピー</translation>
     </message>
     <message>
-        <source>Open Link in New Tab</source>
-        <translation>リンクを新しいタブで開く</translation>
+        <source>Reload</source>
+        <translation>リロード</translation>
     </message>
     <message>
-        <source>Unable to launch external application.
-</source>
-        <translation type="obsolete">外部アプリケーションを起動できません。
-</translation>
+        <source>Open Link in New Tab	Ctrl+LMB</source>
+        <translation>リンクを新しいタブで開く	Ctrl+LMB</translation>
+    </message>
+    <message>
+        <source>Open Link in New Page</source>
+        <translation>リンクを新しいページで開く</translation>
     </message>
 </context>
 <context>
@@ -945,10 +910,6 @@ Reason:
         <translation>Qt Assistant</translation>
     </message>
     <message>
-        <source>Unfiltered</source>
-        <translation type="obsolete">フィルタなし</translation>
-    </message>
-    <message>
         <source>Page Set&amp;up...</source>
         <translation>ページ設定(&amp;U)...</translation>
     </message>
@@ -957,10 +918,6 @@ Reason:
         <translation>印刷プレビュー...</translation>
     </message>
     <message>
-        <source>&amp;Print...</source>
-        <translation>印刷(&amp;P)...</translation>
-    </message>
-    <message>
         <source>New &amp;Tab</source>
         <translation>新しいタブ(&amp;T)</translation>
     </message>
@@ -977,18 +934,6 @@ Reason:
         <translation>CTRL+Q</translation>
     </message>
     <message>
-        <source>&amp;Copy selected Text</source>
-        <translation>選択中の文字をコピー(&amp;C)</translation>
-    </message>
-    <message>
-        <source>&amp;Find in Text...</source>
-        <translation>検索(&amp;F)...</translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation>検索(&amp;F)</translation>
-    </message>
-    <message>
         <source>Find &amp;Next</source>
         <translation>次を検索(&amp;N)</translation>
     </message>
@@ -1001,14 +946,6 @@ Reason:
         <translation>設定...</translation>
     </message>
     <message>
-        <source>Zoom &amp;in</source>
-        <translation>拡大(&amp;I)</translation>
-    </message>
-    <message>
-        <source>Zoom &amp;out</source>
-        <translation>縮小(&amp;O)</translation>
-    </message>
-    <message>
         <source>Normal &amp;Size</source>
         <translation>普通の大きさ(&amp;S)</translation>
     </message>
@@ -1029,10 +966,6 @@ Reason:
         <translation>ALT+S</translation>
     </message>
     <message>
-        <source>&amp;Home</source>
-        <translation>ホーム(&amp;H)</translation>
-    </message>
-    <message>
         <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</source>
         <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;バージョン %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</translation>
     </message>
@@ -1041,18 +974,6 @@ Reason:
         <translation>ファイル &apos;%1&apos; を登録できませんでした: %2</translation>
     </message>
     <message>
-        <source>Ctrl+Home</source>
-        <translation type="obsolete">Ctrl+Home</translation>
-    </message>
-    <message>
-        <source>&amp;Back</source>
-        <translation>戻る(&amp;B)</translation>
-    </message>
-    <message>
-        <source>&amp;Forward</source>
-        <translation>進む(&amp;F)</translation>
-    </message>
-    <message>
         <source>Sync with Table of Contents</source>
         <translation>内容と目次を同期する</translation>
     </message>
@@ -1073,10 +994,6 @@ Reason:
         <translation>Ctrl+Alt+Left</translation>
     </message>
     <message>
-        <source>Add Bookmark...</source>
-        <translation type="obsolete">ブックマークの追加...</translation>
-    </message>
-    <message>
         <source>About...</source>
         <translation>Qt Assistant について...</translation>
     </message>
@@ -1137,10 +1054,22 @@ Reason:
         <translation>ズーム</translation>
     </message>
     <message>
+        <source>Open Pages</source>
+        <translation>ページを開く</translation>
+    </message>
+    <message>
+        <source>Bookmark Toolbar</source>
+        <translation>ブックマークツールバー</translation>
+    </message>
+    <message>
         <source>&amp;File</source>
         <translation>ファイル(&amp;F)</translation>
     </message>
     <message>
+        <source>E&amp;xit</source>
+        <translation>終了(&amp;X)</translation>
+    </message>
+    <message>
         <source>&amp;Edit</source>
         <translation>編集(&amp;E)</translation>
     </message>
@@ -1149,12 +1078,12 @@ Reason:
         <translation>表示(&amp;V)</translation>
     </message>
     <message>
-        <source>&amp;Go</source>
-        <translation>ジャンプ(&amp;G)</translation>
+        <source>ALT+P</source>
+        <translation>ALT+P</translation>
     </message>
     <message>
-        <source>ALT+Home</source>
-        <translation>ALT+Home</translation>
+        <source>&amp;Go</source>
+        <translation>ジャンプ(&amp;G)</translation>
     </message>
     <message>
         <source>Sync</source>
@@ -1172,9 +1101,16 @@ Reason:
         <source>ALT+O</source>
         <translation>ALT+O</translation>
     </message>
+</context>
+<context>
+    <name>OpenPagesWidget</name>
+    <message>
+        <source>Close %1</source>
+        <translation>&quot;%1&quot; を閉じる</translation>
+    </message>
     <message>
-        <source>CTRL+D</source>
-        <translation type="obsolete">CTRL+D</translation>
+        <source>Close All Except %1</source>
+        <translation>&quot;%1&quot; 以外をすべて閉じる</translation>
     </message>
 </context>
 <context>
@@ -1396,6 +1332,14 @@ Do you want to remove it?</source>
         <source>Blank Page</source>
         <translation>空白ページ</translation>
     </message>
+    <message>
+        <source>Appearance</source>
+        <translation>外観</translation>
+    </message>
+    <message>
+        <source>Show tabs for each individual page</source>
+        <translation>各ページにタブを表示する</translation>
+    </message>
 </context>
 <context>
     <name>QCollectionGenerator</name>
@@ -1567,97 +1511,6 @@ qhelpgenerator &lt;ヘルププロジェクトファイル&gt; [オプション]
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>The specified collection file does not exist!</source>
-        <translation type="obsolete">指定されたコレクションファイルは存在しません!</translation>
-    </message>
-    <message>
-        <source>Missing collection file!</source>
-        <translation type="obsolete">コレクションファイルが見つかりません!</translation>
-    </message>
-    <message>
-        <source>Invalid URL!</source>
-        <translation type="obsolete">不正なURLです!</translation>
-    </message>
-    <message>
-        <source>Missing URL!</source>
-        <translation type="obsolete">URLが見つかりません!</translation>
-    </message>
-    <message>
-        <source>Unknown widget: %1</source>
-        <translation type="obsolete">不明なウィジェット: %1</translation>
-    </message>
-    <message>
-        <source>Missing widget!</source>
-        <translation type="obsolete">ウィジェットが見つかりません!</translation>
-    </message>
-    <message>
-        <source>The specified Qt help file does not exist!</source>
-        <translation type="obsolete">指定された Qt ヘルプ ファイルが存在しません!</translation>
-    </message>
-    <message>
-        <source>Missing help file!</source>
-        <translation type="obsolete">ヘルプファイルが見つかりません!</translation>
-    </message>
-    <message>
-        <source>Missing filter argument!</source>
-        <translation type="obsolete">フィルタ引数が不足しています!</translation>
-    </message>
-    <message>
-        <source>Unknown option: %1</source>
-        <translation type="obsolete">不明なオプション: %1</translation>
-    </message>
-    <message>
-        <source>Qt Assistant</source>
-        <translation type="obsolete">Qt Assistant</translation>
-    </message>
-    <message>
-        <source>Could not register documentation file
-%1
-
-Reason:
-%2</source>
-        <translation type="obsolete">ドキュメントファイルを登録できませんでした。
-%1
-
-原因:
-%2</translation>
-    </message>
-    <message>
-        <source>Documentation successfully registered.</source>
-        <translation type="obsolete">ドキュメントの登録に成功しました。</translation>
-    </message>
-    <message>
-        <source>Could not unregister documentation file
-%1
-
-Reason:
-%2</source>
-        <translation type="obsolete">ドキュメントファイルを解除できませんでした。
-%1
-
-原因:
-%2</translation>
-    </message>
-    <message>
-        <source>Documentation successfully unregistered.</source>
-        <translation type="obsolete">ドキュメントの解放に成功しました。</translation>
-    </message>
-    <message>
-        <source>Cannot load sqlite database driver!</source>
-        <translation type="obsolete">SQLite データベース ドライバーをロードできません!</translation>
-    </message>
-    <message>
-        <source>The specified collection file could not be read!</source>
-        <translation type="obsolete">指定されたコレクションファイルは読み込めません!</translation>
-    </message>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">ブックマーク</translation>
-    </message>
-</context>
-<context>
     <name>RemoteControl</name>
     <message>
         <source>Debugging Remote Control</source>
@@ -1686,9 +1539,28 @@ Reason:
         <source>Select All</source>
         <translation>すべてを選択</translation>
     </message>
+</context>
+<context>
+    <name>TabBar</name>
+    <message>
+        <source>(Untitled)</source>
+        <translation>(タイトルなし)</translation>
+    </message>
     <message>
-        <source>Open Link</source>
-        <translation type="obsolete">リンクを開く</translation>
+        <source>New &amp;Tab</source>
+        <translation>新しいタブ(&amp;T)</translation>
+    </message>
+    <message>
+        <source>&amp;Close Tab</source>
+        <translation>タブを閉じる(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Close Other Tabs</source>
+        <translation>他のタブを閉じる</translation>
+    </message>
+    <message>
+        <source>Add Bookmark for this Page...</source>
+        <translation>このページをブックマークに追加...</translation>
     </message>
 </context>
 <context>
diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts
index b16f940..02eddc0 100644
--- a/translations/assistant_ru.ts
+++ b/translations/assistant_ru.ts
@@ -259,6 +259,10 @@ Reason:
         <translation>Адрес</translation>
     </message>
     <message>
+        <source>Toolbar Menu</source>
+        <translation>Меню панели инструментов</translation>
+    </message>
+    <message>
         <source>Bookmarks Menu</source>
         <translation>Меню закладок</translation>
     </message>
@@ -285,41 +289,9 @@ Reason:
 <context>
     <name>CentralWidget</name>
     <message>
-        <source>Add new page</source>
-        <translation>Открыть новую страницу</translation>
-    </message>
-    <message>
-        <source>Close current page</source>
-        <translation>Закрыть текущую страницу</translation>
-    </message>
-    <message>
         <source>Print Document</source>
         <translation>Печать документа</translation>
     </message>
-    <message>
-        <source>unknown</source>
-        <translation>безымянная вкладка</translation>
-    </message>
-    <message>
-        <source>Add New Page</source>
-        <translation>Открыть новую страницу</translation>
-    </message>
-    <message>
-        <source>Close This Page</source>
-        <translation>Закрыть данную страницу</translation>
-    </message>
-    <message>
-        <source>Close Other Pages</source>
-        <translation>Закрыть остальные страницы</translation>
-    </message>
-    <message>
-        <source>Add Bookmark for this Page...</source>
-        <translation>Добавить закладку для этой страницы...</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Поиск</translation>
-    </message>
 </context>
 <context>
     <name>CmdLineParser</name>
@@ -655,6 +627,49 @@ Reason:
     </message>
 </context>
 <context>
+    <name>GlobalActions</name>
+    <message>
+        <source>&amp;Back</source>
+        <translation>&amp;Назад</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>&amp;Вперёд</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>&amp;Домой</translation>
+    </message>
+    <message>
+        <source>ALT+Home</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Zoom &amp;in</source>
+        <translation>У&amp;величить</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;out</source>
+        <translation>У&amp;меньшить</translation>
+    </message>
+    <message>
+        <source>&amp;Copy selected Text</source>
+        <translation>&amp;Копировать выделенный текст</translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation>&amp;Печать...</translation>
+    </message>
+    <message>
+        <source>&amp;Find in Text...</source>
+        <translation>П&amp;оиск в тексте...</translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation>&amp;Поиск</translation>
+    </message>
+</context>
+<context>
     <name>HelpEngineWrapper</name>
     <message>
         <source>Unfiltered</source>
@@ -679,16 +694,28 @@ Reason:
         <translation>&lt;title&gt;Ошибка 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;Страница не найдена&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
     </message>
     <message>
+        <source>Open Link</source>
+        <translation>Открыть ссылку</translation>
+    </message>
+    <message>
         <source>Copy &amp;Link Location</source>
         <translation>Копировать &amp;адрес ссылки</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Копировать</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>Перезагрузить</translation>
+    </message>
+    <message>
         <source>Open Link in New Tab	Ctrl+LMB</source>
         <translation>Открыть ссылку в новой вкладке	Ctrl+LMB</translation>
     </message>
     <message>
-        <source>Open Link in New Tab</source>
-        <translation>Открыть ссылку в новой вкладке</translation>
+        <source>Open Link in New Page</source>
+        <translation>Открыть ссылку в новой странице</translation>
     </message>
 </context>
 <context>
@@ -899,10 +926,6 @@ Reason:
         <translation>Предпросмотр печати...</translation>
     </message>
     <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Печать...</translation>
-    </message>
-    <message>
         <source>New &amp;Tab</source>
         <translation>Новая &amp;вкладка</translation>
     </message>
@@ -923,18 +946,6 @@ Reason:
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <source>&amp;Copy selected Text</source>
-        <translation>&amp;Копировать выделенный текст</translation>
-    </message>
-    <message>
-        <source>&amp;Find in Text...</source>
-        <translation>П&amp;оиск в тексте...</translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Поиск</translation>
-    </message>
-    <message>
         <source>Find &amp;Next</source>
         <translation>Найти &amp;следующее</translation>
     </message>
@@ -951,14 +962,6 @@ Reason:
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <source>Zoom &amp;in</source>
-        <translation>У&amp;величить</translation>
-    </message>
-    <message>
-        <source>Zoom &amp;out</source>
-        <translation>У&amp;меньшить</translation>
-    </message>
-    <message>
         <source>Normal &amp;Size</source>
         <translation>Нормальный р&amp;азмер</translation>
     </message>
@@ -991,22 +994,6 @@ Reason:
         <translation>&amp;Перейти</translation>
     </message>
     <message>
-        <source>&amp;Home</source>
-        <translation>&amp;Домой</translation>
-    </message>
-    <message>
-        <source>ALT+Home</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>&amp;Back</source>
-        <translation>&amp;Назад</translation>
-    </message>
-    <message>
-        <source>&amp;Forward</source>
-        <translation>&amp;Вперёд</translation>
-    </message>
-    <message>
         <source>Sync with Table of Contents</source>
         <translation>Синхронизировать с оглавлением</translation>
     </message>
@@ -1047,6 +1034,22 @@ Reason:
         <translation>&amp;Справка</translation>
     </message>
     <message>
+        <source>Open Pages</source>
+        <translation>Открытые страницы</translation>
+    </message>
+    <message>
+        <source>Bookmark Toolbar</source>
+        <translation>Панель закладок</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>В&amp;ыход</translation>
+    </message>
+    <message>
+        <source>ALT+P</source>
+        <translation></translation>
+    </message>
+    <message>
         <source>About...</source>
         <translation>О программе...</translation>
     </message>
@@ -1104,6 +1107,17 @@ Reason:
     </message>
 </context>
 <context>
+    <name>OpenPagesWidget</name>
+    <message>
+        <source>Close %1</source>
+        <translation>Закрыть %1</translation>
+    </message>
+    <message>
+        <source>Close All Except %1</source>
+        <translation>Закрыть всё, кроме %1</translation>
+    </message>
+</context>
+<context>
     <name>OutputPage</name>
     <message>
         <source>Form</source>
@@ -1322,6 +1336,14 @@ Do you want to remove it?</source>
         <source>Blank Page</source>
         <translation>Пустая страница</translation>
     </message>
+    <message>
+        <source>Appearance</source>
+        <translation>Внешний вид</translation>
+    </message>
+    <message>
+        <source>Show tabs for each individual page</source>
+        <translation>Показывать вкладки для каждой страницы</translation>
+    </message>
 </context>
 <context>
     <name>QCollectionGenerator</name>
@@ -1513,6 +1535,29 @@ qhelpgenerator &lt;файл-проекта-справки&gt; [ОПЦИИ]
     </message>
 </context>
 <context>
+    <name>TabBar</name>
+    <message>
+        <source>(Untitled)</source>
+        <translation>(Без названия)</translation>
+    </message>
+    <message>
+        <source>New &amp;Tab</source>
+        <translation>Новая &amp;вкладка</translation>
+    </message>
+    <message>
+        <source>&amp;Close Tab</source>
+        <translation>&amp;Закрыть вкладку</translation>
+    </message>
+    <message>
+        <source>Close Other Tabs</source>
+        <translation>Закрыть остальные вкладки</translation>
+    </message>
+    <message>
+        <source>Add Bookmark for this Page...</source>
+        <translation>Добавить закладку для этой страницы...</translation>
+    </message>
+</context>
+<context>
     <name>TopicChooser</name>
     <message>
         <source>Choose a topic for &lt;b&gt;%1&lt;/b&gt;:</source>
diff --git a/translations/designer_ja.ts b/translations/designer_ja.ts
index 7fcc66d..2be8cd4 100644
--- a/translations/designer_ja.ts
+++ b/translations/designer_ja.ts
@@ -371,10 +371,6 @@
         <translation>ページ</translation>
     </message>
     <message>
-        <source>page</source>
-        <translation>ページ</translation>
-    </message>
-    <message>
         <source>Insert Page</source>
         <translation>ページを挿入</translation>
     </message>
@@ -483,10 +479,6 @@
         <translation>サブウィンドウを挿入</translation>
     </message>
     <message>
-        <source>subwindow</source>
-        <translation>サブウィンドウ</translation>
-    </message>
-    <message>
         <source>Subwindow</source>
         <translation>サブウィンドウ</translation>
     </message>
@@ -530,6 +522,10 @@
         <translation>&apos;%1&apos; のレイアウトを %2 から %3 に変更</translation>
     </message>
     <message>
+        <source>Change layout alignment</source>
+        <translation>レイアウトの配置を変更</translation>
+    </message>
+    <message>
         <source>Change script</source>
         <translation>スクリプトを変更</translation>
     </message>
@@ -868,8 +864,6 @@
         <source>Invalid stretch value for &apos;%1&apos;: &apos;%2&apos;</source>
         <extracomment>Parsing layout stretch values
 ----------
-Parsing layout stretch values
-----------
 Parsing layout stretch values</extracomment>
         <translation>&apos;%1&apos; のストレッチ値が無効です: &apos;%2&apos;</translation>
     </message>
@@ -877,8 +871,6 @@ Parsing layout stretch values</extracomment>
         <source>Invalid minimum size for &apos;%1&apos;: &apos;%2&apos;</source>
         <extracomment>Parsing grid layout minimum size values
 ----------
-Parsing grid layout minimum size values
-----------
 Parsing grid layout minimum size values</extracomment>
         <translation>&apos;%1&apos; の最小サイズが無効です: &apos;%2&apos;</translation>
     </message>
@@ -1827,10 +1819,6 @@ Container pages should only be added by specifying them in XML returned by the d
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation>編集</translation>
-    </message>
-    <message>
         <source>Toolbars</source>
         <translation>ツールバー</translation>
     </message>
@@ -1847,6 +1835,10 @@ Container pages should only be added by specifying them in XML returned by the d
         <translation>表示(&amp;V)</translation>
     </message>
     <message>
+        <source>&amp;Edit</source>
+        <translation>編集(&amp;E)</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>設定(&amp;S)</translation>
     </message>
@@ -1891,8 +1883,6 @@ Container pages should only be added by specifying them in XML returned by the d
         <source>An empty class name was passed on to %1 (object name: &apos;%2&apos;).</source>
         <extracomment>Empty class name passed to widget factory method
 ----------
-Empty class name passed to widget factory method
-----------
 Empty class name passed to widget factory method</extracomment>
         <translation>%1 (オブジェクト名: %2)に空のクラス名が渡されました。</translation>
     </message>
@@ -3725,6 +3715,10 @@ Do you want overwrite the template?</source>
         <translation>親から継承</translation>
     </message>
     <message>
+        <source>[Theme] %1</source>
+        <translation>[テーマ] %1</translation>
+    </message>
+    <message>
         <source>Horizontal</source>
         <translation>横方向</translation>
     </message>
@@ -3733,6 +3727,10 @@ Do you want overwrite the template?</source>
         <translation>縦方向</translation>
     </message>
     <message>
+        <source>Theme</source>
+        <translation>テーマ</translation>
+    </message>
+    <message>
         <source>Normal Off</source>
         <translation>通常 オフ</translation>
     </message>
@@ -4317,6 +4315,17 @@ Do you want overwrite the template?</source>
     </message>
 </context>
 <context>
+    <name>qdesigner_internal::IconThemeDialog</name>
+    <message>
+        <source>Set Icon From Theme</source>
+        <translation>テーマからアイコンを設定する</translation>
+    </message>
+    <message>
+        <source>Input icon name from the current theme:</source>
+        <translation>現在のテーマからアイコンの名前を入力:</translation>
+    </message>
+</context>
+<context>
     <name>qdesigner_internal::ItemListEditor</name>
     <message>
         <source>Properties &amp;&lt;&lt;</source>
@@ -4458,18 +4467,6 @@ Do you want overwrite the template?</source>
         <translation>テキスト(&amp;T):</translation>
     </message>
     <message>
-        <source>Shortcut:</source>
-        <translation>ショートカット:</translation>
-    </message>
-    <message>
-        <source>Checkable:</source>
-        <translation>チェック可:</translation>
-    </message>
-    <message>
-        <source>ToolTip:</source>
-        <translation>ツールチップ:</translation>
-    </message>
-    <message>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -4481,6 +4478,22 @@ Do you want overwrite the template?</source>
         <source>Object &amp;name:</source>
         <translation>オブジェクト名(&amp;N):</translation>
     </message>
+    <message>
+        <source>T&amp;oolTip:</source>
+        <translation>ツールチップ(&amp;O):</translation>
+    </message>
+    <message>
+        <source>Icon th&amp;eme:</source>
+        <translation>アイコンテーマ(&amp;E):</translation>
+    </message>
+    <message>
+        <source>&amp;Checkable:</source>
+        <translation>チェック可(&amp;C):</translation>
+    </message>
+    <message>
+        <source>&amp;Shortcut:</source>
+        <translation>ショートカット(&amp;S):</translation>
+    </message>
 </context>
 <context>
     <name>qdesigner_internal::NewDynamicPropertyDialog</name>
@@ -4738,9 +4751,17 @@ Please select another name.</source>
         <translation>ファイルを選択...</translation>
     </message>
     <message>
+        <source>Set Icon From Theme...</source>
+        <translation>テーマからアイコンを設定...</translation>
+    </message>
+    <message>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>[Theme] %1</source>
+        <translation>[テーマ] %1</translation>
+    </message>
 </context>
 <context>
     <name>qdesigner_internal::PlainTextEditorDialog</name>
@@ -5126,6 +5147,42 @@ Class: %2</source>
         <translation>シグナル/スロットを変更...</translation>
     </message>
     <message>
+        <source>Layout Alignment</source>
+        <translation>レイアウトの配置</translation>
+    </message>
+    <message>
+        <source>No Horizontal Alignment</source>
+        <translation>横方向の調整なし</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>左端揃え</translation>
+    </message>
+    <message>
+        <source>Center Horizontally</source>
+        <translation>中央揃え(横方向)</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>右端揃え</translation>
+    </message>
+    <message>
+        <source>No Vertical Alignment</source>
+        <translation>横方向の調整なし</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>上端揃え</translation>
+    </message>
+    <message>
+        <source>Center Vertically</source>
+        <translation>中央揃え(縦方向)</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>下端揃え</translation>
+    </message>
+    <message>
         <source>Size Constraints</source>
         <translation>限界サイズ</translation>
     </message>
@@ -5329,6 +5386,10 @@ Class: %2</source>
         <source>Insert &amp;Link</source>
         <translation>リンクを挿入(&amp;L)</translation>
     </message>
+    <message>
+        <source>Simplify Rich Text</source>
+        <translation>リッチテキストを単純化する</translation>
+    </message>
 </context>
 <context>
     <name>qdesigner_internal::ScriptDialog</name>
diff --git a/translations/designer_ru.ts b/translations/designer_ru.ts
index fec098c..471a366 100644
--- a/translations/designer_ru.ts
+++ b/translations/designer_ru.ts
@@ -406,10 +406,6 @@
         <translation>Страница</translation>
     </message>
     <message>
-        <source>page</source>
-        <translation>страница</translation>
-    </message>
-    <message>
         <source>Insert Page</source>
         <translation>Вставить страницу</translation>
     </message>
@@ -462,10 +458,6 @@
         <translation>Вставить дочернее окно</translation>
     </message>
     <message>
-        <source>subwindow</source>
-        <translation>дочернее окно</translation>
-    </message>
-    <message>
         <source>Subwindow</source>
         <translation>Дочернее окно</translation>
     </message>
@@ -506,6 +498,10 @@
         <translation>Изменить компоновку &apos;%1&apos; с %2 на %3</translation>
     </message>
     <message>
+        <source>Change layout alignment</source>
+        <translation>Изменить выравнивание компоновщика</translation>
+    </message>
+    <message>
         <source>Set action text</source>
         <translation>Установить текст действия</translation>
     </message>
@@ -1822,7 +1818,7 @@ Container pages should only be added by specifying them in XML returned by the d
     </message>
     <message>
         <source>F&amp;orm</source>
-        <translation>Ф&amp;орма</translation>
+        <translation>Фор&amp;ма</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -1837,10 +1833,6 @@ Container pages should only be added by specifying them in XML returned by the d
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation>Правка</translation>
-    </message>
-    <message>
         <source>Toolbars</source>
         <translation>Панель инструментов</translation>
     </message>
@@ -1861,6 +1853,10 @@ Container pages should only be added by specifying them in XML returned by the d
         <translation>&amp;Вид</translation>
     </message>
     <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Правка</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
@@ -1870,7 +1866,7 @@ Container pages should only be added by specifying them in XML returned by the d
     </message>
     <message>
         <source>If you do not review your documents, all your changes will be lost.</source>
-        <translation type="unfinished">Если не просматривать изменения, все изменения будут потеряны.</translation>
+        <translation>Если не просматривать изменения, все они будут потеряны.</translation>
     </message>
     <message>
         <source>Discard Changes</source>
@@ -3743,6 +3739,10 @@ Do you want overwrite the template?</source>
         <translation>Унаследованная</translation>
     </message>
     <message>
+        <source>[Theme] %1</source>
+        <translation>[Тема] %1</translation>
+    </message>
+    <message>
         <source>Horizontal</source>
         <translation>Горизонтальное</translation>
     </message>
@@ -3751,6 +3751,10 @@ Do you want overwrite the template?</source>
         <translation>Вертикальное</translation>
     </message>
     <message>
+        <source>Theme</source>
+        <translation>Тема</translation>
+    </message>
+    <message>
         <source>Normal Off</source>
         <translation type="unfinished">Нормальный, выкл</translation>
     </message>
@@ -3973,15 +3977,15 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>Key Move</source>
-        <translation type="unfinished">Перемещение клавишей</translation>
+        <translation>Перемещение клавишей</translation>
     </message>
     <message>
         <source>Key Resize</source>
-        <translation type="unfinished">Изменение размера клавишей</translation>
+        <translation>Изменение размера клавишей</translation>
     </message>
     <message numerus="yes">
         <source>Paste %n action(s)</source>
-        <translation type="unfinished">
+        <translation>
             <numerusform>Вставлено %n действие</numerusform>
             <numerusform>Вставлено %n действия</numerusform>
             <numerusform>Вставлено %n действий</numerusform>
@@ -3989,7 +3993,7 @@ Do you want overwrite the template?</source>
     </message>
     <message numerus="yes">
         <source>Paste %n widget(s)</source>
-        <translation type="unfinished">
+        <translation>
             <numerusform>Вставлен %n виджет</numerusform>
             <numerusform>Вставлено %n виджета</numerusform>
             <numerusform>Вставлено %n виджета</numerusform>
@@ -3997,7 +4001,7 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>Paste (%1 widgets, %2 actions)</source>
-        <translation type="unfinished">Вставлено (%1 виджетов, %2 действий)</translation>
+        <translation>Вставлено (%1 виджетов, %2 действий)</translation>
     </message>
     <message>
         <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source>
@@ -4029,7 +4033,7 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>Drop widget</source>
-        <translation type="unfinished">Вставка виджета</translation>
+        <translation>Вставка виджета</translation>
     </message>
     <message>
         <source>A QMainWindow-based form does not contain a central widget.</source>
@@ -4339,6 +4343,17 @@ Do you want overwrite the template?</source>
     </message>
 </context>
 <context>
+    <name>qdesigner_internal::IconThemeDialog</name>
+    <message>
+        <source>Set Icon From Theme</source>
+        <translation>Установить значок из темы</translation>
+    </message>
+    <message>
+        <source>Input icon name from the current theme:</source>
+        <translation>Имя исходного значка из текущей темы:</translation>
+    </message>
+</context>
+<context>
     <name>qdesigner_internal::ItemListEditor</name>
     <message>
         <source>Properties &amp;&lt;&lt;</source>
@@ -4488,20 +4503,24 @@ Do you want overwrite the template?</source>
         <translation>&amp;Значок:</translation>
     </message>
     <message>
-        <source>Shortcut:</source>
-        <translation>Горячая клавиша:</translation>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-        <source>Checkable:</source>
-        <translation>Триггерное:</translation>
+        <source>T&amp;oolTip:</source>
+        <translation>Подска&amp;зка:</translation>
     </message>
     <message>
-        <source>ToolTip:</source>
-        <translation>Подсказка:</translation>
+        <source>Icon th&amp;eme:</source>
+        <translation>Тема зна&amp;чков:</translation>
     </message>
     <message>
-        <source>...</source>
-        <translation>...</translation>
+        <source>&amp;Checkable:</source>
+        <translation>Т&amp;риггерное:</translation>
+    </message>
+    <message>
+        <source>&amp;Shortcut:</source>
+        <translation>&amp;Горячая клавиша:</translation>
     </message>
 </context>
 <context>
@@ -4631,7 +4650,7 @@ Please select another name.</source>
     </message>
     <message>
         <source>Global include</source>
-        <translation type="unfinished">Глобальное включение</translation>
+        <translation>Глобальное включение</translation>
     </message>
     <message>
         <source>Reset</source>
@@ -4688,15 +4707,15 @@ Please select another name.</source>
     </message>
     <message>
         <source>Show Details</source>
-        <translation type="unfinished">Показывать детали</translation>
+        <translation>Показывать детали</translation>
     </message>
     <message>
         <source>Compute Details</source>
-        <translation type="unfinished">Рассчитывать детали</translation>
+        <translation>Рассчитывать детали</translation>
     </message>
     <message>
         <source>Quick</source>
-        <translation type="unfinished">Быстрый</translation>
+        <translation>Быстрый</translation>
     </message>
     <message>
         <source>Preview</source>
@@ -4752,6 +4771,10 @@ Please select another name.</source>
         <translation>Выбрать файл...</translation>
     </message>
     <message>
+        <source>Set Icon From Theme...</source>
+        <translation>Установить значок из темы...</translation>
+    </message>
+    <message>
         <source>Copy Path</source>
         <translation>Скопировать путь</translation>
     </message>
@@ -4763,6 +4786,10 @@ Please select another name.</source>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>[Theme] %1</source>
+        <translation>[Тема] %1</translation>
+    </message>
 </context>
 <context>
     <name>qdesigner_internal::PlainTextEditorDialog</name>
@@ -4954,7 +4981,7 @@ ate the goose who was loose.</source>
     </message>
     <message>
         <source>Global include</source>
-        <translation type="unfinished">Глобальное включение</translation>
+        <translation>Глобальное включение</translation>
     </message>
     <message>
         <source>Usage</source>
@@ -5000,7 +5027,7 @@ ate the goose who was loose.</source>
     </message>
     <message>
         <source>Color Groups</source>
-        <translation type="unfinished">Цветовые группы</translation>
+        <translation>Цветовые группы</translation>
     </message>
     <message>
         <source>Tree View</source>
@@ -5008,7 +5035,7 @@ ate the goose who was loose.</source>
     </message>
     <message>
         <source>Drop Down Button View</source>
-        <translation type="unfinished">Вид выпадающего списка</translation>
+        <translation>Вид выпадающего списка</translation>
     </message>
     <message>
         <source>String...</source>
@@ -5085,6 +5112,42 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::QDesignerTaskMenu</name>
     <message>
+        <source>Layout Alignment</source>
+        <translation>Выравнивание компоновщика</translation>
+    </message>
+    <message>
+        <source>No Horizontal Alignment</source>
+        <translation>Без горизонтального выравнивания</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>По левому краю</translation>
+    </message>
+    <message>
+        <source>Center Horizontally</source>
+        <translation>По горизонтальному центру</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>По правому краю</translation>
+    </message>
+    <message>
+        <source>No Vertical Alignment</source>
+        <translation>Без вертикального выравнивания</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>По верхнему краю</translation>
+    </message>
+    <message>
+        <source>Center Vertically</source>
+        <translation>По вертикальному центру</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>По нижнему краю</translation>
+    </message>
+    <message>
         <source>Change objectName...</source>
         <translation>Изменить objectName...</translation>
     </message>
@@ -5352,6 +5415,10 @@ Class: %2</source>
         <source>Insert &amp;Image</source>
         <translation>Вставить &amp;изображение</translation>
     </message>
+    <message>
+        <source>Simplify Rich Text</source>
+        <translation>Упростить форматирование</translation>
+    </message>
 </context>
 <context>
     <name>qdesigner_internal::ScriptDialog</name>
diff --git a/translations/qt_ja.ts b/translations/qt_ja.ts
index 094e34d..05ed9d4 100644
--- a/translations/qt_ja.ts
+++ b/translations/qt_ja.ts
@@ -10,9 +10,20 @@
     </message>
 </context>
 <context>
+    <name>Debugger::JSAgentWatchData</name>
+    <message>
+        <source>[Array of length %1]</source>
+        <translation>[配列長 %1]</translation>
+    </message>
+    <message>
+        <source>&lt;undefined&gt;</source>
+        <translation>&lt;未定義&gt;</translation>
+    </message>
+</context>
+<context>
     <name>FakeReply</name>
     <message>
-        <source>Fake error !</source>
+        <source>Fake error!</source>
         <translation>疑似エラー!</translation>
     </message>
     <message>
@@ -171,7 +182,7 @@ libgstreamer-plugins-base はインストールされていますか。</transla
     </message>
     <message>
         <source>Not found</source>
-        <translation>見つかりませんでした</translation>
+        <translation>見つかりません</translation>
     </message>
     <message>
         <source>Out of memory</source>
@@ -762,7 +773,7 @@ libgstreamer-plugins-base はインストールされていますか。</transla
 File not found.
 Check path and filename.</source>
         <translation>%1
-ファイルが見つかりませんでした。
+ファイルが見つかりません。
 パスおよびファイル名を確認してください。</translation>
     </message>
 </context>
@@ -1017,7 +1028,7 @@ to
     <name>QAbstractSocket</name>
     <message>
         <source>Host not found</source>
-        <translation>ホストが見つかりませんでした</translation>
+        <translation>ホストが見つかりません</translation>
     </message>
     <message>
         <source>Connection refused</source>
@@ -1063,6 +1074,14 @@ to
 <context>
     <name>QAccessibleButton</name>
     <message>
+        <source>Uncheck</source>
+        <translation>選択解除</translation>
+    </message>
+    <message>
+        <source>Check</source>
+        <translation>選択</translation>
+    </message>
+    <message>
         <source>Press</source>
         <translation>押す</translation>
     </message>
@@ -1722,10 +1741,6 @@ to
         <translation>エイリアスプロパティがエイリアスの境界を越えています</translation>
     </message>
     <message>
-        <source>Invalid alias reference. An alias reference must be specified as &lt;id&gt; or &lt;id&gt;.&lt;property&gt;</source>
-        <translation type="obsolete">無効なエイリアスの参照です。エイリアスの参照先は &lt;ID&gt; もしくは &lt;ID&gt;.&lt;プロパティ&gt; でなくてはいけません</translation>
-    </message>
-    <message>
         <source>Invalid alias reference. Unable to find id &quot;%1&quot;</source>
         <translation>無効なエイリアスの参照です。ID &quot;%1&quot; が見つかりません</translation>
     </message>
@@ -1742,25 +1757,6 @@ to
     </message>
 </context>
 <context>
-    <name>QDeclarativeCompositeTypeManager</name>
-    <message>
-        <source>Resource %1 unavailable</source>
-        <translation type="obsolete">リソース %1 が利用できません</translation>
-    </message>
-    <message>
-        <source>Namespace %1 cannot be used as a type</source>
-        <translation type="obsolete">名前空間 %1 を型として使用することはできません</translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <translation type="obsolete">%1 %2</translation>
-    </message>
-    <message>
-        <source>Type %1 unavailable</source>
-        <translation type="obsolete">型 %1 が利用できません</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeConnections</name>
     <message>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
@@ -2160,25 +2156,6 @@ to
     </message>
 </context>
 <context>
-    <name>QDeclarativeTypeData</name>
-    <message>
-        <source>Script %1 unavailable</source>
-        <translation type="obsolete">スクリプト %1 が利用できません</translation>
-    </message>
-    <message>
-        <source>Type %1 unavailable</source>
-        <translation type="obsolete">型 %1 が利用できません</translation>
-    </message>
-    <message>
-        <source>Namespace %1 cannot be used as a type</source>
-        <translation type="obsolete">名前空間 %1 を型として使用することはできません</translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <translation type="obsolete">%1 %2</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeTypeLoader</name>
     <message>
         <source>Script %1 unavailable</source>
@@ -2493,6 +2470,10 @@ to
         <source>Cannot create %1 for output</source>
         <translation>コピー先として %1 を作成できません</translation>
     </message>
+    <message>
+        <source>No file engine available or engine does not support UnMapExtension</source>
+        <translation>ファイルエンジンが見つからないか、UnMapExtension をサポートしていません</translation>
+    </message>
 </context>
 <context>
     <name>QFileDialog</name>
@@ -2985,7 +2966,7 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>Host %1 not found</source>
-        <translation>ホスト %1 が見つかりませんでした</translation>
+        <translation>ホスト %1 が見つかりません</translation>
     </message>
     <message>
         <source>Connection refused to host %1</source>
@@ -3156,7 +3137,7 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>Host %1 not found</source>
-        <translation>ホスト %1 が見つかりませんでした</translation>
+        <translation>ホスト %1 が見つかりません</translation>
     </message>
     <message>
         <source>HTTP request failed</source>
@@ -3416,18 +3397,10 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QLibrary</name>
     <message>
-        <source>Could not mmap &apos;%1&apos;: %2</source>
-        <translation type="obsolete">&apos;%1&apos; をメモリにマッピングできませんでした: %2</translation>
-    </message>
-    <message>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
         <translation>&apos;%1&apos; でプラグイン検証データが一致しません</translation>
     </message>
     <message>
-        <source>Could not unmap &apos;%1&apos;: %2</source>
-        <translation type="obsolete">&apos;%1&apos; のマッピングを解除できませんでした: %2</translation>
-    </message>
-    <message>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
         <translation>プラグイン &apos;%1&apos; は、互換性のない Qt ライブラリを使用しています。(%2.%3.%4) [%5]</translation>
     </message>
@@ -3463,6 +3436,18 @@ Do you want to delete it anyway?</source>
         <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
         <translation>&apos;%2&apos;に含まれる識別子 &quot;%1&quot; を解決できません: %3</translation>
     </message>
+    <message>
+        <source>&apos;%1&apos; is not an ELF object (%2)</source>
+        <translation>&apos;%1&apos; は ELF オブジェクトではありません(%2)</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is not an ELF object</source>
+        <translation>&apos;%1&apos; は ELF オブジェクトではありません</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is an invalid ELF object (%2)</source>
+        <translation>&apos;%1&apos; は無効な ELF オブジェクトです(%2)</translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
@@ -3560,6 +3545,10 @@ Do you want to delete it anyway?</source>
         <source>%1: Unknown error %2</source>
         <translation>%1: 未知のエラー %2</translation>
     </message>
+    <message>
+        <source>%1: Access denied</source>
+        <translation>%1: アクセスできません</translation>
+    </message>
 </context>
 <context>
     <name>QMYSQLDriver</name>
@@ -3902,10 +3891,6 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDataBackend</name>
     <message>
-        <source>Operation not supported on %1</source>
-        <translation>%1 ではこの操作はサポートされていません</translation>
-    </message>
-    <message>
         <source>Invalid URI: %1</source>
         <translation>無効なURIです: %1</translation>
     </message>
@@ -4000,6 +3985,10 @@ Do you want to delete it anyway?</source>
         <translation>ネットワークセッションエラー。</translation>
     </message>
     <message>
+        <source>backend start error.</source>
+        <translation>バックエンド開始時のエラー。</translation>
+    </message>
+    <message>
         <source>Temporary network failure.</source>
         <translation>一時的なネットワークの失敗。</translation>
     </message>
@@ -4192,6 +4181,10 @@ Do you want to delete it anyway?</source>
         <source>invalid query: &quot;%1&quot;</source>
         <translation>無効なクエリー: &quot;%1&quot;</translation>
     </message>
+    <message>
+        <source>Host not found</source>
+        <translation>ホストが見つかりません</translation>
+    </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
@@ -5500,6 +5493,10 @@ Please choose a different file name.</source>
         <translation>%1: 指定されたサイズはシステムにより拒否されました</translation>
     </message>
     <message>
+        <source>%1: bad name</source>
+        <translation>%1: 無効な名前です</translation>
+    </message>
+    <message>
         <source>%1: not attached</source>
         <translation>%1: アタッチしていません</translation>
     </message>
@@ -5508,11 +5505,6 @@ Please choose a different file name.</source>
         <translation>%1: 無効なサイズです</translation>
     </message>
     <message>
-        <source>%1: key error</source>
-        <translatorcomment>safekey.isEmpty()==true</translatorcomment>
-        <translation>%1: キーかありません</translation>
-    </message>
-    <message>
         <source>%1: size query failed</source>
         <translation>%1: サイズのクエリーに失敗しました</translation>
     </message>
@@ -6733,6 +6725,121 @@ Please choose a different file name.</source>
     </message>
 </context>
 <context>
+    <name>QSymbianSocketEngine</name>
+    <message>
+        <source>Unable to initialize non-blocking socket</source>
+        <translation>非ブロック型ソケットを初期化できません</translation>
+    </message>
+    <message>
+        <source>Unable to initialize broadcast socket</source>
+        <translation>ブロードキャストソケットを初期化できません</translation>
+    </message>
+    <message>
+        <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
+        <translation>IPv6 がサポートされていないプラットフォームで IPv6 ソケットを使用しようとしています</translation>
+    </message>
+    <message>
+        <source>The remote host closed the connection</source>
+        <translation>リモートホストは接続を閉じました</translation>
+    </message>
+    <message>
+        <source>Network operation timed out</source>
+        <translation>ネットワーク操作がタイムアウトしました</translation>
+    </message>
+    <message>
+        <source>Out of resources</source>
+        <translation>リソースが足りません</translation>
+    </message>
+    <message>
+        <source>Unsupported socket operation</source>
+        <translation>サポートされていないソケット操作です</translation>
+    </message>
+    <message>
+        <source>Protocol type not supported</source>
+        <translation>プロトコル型がサポートされていません</translation>
+    </message>
+    <message>
+        <source>Invalid socket descriptor</source>
+        <translation>無効なソケット記述子です</translation>
+    </message>
+    <message>
+        <source>Host unreachable</source>
+        <translation>ホストへ到達できません</translation>
+    </message>
+    <message>
+        <source>Network unreachable</source>
+        <translation>ネットワークへ到達できません</translation>
+    </message>
+    <message>
+        <source>Permission denied</source>
+        <translation>許可されていません</translation>
+    </message>
+    <message>
+        <source>Connection timed out</source>
+        <translation>接続がタイムアウトしました</translation>
+    </message>
+    <message>
+        <source>Connection refused</source>
+        <translation>接続が拒否されました</translation>
+    </message>
+    <message>
+        <source>The bound address is already in use</source>
+        <translation>バインドアドレスは既に使われています</translation>
+    </message>
+    <message>
+        <source>The address is not available</source>
+        <translation>そのアドレスは使用できません</translation>
+    </message>
+    <message>
+        <source>The address is protected</source>
+        <translation>そのアドレスへのアクセス権がありません</translation>
+    </message>
+    <message>
+        <source>Datagram was too large to send</source>
+        <translation>データグラムが大き過ぎて送信できませんでした</translation>
+    </message>
+    <message>
+        <source>Unable to send a message</source>
+        <translation>メッセージを送信できません</translation>
+    </message>
+    <message>
+        <source>Unable to receive a message</source>
+        <translation>メッセージを受信できません</translation>
+    </message>
+    <message>
+        <source>Unable to write</source>
+        <translation>書き込みができません</translation>
+    </message>
+    <message>
+        <source>Network error</source>
+        <translation>ネットワークエラー</translation>
+    </message>
+    <message>
+        <source>Another socket is already listening on the same port</source>
+        <translation>別のソケットが同じポートで既に待ち受けています</translation>
+    </message>
+    <message>
+        <source>Operation on non-socket</source>
+        <translation>非ソケットに対する操作です</translation>
+    </message>
+    <message>
+        <source>The proxy type is invalid for this operation</source>
+        <translation>このプロキシーは、この操作に対応していません</translation>
+    </message>
+    <message>
+        <source>The address is invalid for this operation</source>
+        <translation>この操作には無効なアドレスです</translation>
+    </message>
+    <message>
+        <source>The specified network session is not opened</source>
+        <translation>指定されたネットワークセッションは開いていません</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>未知のエラー</translation>
+    </message>
+</context>
+<context>
     <name>QSystemSemaphore</name>
     <message>
         <source>%1: out of resources</source>
@@ -6751,6 +6858,10 @@ Please choose a different file name.</source>
         <translation>%1: 存在しません</translation>
     </message>
     <message>
+        <source>%1: name error</source>
+        <translation>%1: 名前の解決に失敗</translation>
+    </message>
+    <message>
         <source>%1: unknown error %2</source>
         <translation>%1: 未知のエラーです %2</translation>
     </message>
@@ -6759,7 +6870,7 @@ Please choose a different file name.</source>
     <name>QTDSDriver</name>
     <message>
         <source>Unable to open connection</source>
-        <translation>接続をオープンできません</translation>
+        <translation>接続を開けません</translation>
     </message>
     <message>
         <source>Unable to use database</source>
@@ -6840,11 +6951,21 @@ Please choose a different file name.</source>
 <context>
     <name>QUndoGroup</name>
     <message>
+        <source>Undo %1</source>
+        <translation>%1 を元に戻す</translation>
+    </message>
+    <message>
         <source>Undo</source>
+        <comment>Default text for undo action</comment>
         <translation>元に戻す</translation>
     </message>
     <message>
+        <source>Redo %1</source>
+        <translation>%1 をやり直す</translation>
+    </message>
+    <message>
         <source>Redo</source>
+        <comment>Default text for redo action</comment>
         <translation>やり直す</translation>
     </message>
 </context>
@@ -6858,11 +6979,21 @@ Please choose a different file name.</source>
 <context>
     <name>QUndoStack</name>
     <message>
+        <source>Undo %1</source>
+        <translation>%1 を元に戻す</translation>
+    </message>
+    <message>
         <source>Undo</source>
+        <comment>Default text for undo action</comment>
         <translation>元に戻す</translation>
     </message>
     <message>
+        <source>Redo %1</source>
+        <translation>%1 をやり直す</translation>
+    </message>
+    <message>
         <source>Redo</source>
+        <comment>Default text for redo action</comment>
         <translation>やり直す</translation>
     </message>
 </context>
@@ -6939,6 +7070,10 @@ Please choose a different file name.</source>
         <source>File does not exist</source>
         <translation>ファイルが存在しません</translation>
     </message>
+    <message>
+        <source>Loading is handled by the media engine</source>
+        <translation>メディアエンジンで読み込みを行います</translation>
+    </message>
 </context>
 <context>
     <name>QWebPage</name>
@@ -6947,10 +7082,6 @@ Please choose a different file name.</source>
         <translation>リダイレクトの上限に達しました</translation>
     </message>
     <message>
-        <source>Bad HTTP request</source>
-        <translation>誤った HTTP のリクエストです</translation>
-    </message>
-    <message>
         <source>Submit</source>
         <comment>default label for Submit buttons in forms on web pages</comment>
         <translation>送信</translation>
@@ -6981,6 +7112,11 @@ Please choose a different file name.</source>
         <translation>ファイルが選択されていません</translation>
     </message>
     <message>
+        <source>Details</source>
+        <comment>text to display in &lt;details&gt; tag when it has no &lt;summary&gt; child</comment>
+        <translation>詳細</translation>
+    </message>
+    <message>
         <source>Open in New Window</source>
         <comment>Open in New Window context menu item</comment>
         <translation>新しいウィンドウで開く</translation>
@@ -7011,6 +7147,61 @@ Please choose a different file name.</source>
         <translation>画像をコピー</translation>
     </message>
     <message>
+        <source>Copy Image Address</source>
+        <comment>Copy Image Address menu item</comment>
+        <translation>画像のアドレスをコピー</translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <comment>Open Video in New Window</comment>
+        <translation>ビデオを開く</translation>
+    </message>
+    <message>
+        <source>Open Audio</source>
+        <comment>Open Audio in New Window</comment>
+        <translation>オーディオを開く</translation>
+    </message>
+    <message>
+        <source>Copy Video</source>
+        <comment>Copy Video Link Location</comment>
+        <translation>ビデオをコピー</translation>
+    </message>
+    <message>
+        <source>Copy Audio</source>
+        <comment>Copy Audio Link Location</comment>
+        <translation>オーディオをコピー</translation>
+    </message>
+    <message>
+        <source>Toggle Controls</source>
+        <comment>Toggle Media Controls</comment>
+        <translation>コントロールの表示の切替</translation>
+    </message>
+    <message>
+        <source>Toggle Loop</source>
+        <comment>Toggle Media Loop Playback</comment>
+        <translation>ループのオン/オフの切替</translation>
+    </message>
+    <message>
+        <source>Enter Fullscreen</source>
+        <comment>Switch Video to Fullscreen</comment>
+        <translation>フルスクリーン表示</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <comment>Play</comment>
+        <translation>再生</translation>
+    </message>
+    <message>
+        <source>Pause</source>
+        <comment>Pause</comment>
+        <translation>一時停止</translation>
+    </message>
+    <message>
+        <source>Mute</source>
+        <comment>Mute</comment>
+        <translation>ミュート</translation>
+    </message>
+    <message>
         <source>Open Frame</source>
         <comment>Open Frame in New Window context menu item</comment>
         <translation>フレームを新しいウィンドウで開く</translation>
@@ -7051,6 +7242,11 @@ Please choose a different file name.</source>
         <translation>貼り付け</translation>
     </message>
     <message>
+        <source>Select All</source>
+        <comment>Select All context menu item</comment>
+        <translation>すべてを選択</translation>
+    </message>
+    <message>
         <source>No Guesses Found</source>
         <comment>No Guesses Found context menu item</comment>
         <translation>推測候補はありません</translation>
@@ -7529,10 +7725,6 @@ Please choose a different file name.</source>
         <translation>文章の末尾にカーソルを移動</translation>
     </message>
     <message>
-        <source>Select all</source>
-        <translation>すべてを選択</translation>
-    </message>
-    <message>
         <source>Select to the next character</source>
         <translation>次の文字を選択</translation>
     </message>
@@ -8030,6 +8222,101 @@ Please choose a different file name.</source>
     </message>
 </context>
 <context>
+    <name>QmlJSDebugger::LiveSelectionTool</name>
+    <message>
+        <source>Items</source>
+        <translation>アイテム</translation>
+    </message>
+</context>
+<context>
+    <name>QmlJSDebugger::QmlToolBar</name>
+    <message>
+        <source>Inspector Mode</source>
+        <translation>インスペクタモード</translation>
+    </message>
+    <message>
+        <source>Play/Pause Animations</source>
+        <translation>アニメーションの再生/一時停止</translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation>選択</translation>
+    </message>
+    <message>
+        <source>Select (Marquee)</source>
+        <translation type="unfinished">セレクト (Marquee)</translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation>ズーム</translation>
+    </message>
+    <message>
+        <source>Color Picker</source>
+        <translation>カラーピッカー</translation>
+    </message>
+    <message>
+        <source>Apply Changes to QML Viewer</source>
+        <translation>変更を QML Viewer へ適用する</translation>
+    </message>
+    <message>
+        <source>Apply Changes to Document</source>
+        <translation>変更をドキュメントへ適用する</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation>ツール</translation>
+    </message>
+    <message>
+        <source>1x</source>
+        <translation>1倍</translation>
+    </message>
+    <message>
+        <source>0.5x</source>
+        <translation>0.5倍</translation>
+    </message>
+    <message>
+        <source>0.25x</source>
+        <translation>0.25倍</translation>
+    </message>
+    <message>
+        <source>0.125x</source>
+        <translation>0.125倍</translation>
+    </message>
+    <message>
+        <source>0.1x</source>
+        <translation>0.1倍</translation>
+    </message>
+</context>
+<context>
+    <name>QmlJSDebugger::ToolBarColorBox</name>
+    <message>
+        <source>Copy Color</source>
+        <translation>色をコピー</translation>
+    </message>
+</context>
+<context>
+    <name>QmlJSDebugger::ToolBox</name>
+    <message>
+        <source>Qt Quick Toolbox</source>
+        <translation>Qt Quick ツールボックス</translation>
+    </message>
+</context>
+<context>
+    <name>QmlJSDebugger::ZoomTool</name>
+    <message>
+        <source>Zoom to &amp;100%</source>
+        <translation>&amp;100% 表示</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>拡大</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>縮小</translation>
+    </message>
+</context>
+<context>
     <name>QtXmlPatterns</name>
     <message>
         <source>%1 is an unsupported encoding.</source>
@@ -8913,7 +9200,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Complex type %1 cannot be derived from base type %2%3.</source>
-        <translation>複合型 %1 は基底型 %2 から派生する事はできません %3。</translation>
+        <translation>複合型 %1 は基底型 %2%3 から派生する事はできません。</translation>
     </message>
     <message>
         <source>Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.</source>
diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts
index d399b6d..19c0544 100644
--- a/translations/qt_ru.ts
+++ b/translations/qt_ru.ts
@@ -9,10 +9,21 @@
     </message>
 </context>
 <context>
+    <name>Debugger::JSAgentWatchData</name>
+    <message>
+        <source>[Array of length %1]</source>
+        <translation>[Массив размером %1]</translation>
+    </message>
+    <message>
+        <source>&lt;undefined&gt;</source>
+        <translation>&lt;неопределено&gt;</translation>
+    </message>
+</context>
+<context>
     <name>FakeReply</name>
     <message>
-        <source>Fake error !</source>
-        <translation>Фиктивная ошибка !</translation>
+        <source>Fake error!</source>
+        <translation>Фиктивная ошибка!</translation>
     </message>
     <message>
         <source>Invalid URL</source>
@@ -1062,6 +1073,14 @@ to
 <context>
     <name>QAccessibleButton</name>
     <message>
+        <source>Uncheck</source>
+        <translation>Выключить</translation>
+    </message>
+    <message>
+        <source>Check</source>
+        <translation>Включить</translation>
+    </message>
+    <message>
         <source>Press</source>
         <translation>Нажать</translation>
     </message>
@@ -1722,10 +1741,6 @@ to
         <translation>Свойство псевдонима выходит за границы</translation>
     </message>
     <message>
-        <source>Invalid alias reference. An alias reference must be specified as &lt;id&gt; or &lt;id&gt;.&lt;property&gt;</source>
-        <translation type="obsolete">Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как &lt;id&gt; или &lt;id&gt;.&lt;property&gt;</translation>
-    </message>
-    <message>
         <source>Invalid alias reference. Unable to find id &quot;%1&quot;</source>
         <translation>Некорректная ссылка на псевдоним. Не удалось найти id «%1»</translation>
     </message>
@@ -2455,6 +2470,10 @@ to
         <source>Cannot create %1 for output</source>
         <translation>Невозможно создать %1 для вывода</translation>
     </message>
+    <message>
+        <source>No file engine available or engine does not support UnMapExtension</source>
+        <translation>Нет файлового движка или он не поддерживает UnMapExtension</translation>
+    </message>
 </context>
 <context>
     <name>QFileDialog</name>
@@ -3416,6 +3435,18 @@ Please verify the correct directory name was given.</source>
         <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
         <translation>Невозможно разрешить символ «%1» в %2: %3</translation>
     </message>
+    <message>
+        <source>&apos;%1&apos; is not an ELF object (%2)</source>
+        <translation>«%1» не является объектом ELF (%2)</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is not an ELF object</source>
+        <translation>«%1» не является объектом ELF</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is an invalid ELF object (%2)</source>
+        <translation>«%1» является неверным объектом ELF (%2)</translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
@@ -3513,6 +3544,10 @@ Please verify the correct directory name was given.</source>
         <source>%1: Unknown error %2</source>
         <translation>%1: Неизвестная ошибка %2</translation>
     </message>
+    <message>
+        <source>%1: Access denied</source>
+        <translation>%1: Доступ запрещён</translation>
+    </message>
 </context>
 <context>
     <name>QMYSQLDriver</name>
@@ -3854,10 +3889,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessDataBackend</name>
     <message>
-        <source>Operation not supported on %1</source>
-        <translation>Операция не поддерживается для %1</translation>
-    </message>
-    <message>
         <source>Invalid URI: %1</source>
         <translation>Некорректный URI: %1</translation>
     </message>
@@ -3952,6 +3983,10 @@ Please verify the correct directory name was given.</source>
         <translation>Ошибка сетевой сессии.</translation>
     </message>
     <message>
+        <source>backend start error.</source>
+        <translation>ошибка запуска драйвера.</translation>
+    </message>
+    <message>
         <source>Temporary network failure.</source>
         <translation>Временная ошибка сети.</translation>
     </message>
@@ -4145,6 +4180,10 @@ Please verify the correct directory name was given.</source>
         <source>PulseAudio Sound Server</source>
         <translation>Звуковой сервер PulseAudio</translation>
     </message>
+    <message>
+        <source>Host not found</source>
+        <translation>Узел не найден</translation>
+    </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
@@ -5446,16 +5485,16 @@ Please choose a different file name.</source>
         <translation>%1: системой наложены ограничения на размер</translation>
     </message>
     <message>
+        <source>%1: bad name</source>
+        <translation>%1: неверное имя</translation>
+    </message>
+    <message>
         <source>%1: not attached</source>
         <translation>%1: не приложенный</translation>
     </message>
     <message>
         <source>%1: invalid size</source>
-        <translation>%1: некорректный размер</translation>
-    </message>
-    <message>
-        <source>%1: key error</source>
-        <translation>%1: некорректный ключ</translation>
+        <translation>%1: неверный размер</translation>
     </message>
     <message>
         <source>%1: size query failed</source>
@@ -6320,7 +6359,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Flip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Крышка</translation>
     </message>
     <message>
         <source>Ctrl</source>
@@ -6681,6 +6720,121 @@ Please choose a different file name.</source>
     </message>
 </context>
 <context>
+    <name>QSymbianSocketEngine</name>
+    <message>
+        <source>Unable to initialize non-blocking socket</source>
+        <translation>Невозможно инициализировать не-блочный сокет</translation>
+    </message>
+    <message>
+        <source>Unable to initialize broadcast socket</source>
+        <translation>Невозможно инициализировать широковещательный сокет</translation>
+    </message>
+    <message>
+        <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
+        <translation>Попытка использовать IPv6 на платформе, не поддерживающей IPv6</translation>
+    </message>
+    <message>
+        <source>The remote host closed the connection</source>
+        <translation>Удалённый узел закрыл соединение</translation>
+    </message>
+    <message>
+        <source>Network operation timed out</source>
+        <translation>Время на сетевую операцию истекло</translation>
+    </message>
+    <message>
+        <source>Out of resources</source>
+        <translation>Недостаточно ресурсов</translation>
+    </message>
+    <message>
+        <source>Unsupported socket operation</source>
+        <translation>Операция с сокетом не поддерживается</translation>
+    </message>
+    <message>
+        <source>Protocol type not supported</source>
+        <translation>Протокол не поддерживается</translation>
+    </message>
+    <message>
+        <source>Invalid socket descriptor</source>
+        <translation>Некорректный дескриптор сокета</translation>
+    </message>
+    <message>
+        <source>Host unreachable</source>
+        <translation>Узел недоступен</translation>
+    </message>
+    <message>
+        <source>Network unreachable</source>
+        <translation>Сеть недоступна</translation>
+    </message>
+    <message>
+        <source>Permission denied</source>
+        <translation>Доступ запрещён</translation>
+    </message>
+    <message>
+        <source>Connection timed out</source>
+        <translation>Время на соединение истекло</translation>
+    </message>
+    <message>
+        <source>Connection refused</source>
+        <translation>Отказано в соединении</translation>
+    </message>
+    <message>
+        <source>The bound address is already in use</source>
+        <translation>Адрес уже используется</translation>
+    </message>
+    <message>
+        <source>The address is not available</source>
+        <translation>Адрес недоступен</translation>
+    </message>
+    <message>
+        <source>The address is protected</source>
+        <translation>Адрес защищён</translation>
+    </message>
+    <message>
+        <source>Datagram was too large to send</source>
+        <translation>Датаграмма слишком большая для отправки</translation>
+    </message>
+    <message>
+        <source>Unable to send a message</source>
+        <translation>Невозможно отправить сообщение</translation>
+    </message>
+    <message>
+        <source>Unable to receive a message</source>
+        <translation>Невозможно получить сообщение</translation>
+    </message>
+    <message>
+        <source>Unable to write</source>
+        <translation>Невозможно записать</translation>
+    </message>
+    <message>
+        <source>Network error</source>
+        <translation>Ошибка сети</translation>
+    </message>
+    <message>
+        <source>Another socket is already listening on the same port</source>
+        <translation>Другой сокет уже прослушивает этот порт</translation>
+    </message>
+    <message>
+        <source>Operation on non-socket</source>
+        <translation>Операция с не-сокетом</translation>
+    </message>
+    <message>
+        <source>The proxy type is invalid for this operation</source>
+        <translation>Некорректный тип прокси-сервера для данной операции</translation>
+    </message>
+    <message>
+        <source>The address is invalid for this operation</source>
+        <translation>Данный адрес не допустим для этой операции</translation>
+    </message>
+    <message>
+        <source>The specified network session is not opened</source>
+        <translation>Указанная сетевая сессия не открыта</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Неизвестная ошибка</translation>
+    </message>
+</context>
+<context>
     <name>QSystemSemaphore</name>
     <message>
         <source>%1: does not exist</source>
@@ -6699,6 +6853,10 @@ Please choose a different file name.</source>
         <translation>%1: уже существует</translation>
     </message>
     <message>
+        <source>%1: name error</source>
+        <translation>%1: ошибка в имени</translation>
+    </message>
+    <message>
         <source>%1: unknown error %2</source>
         <translation>%1: неизвестная ошибка %2</translation>
     </message>
@@ -6788,11 +6946,21 @@ Please choose a different file name.</source>
 <context>
     <name>QUndoGroup</name>
     <message>
+        <source>Undo %1</source>
+        <translation>Отменить %1</translation>
+    </message>
+    <message>
         <source>Undo</source>
+        <comment>Default text for undo action</comment>
         <translation>Отменить действие</translation>
     </message>
     <message>
+        <source>Redo %1</source>
+        <translation>Повторить %1</translation>
+    </message>
+    <message>
         <source>Redo</source>
+        <comment>Default text for redo action</comment>
         <translation>Повторить действие</translation>
     </message>
 </context>
@@ -6806,11 +6974,21 @@ Please choose a different file name.</source>
 <context>
     <name>QUndoStack</name>
     <message>
+        <source>Undo %1</source>
+        <translation>Отменить %1</translation>
+    </message>
+    <message>
         <source>Undo</source>
+        <comment>Default text for undo action</comment>
         <translation>Отменить действие</translation>
     </message>
     <message>
+        <source>Redo %1</source>
+        <translation>Повторить %1</translation>
+    </message>
+    <message>
         <source>Redo</source>
+        <comment>Default text for redo action</comment>
         <translation>Повторить действие</translation>
     </message>
 </context>
@@ -6887,6 +7065,10 @@ Please choose a different file name.</source>
         <source>File does not exist</source>
         <translation>Файл не существует</translation>
     </message>
+    <message>
+        <source>Loading is handled by the media engine</source>
+        <translation>Загрузка выполняется мультимедиа-подсистемой</translation>
+    </message>
 </context>
 <context>
     <name>QWebPage</name>
@@ -6899,10 +7081,6 @@ Please choose a different file name.</source>
         <translation>Достигнут предел переадресации</translation>
     </message>
     <message>
-        <source>Bad HTTP request</source>
-        <translation>Некорректный HTTP-запрос</translation>
-    </message>
-    <message>
         <source>Scroll here</source>
         <translation>Прокрутить сюда</translation>
     </message>
@@ -7023,10 +7201,6 @@ Please choose a different file name.</source>
         <translation>Переместить указатель в конец документа</translation>
     </message>
     <message>
-        <source>Select all</source>
-        <translation>Выделить всё</translation>
-    </message>
-    <message>
         <source>Select to the next character</source>
         <translation>Выделить до следующего символа</translation>
     </message>
@@ -7173,6 +7347,11 @@ Please choose a different file name.</source>
         <translation>Файл не указан</translation>
     </message>
     <message>
+        <source>Details</source>
+        <comment>text to display in &lt;details&gt; tag when it has no &lt;summary&gt; child</comment>
+        <translation>Подробности</translation>
+    </message>
+    <message>
         <source>Open in New Window</source>
         <comment>Open in New Window context menu item</comment>
         <translation>Открыть в новом окне</translation>
@@ -7203,6 +7382,61 @@ Please choose a different file name.</source>
         <translation>Копировать изображение</translation>
     </message>
     <message>
+        <source>Copy Image Address</source>
+        <comment>Copy Image Address menu item</comment>
+        <translation>Скопировать адрес изображения</translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <comment>Open Video in New Window</comment>
+        <translation>Открыть видео</translation>
+    </message>
+    <message>
+        <source>Open Audio</source>
+        <comment>Open Audio in New Window</comment>
+        <translation>Открыть аудио</translation>
+    </message>
+    <message>
+        <source>Copy Video</source>
+        <comment>Copy Video Link Location</comment>
+        <translation>Скопировать видео</translation>
+    </message>
+    <message>
+        <source>Copy Audio</source>
+        <comment>Copy Audio Link Location</comment>
+        <translation>Скопировать аудио</translation>
+    </message>
+    <message>
+        <source>Toggle Controls</source>
+        <comment>Toggle Media Controls</comment>
+        <translation type="unfinished">Вкл/выкл управление</translation>
+    </message>
+    <message>
+        <source>Toggle Loop</source>
+        <comment>Toggle Media Loop Playback</comment>
+        <translation type="unfinished">Вкл/выкл зацикленность</translation>
+    </message>
+    <message>
+        <source>Enter Fullscreen</source>
+        <comment>Switch Video to Fullscreen</comment>
+        <translation>Полноэкранный режим</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <comment>Play</comment>
+        <translation>Воспроизвести</translation>
+    </message>
+    <message>
+        <source>Pause</source>
+        <comment>Pause</comment>
+        <translation>Приостановить</translation>
+    </message>
+    <message>
+        <source>Mute</source>
+        <comment>Mute</comment>
+        <translation>Приглушить</translation>
+    </message>
+    <message>
         <source>Open Frame</source>
         <comment>Open Frame in New Window context menu item</comment>
         <translation>Открыть фрейм</translation>
@@ -7243,6 +7477,11 @@ Please choose a different file name.</source>
         <translation>Вставить</translation>
     </message>
     <message>
+        <source>Select All</source>
+        <comment>Select All context menu item</comment>
+        <translation>Выделить всё</translation>
+    </message>
+    <message>
         <source>No Guesses Found</source>
         <comment>No Guesses Found context menu item</comment>
         <translation>Совпадений не найдено</translation>
@@ -7977,6 +8216,101 @@ Please choose a different file name.</source>
     </message>
 </context>
 <context>
+    <name>QmlJSDebugger::LiveSelectionTool</name>
+    <message>
+        <source>Items</source>
+        <translation>Элементы</translation>
+    </message>
+</context>
+<context>
+    <name>QmlJSDebugger::QmlToolBar</name>
+    <message>
+        <source>Inspector Mode</source>
+        <translation>Режим инспектирования</translation>
+    </message>
+    <message>
+        <source>Play/Pause Animations</source>
+        <translation>Запустить/приостановить анимации</translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation>Выбрать</translation>
+    </message>
+    <message>
+        <source>Select (Marquee)</source>
+        <translation>Выбрать (Маркет)</translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation>Масштаб</translation>
+    </message>
+    <message>
+        <source>Color Picker</source>
+        <translation>Пипетка</translation>
+    </message>
+    <message>
+        <source>Apply Changes to QML Viewer</source>
+        <translation>Использовать изменения в просмотрщике QML</translation>
+    </message>
+    <message>
+        <source>Apply Changes to Document</source>
+        <translation>Применить изменения к документу</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation>Инструменты</translation>
+    </message>
+    <message>
+        <source>1x</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>0.5x</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>0.25x</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>0.125x</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>0.1x</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>QmlJSDebugger::ToolBarColorBox</name>
+    <message>
+        <source>Copy Color</source>
+        <translation>Скопировать цвет</translation>
+    </message>
+</context>
+<context>
+    <name>QmlJSDebugger::ToolBox</name>
+    <message>
+        <source>Qt Quick Toolbox</source>
+        <translation>Инструментарий Qt Quick</translation>
+    </message>
+</context>
+<context>
+    <name>QmlJSDebugger::ZoomTool</name>
+    <message>
+        <source>Zoom to &amp;100%</source>
+        <translation>Масштаб &amp;100%</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Увеличить</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Уменьшить</translation>
+    </message>
+</context>
+<context>
     <name>QtXmlPatterns</name>
     <message>
         <source>At least one component must be present.</source>
@@ -8732,7 +9066,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>%1 has inheritance loop in its base type %2.</source>
-        <translation type="unfinished">У %1 зациклено наследование в его базовом типе %2.</translation>
+        <translation>У %1 зациклено наследование в его базовом типе %2.</translation>
     </message>
     <message>
         <source>Circular inheritance of base type %1.</source>
@@ -8740,15 +9074,15 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Circular inheritance of union %1.</source>
-        <translation type="unfinished">Цикличное наследование базового объединения %1.</translation>
+        <translation>Цикличное наследование объединения %1.</translation>
     </message>
     <message>
         <source>%1 is not allowed to derive from %2 by restriction as the latter defines it as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не может наследовать %2 через ограничение, так как ранее определено, что он конечный.</translation>
     </message>
     <message>
         <source>%1 is not allowed to derive from %2 by extension as the latter defines it as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не может наследовать %2 через расширение, так как ранее определено, что он конечный.</translation>
     </message>
     <message>
         <source>Base type of simple type %1 cannot be complex type %2.</source>
@@ -8768,7 +9102,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Simple type %1 cannot derive from %2 as the latter defines restriction as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>Простой тип %1 не может наследовать %2, так как есть ограничение, определяющее его конечным.</translation>
     </message>
     <message>
         <source>Variety of item type of %1 must be either atomic or union.</source>
@@ -8780,7 +9114,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>%1 is not allowed to derive from %2 by list as the latter defines it as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не может наследовать %2 через список, так как ранее определено, что он конечный.</translation>
     </message>
     <message>
         <source>Simple type %1 is only allowed to have %2 facet.</source>
@@ -8792,7 +9126,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Base type of simple type %1 has defined derivation by restriction as final.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Базовый тип простого типа %1 определён конечным исходя из ограничения.</translation>
     </message>
     <message>
         <source>Item type of base type does not match item type of %1.</source>
@@ -8804,7 +9138,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>%1 is not allowed to derive from %2 by union as the latter defines it as final.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не может наследовать %2 через объединение, так как ранее определено, что он конечный.</translation>
     </message>
     <message>
         <source>%1 is not allowed to have any facets.</source>
@@ -8812,11 +9146,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Base type %1 of simple type %2 must have variety of union.</source>
-        <translation type="unfinished">Базовый тип %1 простого типа %2 должен содержать какое-то объединение.</translation>
+        <translation>Базовый тип %1 простого типа %2 должен содержать какое-то объединение.</translation>
     </message>
     <message>
         <source>Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>Базовый тип %1 простого типа %2 не может иметь ограничение для атрибута %3.</translation>
     </message>
     <message>
         <source>Member type %1 cannot be derived from member type %2 of %3&apos;s base type %4.</source>
diff --git a/translations/qtconfig_ja.ts b/translations/qtconfig_ja.ts
index 8440389..332eb8b 100644
--- a/translations/qtconfig_ja.ts
+++ b/translations/qtconfig_ja.ts
@@ -5,23 +5,23 @@
     <name>MainWindow</name>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Appearance&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to customize the appearance of your Qt applications.&lt;/p&gt;&lt;p&gt;You can select the default GUI Style from the drop down list and customize the colors.&lt;/p&gt;&lt;p&gt;Any GUI Style plugins in your plugin path will automatically be added to the list of built-in Qt styles. (See the Library Paths tab for information on adding new plugin paths.)&lt;/p&gt;&lt;p&gt;When you choose 3-D Effects and Window Background colors, the Qt Configuration program will automatically generate a palette for you. To customize colors further, press the Tune Palette button to open the advanced palette editor.&lt;p&gt;The Preview Window shows what the selected Style and colors look like.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;外観&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;このタブでは Qt アプリケーションの外観をカスタマイズします。&lt;/p&gt;&lt;p&gt;ドロップダウンリストからデフォルトの GUI スタイルを選択して、その色をカスタマイズできます。&lt;/p&gt;&lt;p&gt;プラグインパスにある全てのプラグインが自動的にQt のビルトインスタイルのリストに追加されます。 (See the Library Paths tab for information on adding new plugin paths.)&lt;/p&gt;&lt;p&gt;3D 効果とウィンドウの背景色を選択した場合、Qt 設定ツールは自動的にパレットを生成します。さらに色をカスタマイズするには、パレットの調整ボタンを押して拡張パレットエディタを開いてください。&lt;p&gt;プレビューウィンドウでは選択したスタイルと色がどのように見えるかを確認できます。</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Fonts&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to select the default font for your Qt applications. The selected font is shown (initially as &apos;Sample Text&apos;) in the line edit below the Family, Style and Point Size drop down lists.&lt;/p&gt;&lt;p&gt;Qt has a powerful font substitution feature that allows you to specify a list of substitute fonts.  Substitute fonts are used when a font cannot be loaded, or if the specified font doesn&apos;t have a particular character.&lt;p&gt;For example, if you select the font Lucida, which doesn&apos;t have Korean characters, but need to show some Korean text using the Mincho font family you can do so by adding Mincho to the list. Once Mincho is added, any Korean characters that are not found in the Lucida font will be taken from the Mincho font.  Because the font substitutions are lists, you can also select multiple families, such as Song Ti (for use with Chinese text).</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;フォント&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;このタブでは Qt アプリケーションのデフォルトフォントの設定を行います。選択したフォントはファミリー、スタイル、ポイントサイズのドロップダウンリストの下にあるラインエディタに(初期値は「テキストのサンプル」で)表示されます。&lt;/p&gt;&lt;p&gt;Qt には強力なフォント置換機能があり、置換するフォントのリストを指定することができます。置換するフォントはフォントが読み込めない場合や指定したフォントが特定の文字を持たない場合に使用されます。&lt;/p&gt;&lt;p&gt;例えば、漢字を持たない Lucida フォントを選択した場合に、リストに明朝体のフォントを追加すれば漢字からなる文字列を明朝体で表示することができます。明朝体のフォントが追加してある場合、Lucida フォントに含まれない全ての漢字が明朝体のフォントから用いられます。フォントの置換機能では、ハングル等の複数のファミリーを指定することができます。</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Interface&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to customize the feel of your Qt applications.&lt;/p&gt;&lt;p&gt;If the Resolve Symlinks checkbox is checked Qt will follow symlinks when handling URLs. For example, in the file dialog, if this setting is turned on and /usr/tmp is a symlink to /var/tmp, entering the /usr/tmp directory will cause the file dialog to change to /var/tmp.  With this setting turned off, symlinks are not resolved or followed.&lt;/p&gt;&lt;p&gt;The Global Strut setting is useful for people who require a minimum size for all widgets (e.g. when using a touch panel or for users who are visually impaired).  Leaving the Global Strut width and height at 0 will disable the Global Strut feature&lt;/p&gt;&lt;p&gt;XIM (Extended Input Methods) are used for entering characters in languages that have large character sets, for example, Chinese and Japanese.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;インターフェース&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;このタブでは Qt アプリケーションの操作感をカスタマイズします。&lt;/p&gt;&lt;p&gt;「URL でのシンボリックリンクを解決」チェックボックスがチェックされている場合、Qt が URL を処理する際にシンボリックリンクを追跡します。例えば、この設定がオンで /usr/tmp が /var/tmp へのシンボリックリンクの場合、ファイルダイアログで /usr/tmp を表示しようとすると /var/tmp へ移動します。この設定がオフの場合、シンボリックリンクの解決や追跡は行われません。&lt;/p&gt;&lt;p&gt;「グローバルな設定」は全てのウィジェットに最小サイズが必要な場合(例えば、タッチパネルを使用していたり、目の不自由な方々など)に有用です。幅の最小値と高さの最小値を0にするとこの機能が無効になります。&lt;/p&gt;&lt;p&gt;XIM (インプットメソッド) は中国語や日本語のような、多数の文字を持つ言語で文字の入力に用いられています。</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Printer&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to configure the way Qt generates output for the printer.You can specify if Qt should try to embed fonts into its generated output.If you enable font embedding, the resulting postscript will be more portable and will more accurately reflect the visual output on the screen; however the resulting postscript file size will be bigger.&lt;p&gt;When using font embedding you can select additional directories where Qt should search for embeddable font files.  By default, the X server font path is used.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;プリンタ&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;このタブでは Qt が印刷する際に生成する出力の設定を行います。Qt が生成された印刷物にフォントを埋め込もうとするかどうかを指定できます。フォントを埋め込む場合、生成された PostScript の可搬性が増し、その見た目は画面上の表示をより正確に反映したものとなります。その反面、生成された PostScript ファイルのサイズが大きくなります。&lt;p&gt;フォントを埋め込む場合、Qt が埋め込むフォントファイルを検索するディレクトリを追加で選択することができます。デフォルトでは X サーバーのフォントパスが使われます。</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Phonon&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to configure the Phonon GStreamer multimedia backend. &lt;p&gt;It is reccommended to leave all settings on &quot;Auto&quot; to let Phonon determine your settings automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Phonon&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;このタブでは Phonon の GStreamer マルチメディアバックエンドの設定を行います。&lt;p&gt;全ての設定を &quot;自動&quot; にして Phonon に自動的に設定させることを推奨します。</translation>
     </message>
     <message>
         <source>Desktop Settings (Default)</source>
@@ -36,6 +36,10 @@
         <translation>On The Spot</translation>
     </message>
     <message>
+        <source>Unknown</source>
+        <translation>不明</translation>
+    </message>
+    <message>
         <source>Auto (default)</source>
         <translation>自動(デフォルト)</translation>
     </message>
@@ -92,6 +96,10 @@
         <translation>保存中…</translation>
     </message>
     <message>
+        <source>Saved changes.</source>
+        <translation>変更を保存しました。</translation>
+    </message>
+    <message>
         <source>Over The Spot</source>
         <translation>Over The Spot</translation>
     </message>
@@ -124,25 +132,6 @@
         <translation>変更内容を設定に保存しますか？</translation>
     </message>
     <message>
-        <source>&amp;Yes</source>
-        <translation>はい(&amp;Y)</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation>いいえ(&amp;N)</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>キャンセル(&amp;C)</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindowBase</name>
-    <message>
-        <source>Qt Configuration</source>
-        <translation>Qt 設定ツール</translation>
-    </message>
-    <message>
         <source>Appearance</source>
         <translation>外観</translation>
     </message>
@@ -179,8 +168,8 @@
         <translation>パレットの設定</translation>
     </message>
     <message>
-        <source>&amp;3-D Effects:</source>
-        <translation>&amp;3D エフェクト:</translation>
+        <source>&amp;Button Background:</source>
+        <translation>ボタンのバックグラウンド(&amp;B):</translation>
     </message>
     <message>
         <source>Window Back&amp;ground:</source>
@@ -188,11 +177,11 @@
     </message>
     <message>
         <source>&amp;Tune Palette...</source>
-        <translation>パレットを調整(&amp;T)...</translation>
+        <translation>パレットの調整(&amp;T)...</translation>
     </message>
     <message>
         <source>Please use the KDE Control Center to set the palette.</source>
-        <translation>KDE のコントロールセンターでパレットの設定をしてください。</translation>
+        <translation>KDE のシステム設定でパレットの設定をしてください。</translation>
     </message>
     <message>
         <source>Fonts</source>
@@ -284,7 +273,7 @@
     </message>
     <message>
         <source>Resolve symlinks in URLs</source>
-        <translation>URL のシンボリックリンクの解決</translation>
+        <translation>URL でのシンボリックリンクを解決</translation>
     </message>
     <message>
         <source>GUI Effects</source>
@@ -328,7 +317,7 @@
     </message>
     <message>
         <source>Global Strut</source>
-        <translation>Global Strut</translation>
+        <translation>グローバルな設定</translation>
     </message>
     <message>
         <source>Minimum &amp;Width:</source>
@@ -351,22 +340,6 @@
         <translation>XIM のインプットスタイル:</translation>
     </message>
     <message>
-        <source>On The Spot</source>
-        <translation>On The Spot</translation>
-    </message>
-    <message>
-        <source>Over The Spot</source>
-        <translation>Over The Spot</translation>
-    </message>
-    <message>
-        <source>Off The Spot</source>
-        <translation>Off The Spot</translation>
-    </message>
-    <message>
-        <source>Root</source>
-        <translation>Root</translation>
-    </message>
-    <message>
         <source>Default Input Method:</source>
         <translation>デフォルトのインプットメソッド:</translation>
     </message>
@@ -411,32 +384,16 @@
         <translation>ウェブサイト:</translation>
     </message>
     <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <source>&lt;a href=&quot;http://phonon.kde.org&quot;&gt;http://phonon.kde.org/&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;http://phonon.kde.org&quot;&gt;http://phonon.kde.org/&lt;/a&gt;</translation>
     </message>
     <message>
         <source>About GStreamer</source>
         <translation>GStreamer について</translation>
     </message>
     <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <source>&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;http://gstreamer.freedesktop.org/&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;http://gstreamer.freedesktop.org/&lt;/a&gt;</translation>
     </message>
     <message>
         <source>GStreamer backend settings</source>
@@ -491,6 +448,10 @@ p, li { white-space: pre-wrap; }
         <translation>終了</translation>
     </message>
     <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
         <source>&amp;About</source>
         <translation>Qt 設定ツールについて(&amp;A)</translation>
     </message>
@@ -508,16 +469,12 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>PaletteEditorAdvancedBase</name>
+    <name>PaletteEditorAdvanced</name>
     <message>
         <source>Tune Palette</source>
         <translation>パレットの調整</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the palette of the current widget or form.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;パレットの編集&lt;/b&gt;&lt;p&gt;現在のウィジェットやフォームのパレットを変更してください。&lt;/p&gt;&lt;p&gt;自動生成されたパレットを使用するか、それぞれのグループ／役割に対して色を選択してください。&lt;/p&gt;&lt;p&gt;パレットの内容のプレビューセクションにある様々なウィジェットのレイアウトで確認できます。&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Select &amp;Palette:</source>
         <translation>パレットの選択(&amp;P):</translation>
     </message>
@@ -566,24 +523,36 @@ p, li { white-space: pre-wrap; }
         <translation>ウィンドウテキスト</translation>
     </message>
     <message>
-        <source>Button</source>
-        <translation>ボタン</translation>
-    </message>
-    <message>
         <source>Base</source>
         <translation>ベース</translation>
     </message>
     <message>
+        <source>AlternateBase</source>
+        <translation>その他のベース</translation>
+    </message>
+    <message>
+        <source>ToolTipBase</source>
+        <translation>ツールチップのベース</translation>
+    </message>
+    <message>
+        <source>ToolTipText</source>
+        <translation>ツールチップのテキスト</translation>
+    </message>
+    <message>
         <source>Text</source>
         <translation>テキスト</translation>
     </message>
     <message>
-        <source>BrightText</source>
-        <translation>明るいテキスト</translation>
+        <source>Button</source>
+        <translation>ボタン</translation>
     </message>
     <message>
         <source>ButtonText</source>
-        <translation>ボタンテキスト</translation>
+        <translation>ボタンのテキスト</translation>
+    </message>
+    <message>
+        <source>BrightText</source>
+        <translation>明るいテキスト</translation>
     </message>
     <message>
         <source>Highlight</source>
@@ -591,29 +560,25 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>HighlightedText</source>
-        <translation>ハイライトのテキスト</translation>
+        <translation>ハイライトされたテキスト</translation>
     </message>
     <message>
-        <source>&amp;Select Color:</source>
-        <translation>色の選択(&amp;S):</translation>
+        <source>Link</source>
+        <translation>リンク</translation>
     </message>
     <message>
-        <source>Choose a color</source>
-        <translation>色を選択してください</translation>
+        <source>LinkVisited</source>
+        <translation>訪問済みのリンク</translation>
     </message>
     <message>
-        <source>Choose a color for the selected central color role.</source>
-        <translation>選択された中央部の色の役割に使用する色を選択してください。</translation>
+        <source>&amp;Select Color:</source>
+        <translation>色の選択(&amp;S):</translation>
     </message>
     <message>
         <source>3-D shadow &amp;effects</source>
         <translation>3Dの影の効果(&amp;E)</translation>
     </message>
     <message>
-        <source>Build &amp;from button color</source>
-        <translation>ボタンの色から構築する(&amp;F)</translation>
-    </message>
-    <message>
         <source>Generate shadings</source>
         <translation>影を生成する</translation>
     </message>
@@ -622,6 +587,10 @@ p, li { white-space: pre-wrap; }
         <translation>3D効果の色をボタンの色から計算するにはチェックしてください。</translation>
     </message>
     <message>
+        <source>Build &amp;from button color</source>
+        <translation>ボタンの色から構築する(&amp;F)</translation>
+    </message>
+    <message>
         <source>Choose 3D-effect color role</source>
         <translation>3D効果の色の役割の選択</translation>
     </message>
@@ -654,24 +623,16 @@ p, li { white-space: pre-wrap; }
         <translation>色の選択(&amp;L):</translation>
     </message>
     <message>
-        <source>Choose a color for the selected effect color role.</source>
-        <translation>選択の効果の色の役割に使用する色を選択してください。</translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <source>Close dialog and apply all changes.</source>
-        <translation>全ての変更を適用してダイアログを閉じる。</translation>
+        <source>Choose a color</source>
+        <translation>色を選択してください</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>キャンセル</translation>
+        <source>Choose a color for the selected central color role.</source>
+        <translation>選択された中央部の色の役割に使用する色を選択してください。</translation>
     </message>
     <message>
-        <source>Close dialog and discard all changes.</source>
-        <translation>全ての変更を破棄してダイアログを閉じる。</translation>
+        <source>Choose a color for the selected effect color role.</source>
+        <translation>選択の効果の色の役割に使用する色を選択してください。</translation>
     </message>
 </context>
 <context>
@@ -682,14 +643,14 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>PreviewWidgetBase</name>
+    <name>PreviewWidget</name>
     <message>
         <source>Preview Window</source>
         <translation>プレビューウィンドウ</translation>
     </message>
     <message>
-        <source>ButtonGroup</source>
-        <translation>ボタングループ</translation>
+        <source>GroupBox</source>
+        <translation>グループボックス</translation>
     </message>
     <message>
         <source>RadioButton1</source>
@@ -704,8 +665,8 @@ p, li { white-space: pre-wrap; }
         <translation>ラジオボタン3</translation>
     </message>
     <message>
-        <source>ButtonGroup2</source>
-        <translation>ボタングループ2</translation>
+        <source>GroupBox2</source>
+        <translation>グループボックス2</translation>
     </message>
     <message>
         <source>CheckBox1</source>
@@ -728,18 +689,9 @@ p, li { white-space: pre-wrap; }
         <translation>プッシュボタン</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;
-&lt;/p&gt;
-&lt;p&gt;
-&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;
-&lt;/p&gt;</source>
-        <translation>&lt;p&gt;
-&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;
-&lt;/p&gt;
-&lt;p&gt;
-&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;
-&lt;/p&gt;</translation>
+        <source>&lt;p&gt;&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;&lt;/p&gt;</source>
+        <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts
index 07b7fd3..a200ac1 100644
--- a/translations/qtconfig_ru.ts
+++ b/translations/qtconfig_ru.ts
@@ -5,23 +5,23 @@
     <name>MainWindow</name>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Appearance&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to customize the appearance of your Qt applications.&lt;/p&gt;&lt;p&gt;You can select the default GUI Style from the drop down list and customize the colors.&lt;/p&gt;&lt;p&gt;Any GUI Style plugins in your plugin path will automatically be added to the list of built-in Qt styles. (See the Library Paths tab for information on adding new plugin paths.)&lt;/p&gt;&lt;p&gt;When you choose 3-D Effects and Window Background colors, the Qt Configuration program will automatically generate a palette for you. To customize colors further, press the Tune Palette button to open the advanced palette editor.&lt;p&gt;The Preview Window shows what the selected Style and colors look like.</source>
-        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Внешний вид&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить внешний вид приложений Qt.&lt;/p&gt;&lt;p&gt;Позволяет выбрать стиль интерфейса по умолчанию из выпадающего списка и настроить используемые стилем цвета.&lt;/p&gt;&lt;p&gt;Каждый стиль интерфейса, содержащийся в модулях, найденных в путях к модулям, автоматически добавляется в список встроенных стилей Qt (на вкладке Пути к библиотекам имеется более подробная информация о добавлении путей к модулям).&lt;/p&gt;&lt;p&gt;При выборе эффектов 3D и фоновых цветов окна программа настройки Qt автоматически создаст подходящую палитру. Для дальнейшей настройки цветов следует зайти в расширенный редактор палитры, нажав кнопку Настроить палитру.&lt;p&gt;В окне предпросмотра можно увидеть как будет выглядеть интерфейс с выбранными стилем и цветами.</translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Внешний вид&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить внешний вид приложений Qt.&lt;/p&gt;&lt;p&gt;Позволяет выбрать стиль интерфейса по умолчанию из выпадающего списка и настроить используемые стилем цвета.&lt;/p&gt;&lt;p&gt;Каждый стиль интерфейса, содержащийся в модулях, найденных в путях к модулям, автоматически добавляется в список встроенных стилей Qt (на вкладке Пути к библиотекам имеется более подробная информация о добавлении путей к модулям).&lt;/p&gt;&lt;p&gt;При выборе эффектов 3D и фоновых цветов окна программа настройки Qt автоматически создаст подходящую палитру. Для дальнейшей настройки цветов следует зайти в расширенный редактор палитры, нажав кнопку Настроить палитру.&lt;p&gt;В окне предпросмотра можно увидеть как будет выглядеть интерфейс с выбранными стилем и цветами.</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Fonts&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to select the default font for your Qt applications. The selected font is shown (initially as &apos;Sample Text&apos;) in the line edit below the Family, Style and Point Size drop down lists.&lt;/p&gt;&lt;p&gt;Qt has a powerful font substitution feature that allows you to specify a list of substitute fonts.  Substitute fonts are used when a font cannot be loaded, or if the specified font doesn&apos;t have a particular character.&lt;p&gt;For example, if you select the font Lucida, which doesn&apos;t have Korean characters, but need to show some Korean text using the Mincho font family you can do so by adding Mincho to the list. Once Mincho is added, any Korean characters that are not found in the Lucida font will be taken from the Mincho font.  Because the font substitutions are lists, you can also select multiple families, such as Song Ti (for use with Chinese text).</source>
-        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Шрифты&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно выбрать шрифт по умолчанию для приложений Qt. Выбранный шрифт отображается в строке редактирования ниже выпадающих списков &quot;Шрифт&quot;, &quot;Начертание&quot; и &quot;Размер&quot; (по умолчанию это текст &quot;Текст для примера (Sample Text)&quot;).&lt;/p&gt;&lt;p&gt;Qt обладает мощным механизмом подмены шрифтов, который позволяет задавать список подставляемых шрифтов. Подставляемые шрифты используются, когда шрифт не удаётся загрузить или в нём отсутствуют необходимые символы.&lt;p&gt;Например, если требуется, чтобы при выборе шрифта Lucida, в котором отсутствуют корейские иероглифы, для отображения корейского текста использовался шрифт Mincho,то можно добавить его в список. После этого все корейские символы, отсутствующие в шрифте Lucida, будут браться из шрифта Mincho. Так как для замены используется список, то можно добавлять несколько шрифтов, например, можно также добавить шрифт Song Ti для отображения китайского текста.</translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Шрифты&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно выбрать шрифт по умолчанию для приложений Qt. Выбранный шрифт отображается в строке редактирования ниже выпадающих списков &quot;Шрифт&quot;, &quot;Начертание&quot; и &quot;Размер&quot; (по умолчанию это текст &quot;Текст для примера (Sample Text)&quot;).&lt;/p&gt;&lt;p&gt;Qt обладает мощным механизмом подмены шрифтов, который позволяет задавать список подставляемых шрифтов. Подставляемые шрифты используются, когда шрифт не удаётся загрузить или в нём отсутствуют необходимые символы.&lt;p&gt;Например, если требуется, чтобы при выборе шрифта Lucida, в котором отсутствуют корейские иероглифы, для отображения корейского текста использовался шрифт Mincho,то можно добавить его в список. После этого все корейские символы, отсутствующие в шрифте Lucida, будут браться из шрифта Mincho. Так как для замены используется список, то можно добавлять несколько шрифтов, например, можно также добавить шрифт Song Ti для отображения китайского текста.</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Interface&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to customize the feel of your Qt applications.&lt;/p&gt;&lt;p&gt;If the Resolve Symlinks checkbox is checked Qt will follow symlinks when handling URLs. For example, in the file dialog, if this setting is turned on and /usr/tmp is a symlink to /var/tmp, entering the /usr/tmp directory will cause the file dialog to change to /var/tmp.  With this setting turned off, symlinks are not resolved or followed.&lt;/p&gt;&lt;p&gt;The Global Strut setting is useful for people who require a minimum size for all widgets (e.g. when using a touch panel or for users who are visually impaired).  Leaving the Global Strut width and height at 0 will disable the Global Strut feature&lt;/p&gt;&lt;p&gt;XIM (Extended Input Methods) are used for entering characters in languages that have large character sets, for example, Chinese and Japanese.</source>
-        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Интерфейс&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить поведение приложений Qt.&lt;/p&gt;&lt;p&gt;Если включено &quot;Разрешать символьные ссылки&quot;, Qt будет следовать по символьным ссылкам при обработке путей URL. Например, если эта функция включена и /usr/tmp является символьной ссылкой на /var/tmp, то в диалоге выбора файла при вводе пути к каталогу /usr/tmp он будет изменён на /var/tmp.&lt;/p&gt;&lt;p&gt;Функция &quot;Минимальные размеры&quot; предназначены для тех, кому необходимо чтобы элементы интерфейса были не менее заданного размера (например, при использовании сенсорной панели или для людей с проблемами зрения). Если задать 0 в полях &quot;минимальная ширина&quot; и &quot;минимальная высота&quot;, то данная функция будет отключена.&lt;/p&gt;&lt;p&gt;Метод ввода XIM (расширенные методы ввода) используется для ввода символов на языках с большим набором символов (например, китайском или японском).</translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Интерфейс&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить поведение приложений Qt.&lt;/p&gt;&lt;p&gt;Если включено &quot;Разрешать символьные ссылки&quot;, Qt будет следовать по символьным ссылкам при обработке путей URL. Например, если эта функция включена и /usr/tmp является символьной ссылкой на /var/tmp, то в диалоге выбора файла при вводе пути к каталогу /usr/tmp он будет изменён на /var/tmp.&lt;/p&gt;&lt;p&gt;Функция &quot;Минимальные размеры&quot; предназначены для тех, кому необходимо чтобы элементы интерфейса были не менее заданного размера (например, при использовании сенсорной панели или для людей с проблемами зрения). Если задать 0 в полях &quot;минимальная ширина&quot; и &quot;минимальная высота&quot;, то данная функция будет отключена.&lt;/p&gt;&lt;p&gt;Метод ввода XIM (расширенные методы ввода) используется для ввода символов на языках с большим набором символов (например, китайском или японском).</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Printer&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to configure the way Qt generates output for the printer.You can specify if Qt should try to embed fonts into its generated output.If you enable font embedding, the resulting postscript will be more portable and will more accurately reflect the visual output on the screen; however the resulting postscript file size will be bigger.&lt;p&gt;When using font embedding you can select additional directories where Qt should search for embeddable font files.  By default, the X server font path is used.</source>
-        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Принтер&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить способ, которым Qt будет подготавливать данные для печати. Можно указать следует ли встраивать шрифты - в этом случае напечатанные документы будут более похожи на те, что на экране, но при этом увеличится объём данных, передаваемых на печатающее устройство.&lt;p&gt;При использовании встраивания шрифтов можно указать дополнительные каталоги, в которых Qt будет искать файлы шрифтов для встраивания. По умолчанию используется путь к шрифтам X сервера.</translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Принтер&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить способ, которым Qt будет подготавливать данные для печати. Можно указать следует ли встраивать шрифты - в этом случае напечатанные документы будут более похожи на те, что на экране, но при этом увеличится объём данных, передаваемых на печатающее устройство.&lt;p&gt;При использовании встраивания шрифтов можно указать дополнительные каталоги, в которых Qt будет искать файлы шрифтов для встраивания. По умолчанию используется путь к шрифтам X сервера.</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Phonon&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to configure the Phonon GStreamer multimedia backend. &lt;p&gt;It is reccommended to leave all settings on &quot;Auto&quot; to let Phonon determine your settings automatically.</source>
-        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Phonon&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить мультимедийную подсистему Phonon GStreamer.&lt;p&gt;Рекомендуется оставить значение &quot;Автоматически&quot; для всех настроек, чтобы Phonon определил параметры самостоятельно.</translation>
+        <translation>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Phonon&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить мультимедийную подсистему Phonon GStreamer.&lt;p&gt;Рекомендуется оставить значение &quot;Автоматически&quot; для всех настроек, чтобы Phonon определил параметры самостоятельно.</translation>
     </message>
     <message>
         <source>Desktop Settings (Default)</source>
@@ -36,6 +36,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Unknown</source>
+        <translation>Неизвестный</translation>
+    </message>
+    <message>
         <source>Auto (default)</source>
         <translation>Автоматически (по умолчанию)</translation>
     </message>
@@ -92,6 +96,10 @@
         <translation>Сохранение изменений...</translation>
     </message>
     <message>
+        <source>Saved changes.</source>
+        <translation>Сохранённые изменения.</translation>
+    </message>
+    <message>
         <source>Over The Spot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -124,25 +132,6 @@
         <translation>Сохранить изменения настроек?</translation>
     </message>
     <message>
-        <source>&amp;Yes</source>
-        <translation>&amp;Да</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation>&amp;Нет</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>От&amp;мена</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindowBase</name>
-    <message>
-        <source>Qt Configuration</source>
-        <translation>Конфигурация Qt</translation>
-    </message>
-    <message>
         <source>Appearance</source>
         <translation>Внешний вид</translation>
     </message>
@@ -155,26 +144,6 @@
         <translation>&amp;Стиль интерфейса:</translation>
     </message>
     <message>
-        <source>Build Palette</source>
-        <translation>Палитра</translation>
-    </message>
-    <message>
-        <source>&amp;3-D Effects:</source>
-        <translation>Эффекты &amp;3D:</translation>
-    </message>
-    <message>
-        <source>Window Back&amp;ground:</source>
-        <translation>&amp;Фон окна:</translation>
-    </message>
-    <message>
-        <source>&amp;Tune Palette...</source>
-        <translation>&amp;Настроить палитру...</translation>
-    </message>
-    <message>
-        <source>Please use the KDE Control Center to set the palette.</source>
-        <translation>Используйте Центр управления KDE для настройки цветов.</translation>
-    </message>
-    <message>
         <source>Preview</source>
         <translation>Предпросмотр</translation>
     </message>
@@ -195,6 +164,26 @@
         <translation>Палитра выключенных элементов</translation>
     </message>
     <message>
+        <source>Build Palette</source>
+        <translation>Палитра</translation>
+    </message>
+    <message>
+        <source>&amp;Button Background:</source>
+        <translation>Фон &amp;кнопки:</translation>
+    </message>
+    <message>
+        <source>Window Back&amp;ground:</source>
+        <translation>&amp;Фон окна:</translation>
+    </message>
+    <message>
+        <source>&amp;Tune Palette...</source>
+        <translation>&amp;Настроить палитру...</translation>
+    </message>
+    <message>
+        <source>Please use the KDE Control Center to set the palette.</source>
+        <translation>Используйте Центр управления KDE для настройки цветов.</translation>
+    </message>
+    <message>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
@@ -256,7 +245,7 @@
     </message>
     <message>
         <source>Feel Settings</source>
-        <translation type="unfinished">Настройки поведения</translation>
+        <translation>Настройки поведения</translation>
     </message>
     <message>
         <source> ms</source>
@@ -296,7 +285,7 @@
     </message>
     <message>
         <source>Alt+E</source>
-        <translation>Alt+D</translation>
+        <translation></translation>
     </message>
     <message>
         <source>&amp;Menu Effect:</source>
@@ -351,22 +340,6 @@
         <translation>Стиль ввода XIM:</translation>
     </message>
     <message>
-        <source>On The Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Over The Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off The Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Root</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Input Method:</source>
         <translation>Метод ввода по умолчанию:</translation>
     </message>
@@ -411,32 +384,16 @@
         <translation>Вэб-сайт:</translation>
     </message>
     <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <source>&lt;a href=&quot;http://phonon.kde.org&quot;&gt;http://phonon.kde.org/&lt;/a&gt;</source>
+        <translation></translation>
     </message>
     <message>
         <source>About GStreamer</source>
         <translation>О GStreamer</translation>
     </message>
     <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <source>&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;http://gstreamer.freedesktop.org/&lt;/a&gt;</source>
+        <translation></translation>
     </message>
     <message>
         <source>GStreamer backend settings</source>
@@ -480,7 +437,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation></translation>
     </message>
     <message>
         <source>E&amp;xit</source>
@@ -491,6 +448,10 @@ p, li { white-space: pre-wrap; }
         <translation>Выход</translation>
     </message>
     <message>
+        <source>Ctrl+Q</source>
+        <translation></translation>
+    </message>
+    <message>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
@@ -508,16 +469,12 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>PaletteEditorAdvancedBase</name>
+    <name>PaletteEditorAdvanced</name>
     <message>
         <source>Tune Palette</source>
         <translation>Настройка палитры</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the palette of the current widget or form.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Изменение палитры&lt;/b&gt;&lt;p&gt;Изменение палитры текущего виджета или формы.&lt;/p&gt;&lt;p&gt;Используйте сформированную палитру или выберите цвета для каждой группы цветов и каждой их роли.&lt;/p&gt;&lt;p&gt;Палитру можно проверить на виджетах в разных режимах отображения в разделе предпросмотра.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Select &amp;Palette:</source>
         <translation>Выбор &amp;палитры:</translation>
     </message>
@@ -566,26 +523,39 @@ p, li { white-space: pre-wrap; }
         <translation>Текст окна</translation>
     </message>
     <message>
-        <source>Button</source>
-        <translation>Кнопка</translation>
-    </message>
-    <message>
         <source>Base</source>
         <translation>Фон</translation>
     </message>
     <message>
+        <source>AlternateBase</source>
+        <translation>Альтернативный Фон
+</translation>
+    </message>
+    <message>
+        <source>ToolTipBase</source>
+        <translation>Фон подсказки</translation>
+    </message>
+    <message>
+        <source>ToolTipText</source>
+        <translation>Текст подсказки</translation>
+    </message>
+    <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <source>BrightText</source>
-        <translation>Светлый текст</translation>
+        <source>Button</source>
+        <translation>Кнопка</translation>
     </message>
     <message>
         <source>ButtonText</source>
         <translation>Текст на кнопке</translation>
     </message>
     <message>
+        <source>BrightText</source>
+        <translation>Светлый текст</translation>
+    </message>
+    <message>
         <source>Highlight</source>
         <translation>Выделение</translation>
     </message>
@@ -594,26 +564,22 @@ p, li { white-space: pre-wrap; }
         <translation>Выделенный текст</translation>
     </message>
     <message>
-        <source>&amp;Select Color:</source>
-        <translation>&amp;Выбор цвета:</translation>
+        <source>Link</source>
+        <translation>Ссылка</translation>
     </message>
     <message>
-        <source>Choose a color</source>
-        <translation>Выберите цвет</translation>
+        <source>LinkVisited</source>
+        <translation>Посещённая ссылка</translation>
     </message>
     <message>
-        <source>Choose a color for the selected central color role.</source>
-        <translation>Выберите цвет для указанной роли.</translation>
+        <source>&amp;Select Color:</source>
+        <translation>&amp;Выбор цвета:</translation>
     </message>
     <message>
         <source>3-D shadow &amp;effects</source>
         <translation>Эффекты т&amp;рехмерной тени</translation>
     </message>
     <message>
-        <source>Build &amp;from button color</source>
-        <translation>Получ&amp;ить из цвета кнопки</translation>
-    </message>
-    <message>
         <source>Generate shadings</source>
         <translation>Создание полутонов</translation>
     </message>
@@ -622,6 +588,10 @@ p, li { white-space: pre-wrap; }
         <translation>Создать цвета эффекта трёхмерности из цвета кнопки.</translation>
     </message>
     <message>
+        <source>Build &amp;from button color</source>
+        <translation>Получ&amp;ить из цвета кнопки</translation>
+    </message>
+    <message>
         <source>Choose 3D-effect color role</source>
         <translation>Выбор роли цвета дял эффекта трёхмерности</translation>
     </message>
@@ -654,24 +624,16 @@ p, li { white-space: pre-wrap; }
         <translation>Выбор &amp;цвета:</translation>
     </message>
     <message>
-        <source>Choose a color for the selected effect color role.</source>
-        <translation>Выбор цвета для указанной роли.</translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation>Принять</translation>
-    </message>
-    <message>
-        <source>Close dialog and apply all changes.</source>
-        <translation>Закрыть окно с применением изменений.</translation>
+        <source>Choose a color</source>
+        <translation>Выберите цвет</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
+        <source>Choose a color for the selected central color role.</source>
+        <translation>Выберите цвет для указанной роли.</translation>
     </message>
     <message>
-        <source>Close dialog and discard all changes.</source>
-        <translation>Закрыть окно с отменой изменений.</translation>
+        <source>Choose a color for the selected effect color role.</source>
+        <translation>Выбор цвета для указанной роли.</translation>
     </message>
 </context>
 <context>
@@ -682,64 +644,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>PreviewWidgetBase</name>
+    <name>PreviewWidget</name>
     <message>
         <source>Preview Window</source>
         <translation>Окно предпросмотра</translation>
     </message>
     <message>
-        <source>ButtonGroup</source>
-        <translation>ButtonGroup</translation>
+        <source>GroupBox</source>
+        <translation type="unfinished">Объединение</translation>
     </message>
     <message>
         <source>RadioButton1</source>
-        <translation>RadioButton1</translation>
+        <translation type="unfinished">Переключатель1</translation>
     </message>
     <message>
         <source>RadioButton2</source>
-        <translation>RadioButton2</translation>
+        <translation type="unfinished">Переключатель2</translation>
     </message>
     <message>
         <source>RadioButton3</source>
-        <translation>RadioButton3</translation>
+        <translation type="unfinished">Переключатель3</translation>
     </message>
     <message>
-        <source>ButtonGroup2</source>
-        <translation>ButtonGroup2</translation>
+        <source>GroupBox2</source>
+        <translation type="unfinished">Объединение2</translation>
     </message>
     <message>
         <source>CheckBox1</source>
-        <translation>CheckBox1</translation>
+        <translation type="unfinished">Выключатель1</translation>
     </message>
     <message>
         <source>CheckBox2</source>
-        <translation>CheckBox2</translation>
+        <translation type="unfinished">Выключатель2</translation>
     </message>
     <message>
         <source>LineEdit</source>
-        <translation>LineEdit</translation>
+        <translation type="unfinished">Строка редактирования</translation>
     </message>
     <message>
         <source>ComboBox</source>
-        <translation>ComboBox</translation>
+        <translation type="unfinished">Выпадающий список</translation>
     </message>
     <message>
         <source>PushButton</source>
-        <translation>PushButton</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;
-&lt;/p&gt;
-&lt;p&gt;
-&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;
-&lt;/p&gt;</source>
-        <translation>&lt;p&gt;
-&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;
-&lt;/p&gt;
-&lt;p&gt;
-&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;
-&lt;/p&gt;</translation>
+        <translation type="unfinished">Простая кнопка</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;&lt;/p&gt;</source>
+        <translation></translation>
     </message>
 </context>
 </TS>