diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index f9c62be93dc927e3f644305988214a105006f4f8..126fd98c63da27f2dbd8f72057ebb9f8e8e01b3b 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -5,7 +5,7 @@
 
     \title Qt Creator Manual
 
-    \section1 Version 1.2.91
+    \section1 Version 1.2.93
 
     The goal of Qt Creator is to provide a cross-platform, complete Integrated
     Development Environment (IDE) to develop Qt projects. It is available for
@@ -1786,7 +1786,7 @@
     There are some known issues with Qt Creator.
     The development team is aware of those, there is no need to report them as bug.
 
-    \section1 Known Issues of Version 1.2.91
+    \section1 Known Issues of Version 1.2.93
 
     \list
         \o Gdb on Windows may not work if the 'Embassy \reg Security Center' software
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index 7663eb8c25549a274ab20fc873092adeac97663a..f9032af648414c781d9c2e929e45d7c69ead0765 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -19,16 +19,16 @@ sources.fileextensions  = "qtcreator.qdoc addressbook-sdk.qdoc"
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.1291
+qhp.QtCreator.namespace        = com.nokia.qtcreator.1293
 qhp.QtCreator.virtualFolder    = doc
 qhp.QtCreator.indexTitle       = Qt Creator
 qhp.QtCreator.indexRoot        =
 qhp.QtCreator.extraFiles       = classic.css \
                           images/qt-logo.png \
                           images/qtcreator-screenshots.png
-qhp.QtCreator.filterAttributes = qtcreator 1.2.91
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.2.91
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.2.91
+qhp.QtCreator.filterAttributes = qtcreator 1.2.93
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.2.93
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.2.93
 
 # macros.qdocconf
 
@@ -211,5 +211,5 @@ HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
                           "<td width=\"40%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
-                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Creator 1.2.91</div></td>\n" \
+                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Creator 1.2.93</div></td>\n" \
                           "</tr></table></div></address>"
diff --git a/scripts/replaceVersion.sh b/scripts/replaceVersion.sh
index 7460518405a6821d9540d64e9275d31ffeacde4e..1c309ff0e64012315eb5fde88350ff91d52e7153 100755
--- a/scripts/replaceVersion.sh
+++ b/scripts/replaceVersion.sh
@@ -81,18 +81,6 @@ sed \
 mv -f "${TMPFILE}" "${CORE_CONSTANT_H}"
 
 
-## Patch installer.rc
-TMPFILE=`mktemp versionPatch.XXXXXX`
-INSTALLER_RC="${SCRIPT_DIR}/../../dev/ide/nightly_builds/installer/installer.rc"
-echo "Patching \`${INSTALLER_RC}'"
-sed \
-        -e "s/"${OLD_DOT_FOUR}"/"${NEW_DOT_FOUR}"/" \
-        -e "s/"${OLD_COMMA_FOUR}"/"${NEW_COMMA_FOUR}"/" \
-    "${INSTALLER_RC}" > "${TMPFILE}"
-    p4 edit `sed -e 's/\/\.\//\//g' -e 's/\/[^\/]\+\/\.\.\//\//g' <<<"${INSTALLER_RC}"`
-mv -f "${TMPFILE}" "${INSTALLER_RC}"
-
-
 ## Patch Info.plist
 TMPFILE=`mktemp versionPatch.XXXXXX`
 INFO_PLIST="${SCRIPT_DIR}/src/app/Info.plist"
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 59049f2673a228c3f9246a10aca6e79fbe3aa2b1..072a41c6b145d80b0fa8427661627aad38043ab7 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -1177,7 +1177,7 @@ static void qDumpQAbstractItemModel(QDumper &d)
 
 static void qDumpQByteArray(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     const QByteArray &ba = *reinterpret_cast<const QByteArray *>(d.data);
 
     if (!ba.isEmpty()) {
@@ -1461,7 +1461,7 @@ int hashOffset(bool optimizedIntKey, bool forKey, unsigned keySize, unsigned val
 
 static void qDumpQHash(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     const char *keyType   = d.templateParameters[0];
     const char *valueType = d.templateParameters[1];
 
@@ -1569,7 +1569,7 @@ static void qDumpQHashNode(QDumper &d)
 #if USE_QT_GUI
 static void qDumpQImage(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     const QImage &im = *reinterpret_cast<const QImage *>(d.data);
     d.beginItem("value");
         d.put("(").put(im.width()).put("x").put(im.height()).put(")");
@@ -1611,7 +1611,7 @@ static void qDumpQImageData(QDumper &d)
 
 static void qDumpQList(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     // This uses the knowledge that QList<T> has only a single member
     // of type  union { QListData p; QListData::Data *d; };
 
@@ -1691,7 +1691,7 @@ static void qDumpQList(QDumper &d)
 
 static void qDumpQLinkedList(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     // This uses the knowledge that QLinkedList<T> has only a single member
     // of type  union { QLinkedListData *d; QLinkedListNode<T> *e; };
     const QLinkedListData *ldata =
@@ -1817,7 +1817,7 @@ static void qDumpQMapNode(QDumper &d)
 
 static void qDumpQMap(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     QMapData *h = *reinterpret_cast<QMapData *const*>(d.data);
     const char *keyType   = d.templateParameters[0];
     const char *valueType = d.templateParameters[1];
@@ -1956,7 +1956,7 @@ static void qDumpQModelIndex(QDumper &d)
 
 static void qDumpQObject(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     const QObject *ob = reinterpret_cast<const QObject *>(d.data);
     const QMetaObject *mo = ob->metaObject();
     d.putItem("value", ob->objectName());
@@ -2206,7 +2206,7 @@ static void qDumpQVariant(QDumper &d, const QVariant *v)
 
 static inline void qDumpQVariant(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(d.data);
     qDumpQVariant(d, reinterpret_cast<const QVariant *>(d.data));
 }
 
@@ -2832,7 +2832,7 @@ static void qDumpQSharedPointer(QDumper &d)
 
 static void qDumpQString(QDumper &d)
 {
-    //qCheckAccess(deref(d.data));
+    //qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     const QString &str = *reinterpret_cast<const QString *>(d.data);
 
     const int size = str.size();
@@ -2857,7 +2857,7 @@ static void qDumpQString(QDumper &d)
 
 static void qDumpQStringList(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     const QStringList &list = *reinterpret_cast<const QStringList *>(d.data);
     int n = list.size();
     if (n < 0)
@@ -2906,7 +2906,7 @@ static void qDumpQTextCodec(QDumper &d)
 
 static void qDumpQVector(QDumper &d)
 {
-    qCheckAccess(deref(d.data));
+    qCheckAccess(deref(d.data)); // is the d-ptr de-referenceable and valid
     QVectorTypedData<int> *dummy = 0;
     const unsigned typeddatasize = (char*)(&dummy->array) - (char*)dummy;
 
@@ -3810,7 +3810,11 @@ void *qDumpObjectData440(
         d.exp       = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
         d.innerType = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
         d.iname     = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
-
+#if 0
+        qDebug() << "data=" << d.data << "dumpChildren=" << d.dumpChildren
+                << " extra=" << d.extraInt[0] << d.extraInt[1]  << d.extraInt[2]  << d.extraInt[3]
+                << d.outerType << d.iname << d.exp << d.iname;
+#endif
         handleProtocolVersion2and3(d);
     }
 
diff --git a/share/qtcreator/gdbmacros/test/main.cpp b/share/qtcreator/gdbmacros/test/main.cpp
index b6be579ab383600ca0a736321568c5e75008035d..28dea56f762336fe7d82f60e03b1507998e75f1f 100644
--- a/share/qtcreator/gdbmacros/test/main.cpp
+++ b/share/qtcreator/gdbmacros/test/main.cpp
@@ -227,7 +227,17 @@ static int dumpQMapQStringString()
 
 static int dumpQVariant()
 {
-    QVariant test(QLatin1String("item"));
+    QVariant test = QLatin1String("item");
+    prepareInBuffer("QVariant", "local.qvariant", "local.qvariant", "");
+    qDumpObjectData440(2, 42, testAddress(&test), 1, 0, 0,0 ,0);
+    fputs(qDumpOutBuffer, stdout);
+    fputs("\n\n", stdout);
+    test = QVariant(int(42));
+    prepareInBuffer("QVariant", "local.qvariant", "local.qvariant", "");
+    qDumpObjectData440(2, 42, testAddress(&test), 1, 0, 0,0 ,0);
+    fputs(qDumpOutBuffer, stdout);
+    fputs("\n\n", stdout);
+    test = QVariant(double(3.141));
     prepareInBuffer("QVariant", "local.qvariant", "local.qvariant", "");
     qDumpObjectData440(2, 42, testAddress(&test), 1, 0, 0,0 ,0);
     fputs(qDumpOutBuffer, stdout);
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 00ec4806f1d5e7f66c46a3bbdde875f74adcf65d..0fb89f8d739be8f14ec41de1267bd7f4e9011f29 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -4,20 +4,25 @@
 <context>
     <name>Application</name>
     <message>
-        <location filename="../../../src/app/main.cpp" line="+133"/>
+        <location filename="../../../src/app/main.cpp" line="+147"/>
         <source>Failed to load core: %1</source>
         <translation>Невозможно загрузить ядро: %1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Unable to send command line arguments to the already running instance. It appears to be not responding.</source>
-        <translation>Невозможно отправить параметры командной строки уже запущенному процессу. Похоже, он не отвечает.</translation>
+        <translation>Невозможно отправить параметры командной строки запущенному процессу. Похоже, процесс не отвечает.</translation>
     </message>
     <message>
         <location line="+135"/>
-        <source>Couldn&apos;t find &apos;Core.pluginspec&apos; in %1</source>
+        <source>Could not find &apos;Core.pluginspec&apos; in %1</source>
         <translation>Не удалось найти &apos;Core.pluginspec&apos; в %1</translation>
     </message>
+    <message>
+        <location line="+36"/>
+        <source>Qt Creator - Plugin loader messages</source>
+        <translation>Qt Creator - Сообщения загрузчика модулей</translation>
+    </message>
 </context>
 <context>
     <name>AttachCoreDialog</name>
@@ -70,7 +75,7 @@
     <message>
         <location/>
         <source>Host and port:</source>
-        <translation>Хост и порт:</translation>
+        <translation>Узел и порт:</translation>
     </message>
     <message>
         <location/>
@@ -91,14 +96,14 @@
 <context>
     <name>BINEditor::Internal::BinEditorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/bineditor/bineditorplugin.cpp" line="+424"/>
+        <location filename="../../../src/plugins/bineditor/bineditorplugin.cpp" line="+446"/>
         <source>&amp;Undo</source>
         <translation>От&amp;менить</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Redo</source>
-        <translation>&amp;Вернуть</translation>
+        <translation>&amp;Повторить</translation>
     </message>
 </context>
 <context>
@@ -163,7 +168,7 @@
     <message>
         <location line="+1"/>
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
-        <translation>В собираетесь удалить папку, что повлечет за собой&lt;br&gt;удаление ее содержимого. Вы уверены, что хотите продолжить?</translation>
+        <translation>Вы собираетесь удалить папку, что повлечёт&lt;br&gt;удаление её содержимого. Вы уверены, что хотите продолжить?</translation>
     </message>
     <message>
         <location line="+111"/>
@@ -223,13 +228,13 @@
 <context>
     <name>Bookmarks::Internal::BookmarkView</name>
     <message>
-        <location filename="../../../src/plugins/bookmarks/bookmarkmanager.cpp" line="+206"/>
-        <location line="+544"/>
+        <location filename="../../../src/plugins/bookmarks/bookmarkmanager.cpp" line="+207"/>
+        <location line="+565"/>
         <source>Bookmarks</source>
         <translation>Закладки</translation>
     </message>
     <message>
-        <location line="-521"/>
+        <location line="-542"/>
         <source>&amp;Remove Bookmark</source>
         <translation>&amp;Удалить закладку</translation>
     </message>
@@ -339,18 +344,41 @@
         <translation>Число пропусков:</translation>
     </message>
 </context>
+<context>
+    <name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
+    <message>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+89"/>
+        <source>Create</source>
+        <translation type="unfinished">Создать</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>New configuration</source>
+        <translation>Новая конфигурация</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New Configuration Name:</source>
+        <translation>Название новой конфигурации:</translation>
+    </message>
+</context>
 <context>
     <name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp" line="+61"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp" line="+49"/>
+        <source>Clear system environment</source>
+        <translation>Чистая системная среда</translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>Build Environment</source>
-        <translation>Среда сборки</translation>
+        <translation>Переменные среды окружения сборки</translation>
     </message>
 </context>
 <context>
     <name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+730"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+699"/>
         <source>&amp;Change</source>
         <translation>&amp;Изменить</translation>
     </message>
@@ -366,7 +394,7 @@
 <context>
     <name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+246"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+248"/>
         <source>Arguments:</source>
         <translation>Параметры:</translation>
     </message>
@@ -378,7 +406,7 @@
     <message>
         <location line="+3"/>
         <source>Reset to default</source>
-        <translation>Сбросить к состоянию по умолчанию</translation>
+        <translation>Сбросить к исходному состоянию</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -386,7 +414,7 @@
         <translation>Рабочий каталог:</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+19"/>
         <source>Run Environment</source>
         <translation>Среда выполнения</translation>
     </message>
@@ -398,7 +426,7 @@
     <message>
         <location line="+1"/>
         <source>System Environment</source>
-        <translation>Среда системы</translation>
+        <translation>Системная среда</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -406,15 +434,40 @@
         <translation>Среда сборки</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="+99"/>
+        <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
+        <translation>Выполняется программа: &lt;b&gt;%1&lt;/b&gt; %2</translation>
+    </message>
+    <message>
+        <location line="-105"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation>Базовая среда для этой конфигурации запуска:</translation>
+        <translation>Базовая среда этой конфигурации выполнения:</translation>
     </message>
 </context>
 <context>
     <name>CMakeProjectManager::Internal::CMakeRunPage</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+150"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+148"/>
+        <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
+        <translation type="unfinished">Укажите размещение программы cmake, так как она не была найдена в стандартных местах.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source> The cmake executable (%1) does not exist.</source>
+        <translation> Программа cmake (%1) отсутствует.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source> The path %1 is not a executable.</source>
+        <translation> Путь %1 не является исполняемой программой.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source> The path %1 is not a valid cmake.</source>
+        <translation> Путь %1 не является корректной программой cmake.</translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Run CMake</source>
         <translation>Выполнить CMake</translation>
     </message>
@@ -425,23 +478,23 @@
     </message>
     <message>
         <location line="+19"/>
-        <source>The directoyr %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun cmake. Or simply finish the wizard directly</source>
+        <source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun cmake. Or simply finish the wizard directly</source>
         <translation>Каталог %1 уже содержит достаточно свежий файл cbp. Вы можете передать специальные параметры или сменить используемый инструментарий с последующим перезапуском cmake. Или просто завершите работу с мастером</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running cmake. Some projects require command line arguments to the initial cmake call.</source>
-        <translation>Каталог %1 не содержит файла cbp. Qt Creator создаст этот файл путем запуска cmake. Некоторые проекты требуют указания параметров командной строки для первого запуска cmake.</translation>
+        <translation>Каталог %1 не содержит файла cbp. Qt Creator создаст этот файл путём запуска cmake. Некоторые проекты требуют указания параметров командной строки для первого запуска cmake.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The directory %1 contains an outdated .cbp file. Qt Creator needs to update this file by running cmake. If you want to add additional command line arguments, add them below. Note that cmake remembers command line arguments from the previous runs.</source>
-        <translation>Каталог %1 содержит устаревший файл cbp. Qt Creator обновит этот файл путем запуска cmake. Если требуется указать дополнительные параметры командной строки, то добавьте их ниже. Следует иметь в виду, что cmake запоминает параметры командной строки с предыдущего запуска.</translation>
+        <translation>Каталог %1 содержит устаревший файл cbp. Qt Creator обновит этот файл путём запуска cmake. Если требуется указать дополнительные параметры командной строки, добавьте их ниже. Следует иметь в виду, что cmake запоминает параметры командной строки для предыдущего запуска.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>The directory %1 specified in a build-configuration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note that cmake remembers command line arguments from the previous runs.</source>
-        <translation>Указанный в настройках сборки каталог %1 не содержит файла cbp. Qt Creator создаст этот файл путем запуска cmake. Некоторые проекты требуют указания параметров командной строки для первого запуска cmake. Следует иметь в виду, что cmake запоминает параметры командной строки с предыдущего запуска.</translation>
+        <translation>Указанный в настройках сборки каталог %1 не содержит файла cbp. Qt Creator создаст этот файл путём запуска cmake. Некоторые проекты требуют указания параметров командной строки для первого запуска cmake. Следует иметь в виду, что cmake запоминает параметры командной строки для предыдущего запуска.</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -463,11 +516,16 @@
         <source>MinGW Generator</source>
         <translation>Генератор MinGW</translation>
     </message>
+    <message>
+        <location line="+55"/>
+        <source>No valid cmake executable specified.</source>
+        <translation>Не указана корректная программа cmake.</translation>
+    </message>
 </context>
 <context>
     <name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+275"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+248"/>
         <location line="+10"/>
         <source>CMake</source>
         <translation>CMake</translation>
@@ -481,15 +539,15 @@
 <context>
     <name>CMakeProjectManager::Internal::InSourceBuildPage</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-149"/>
-        <source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
-        <translation>Qt Creator обнаружил сборку в каталоге с исходниками, что препятствует фоновой сборке. Поэтому Qt Creator не позволит изменить каталог сборки. Если требуется фоновая сборка, то необходимо очистить каталог исходников и переоткрыть проект.</translation>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-228"/>
+        <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
+        <translation>Qt Creator обнаружил &lt;b&gt;сборку в каталоге с исходниками (%1)&lt;/b&gt;, что препятствует фоновой сборке. Поэтому Qt Creator не позволит изменить каталог сборки. Если требуется фоновая сборка, необходимо очистить каталог исходников и открыть проект снова.</translation>
     </message>
 </context>
 <context>
     <name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+161"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+163"/>
         <source>Additional arguments:</source>
         <translation>Дополнительные параметры:</translation>
     </message>
@@ -498,18 +556,23 @@
         <source>Targets:</source>
         <translation>Цели:</translation>
     </message>
+    <message>
+        <location line="+59"/>
+        <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
+        <translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2</translation>
+    </message>
 </context>
 <context>
     <name>CMakeProjectManager::Internal::ShadowBuildPage</name>
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+16"/>
         <source>Please enter the directory in which you want to build your project. </source>
-        <translation>Пожалуйста, введите каталог, в котором желаете собирать проект. </translation>
+        <translation>Укажите каталог, в котором желаете собирать проект. </translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
-        <translation>Пожалуйста, введите каталог, в котором желаете собирать проект. Qt Creator рекомендует не использовать каталог с исходниками для сборки. Это позволит ему оставаться чистым, а так же даст возможность делать несколько сборок с разными настройками.</translation>
+        <translation>Укажите каталог, в котором желаете собирать проект. Qt Creator рекомендует не использовать каталог с исходниками для сборки. Это позволит каталогу с исходниками оставаться чистым, а так же даст возможность делать несколько сборок с разными настройками.</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -530,28 +593,15 @@
         <translation>&lt;Нет символов&gt;</translation>
     </message>
 </context>
-<context>
-    <name>CVS::Internal::CVSOutputWindow</name>
-    <message>
-        <location filename="../../../src/plugins/cvs/cvsoutputwindow.cpp" line="+43"/>
-        <source>CVS Output</source>
-        <translation>Вывод CVS</translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>CVS</source>
-        <translation>CVS</translation>
-    </message>
-</context>
 <context>
     <name>CVS::Internal::CVSPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="+81"/>
+        <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="+83"/>
         <source>Parsing of the log output failed</source>
         <translation>Не удалось выполнить обработку журнала</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+169"/>
         <source>&amp;CVS</source>
         <translation>&amp;CVS</translation>
     </message>
@@ -563,7 +613,7 @@
     <message>
         <location line="+0"/>
         <source>Add &quot;%1&quot;</source>
-        <translation>Добавить &quot;%1&quot;</translation>
+        <translation>Добавить &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -578,7 +628,7 @@
     <message>
         <location line="+0"/>
         <source>Delete &quot;%1&quot;</source>
-        <translation>Удалить &quot;%1&quot;</translation>
+        <translation>Удалить &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -588,7 +638,7 @@
     <message>
         <location line="+0"/>
         <source>Revert &quot;%1&quot;</source>
-        <translation>Откатить &quot;%1&quot;</translation>
+        <translation>Откатить &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -603,7 +653,7 @@
     <message>
         <location line="+0"/>
         <source>Diff &quot;%1&quot;</source>
-        <translation>Сравнить &quot;%1&quot;</translation>
+        <translation>Сравнить &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -623,7 +673,7 @@
     <message>
         <location line="+0"/>
         <source>Commit &quot;%1&quot;</source>
-        <translation>Фиксировать &quot;%1&quot;</translation>
+        <translation>Фиксировать &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -638,7 +688,7 @@
     <message>
         <location line="+0"/>
         <source>Filelog &quot;%1&quot;</source>
-        <translation>История &quot;%1&quot;</translation>
+        <translation>История &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -648,7 +698,7 @@
     <message>
         <location line="+0"/>
         <source>Annotate &quot;%1&quot;</source>
-        <translation>Аннотация &quot;%1&quot;</translation>
+        <translation>Аннотация &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -693,12 +743,12 @@
     <message>
         <location line="+1"/>
         <source>The commit message check failed. Do you want to commit the change?</source>
-        <translation>Сообщение о фиксации содержит ошибки. Вы все равно желаете зафиксировать изменения?</translation>
+        <translation>Сообщение о фиксации содержит ошибки. Всё-равно желаете зафиксировать изменения?</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>The files do not differ.</source>
-        <translation>Файлы не имеют отличий.</translation>
+        <translation>Файлы не имеют различий.</translation>
     </message>
     <message>
         <location line="+61"/>
@@ -731,32 +781,32 @@
         <translation>Не удалось создать временный файл: %1</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+105"/>
         <source>Project status</source>
         <translation>Состояние проекта</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>The initial revision %1 cannot be described.</source>
-        <translation>Нельзя описать начальную ревизию %1.</translation>
+        <translation>Невозможно описать начальную ревизию %1.</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Could not find commits of id &apos;%1&apos; on %2.</source>
-        <translation>Не удалось найти фиксации с идентификатором &apos;%1&apos; на %2.</translation>
+        <translation>Не удалось найти фиксацию с идентификатором &apos;%1&apos; на %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>%1 Executing: %2 %3
+        <location line="+176"/>
+        <source>Executing: %1 %2
 </source>
-        <translation>%1 Выполняется: %2 %3
+        <translation>Выполняется: %1 %2
 </translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>%1 Executing in %2: %3 %4
+        <source>Executing in %1: %2 %3
 </source>
-        <translation>%1 Выполняется в: %2 %3 %4
+        <translation>Выполняется в %1: %2 %3
 </translation>
     </message>
     <message>
@@ -765,7 +815,7 @@
         <translation>Не указан исполняемый файл программы cvs!</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+44"/>
         <source>The process terminated with exit code %1.</source>
         <translation>Процесс завершился с кодом %1.</translation>
     </message>
@@ -777,7 +827,7 @@
     <message>
         <location line="+3"/>
         <source>Could not start cvs &apos;%1&apos;. Please check your settings in the preferences.</source>
-        <translation>Не удалось запустить cvs &apos;%1&apos;. Пожалуйста, проверьте ваши настройки.</translation>
+        <translation>Не удалось запустить cvs &apos;%1&apos;. Проверьте настройки.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -812,13 +862,13 @@
     <name>CVS::Internal::CheckoutWizard</name>
     <message>
         <location filename="../../../src/plugins/cvs/checkoutwizard.cpp" line="+54"/>
-        <source>Check-out a project from a CVS repository.</source>
-        <translation>Получить проект из репозитория CVS.</translation>
+        <source>Checks out a project from a CVS repository.</source>
+        <translation>Извлечение проекта из репозитория CVS.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>CVS Checkout</source>
-        <translation>Выгрузка из CVS</translation>
+        <translation>Извлечь из CVS</translation>
     </message>
 </context>
 <context>
@@ -846,11 +896,6 @@
         <source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit id). Otherwise, only the respective file will be displayed.</source>
         <translation>Если включено, то по щелчку на номере равизии при просмотре аннотации (полученной по идентификатору фиксации) будут отображаться все зафиксированные файлы. В противном случае, только соответствующий файл.</translation>
     </message>
-    <message>
-        <location/>
-        <source>Describe by commit id</source>
-        <translation>Описывать по идентификатору</translation>
-    </message>
     <message>
         <location/>
         <source>CVS Command:</source>
@@ -871,11 +916,16 @@
         <source>CVS</source>
         <translation>CVS</translation>
     </message>
+    <message>
+        <location filename="../../../src/plugins/cvs/settingspage.ui"/>
+        <source>Describe all files matching commit id:</source>
+        <translation>Описать все файлы, соответствующие фиксации:</translation>
+    </message>
 </context>
 <context>
     <name>CVS::Internal::SettingsPageWidget</name>
     <message>
-        <location line="-34"/>
+        <location filename="../../../src/plugins/cvs/settingspage.cpp" line="-34"/>
         <source>CVS Command</source>
         <translation>Команда CVS</translation>
     </message>
@@ -883,7 +933,7 @@
 <context>
     <name>CVSPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="-1046"/>
+        <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="-1045"/>
         <source>Cannot find repository for &apos;%1&apos;</source>
         <translation>Не удалось найти репозиторий для &apos;%1&apos;</translation>
     </message>
@@ -893,7 +943,7 @@
     <message>
         <location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
         <source>These options take effect at the next start of Qt Creator.</source>
-        <translation>Эти настройки вступят в силу только после следующего запуска Qt Creator.</translation>
+        <translation>Данные настройки вступят в силу только после следующего запуска Qt Creator.</translation>
     </message>
     <message>
         <location/>
@@ -951,8 +1001,8 @@
 <context>
     <name>CdbStackFrameContext</name>
     <message>
-        <location filename="../../../src/plugins/debugger/cdb/cdbstackframecontext.cpp" line="+187"/>
-        <location line="+129"/>
+        <location filename="../../../src/plugins/debugger/cdb/cdbstackframecontext.cpp" line="+135"/>
+        <location line="+224"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Неизвестный&gt;</translation>
     </message>
@@ -979,7 +1029,7 @@
 <context>
     <name>CodePaster::CodePasterProtocol</name>
     <message>
-        <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+126"/>
+        <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+129"/>
         <source>No such paste</source>
         <translation type="unfinished">Нет такой вставки</translation>
     </message>
@@ -1001,7 +1051,7 @@
 <context>
     <name>CodePaster::CodepasterPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+112"/>
+        <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
         <source>&amp;CodePaster</source>
         <translation>&amp;CodePaster</translation>
     </message>
@@ -1028,10 +1078,10 @@
     <message>
         <location line="+88"/>
         <source>This protocol supports no listing</source>
-        <translation type="unfinished">Этот протокол не поддерживает листинг</translation>
+        <translation>Данный протокол не поддерживает получение списка</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>Waiting for items</source>
         <translation>Ожидание элементов</translation>
     </message>
@@ -1120,7 +1170,7 @@
         <location/>
         <source>When this option is checked, &apos;Step Into&apos; compresses several steps into one in certain situations, leading to &apos;less noisy&apos; debugging. So will, e.g., the atomic
  reference counting code be skipped, and a single &apos;Step Into&apos; for a signal emission will end up directly in the slot connected to it.</source>
-        <translation>Когда включен этот параметр, в определенных ситуациях &apos;Зайти в&apos; объединяет несколько шагов в один, позволяя &apos;снизить шум&apos; при отладке. Например, будет пропущен
+        <translation>Когда включён данный параметр, в определенных ситуациях &apos;Зайти в&apos; объединяет несколько шагов в один, позволяя &apos;снизить шум&apos; при отладке. Например, будет пропущен
 атомарный код подсчета ссылок и единственная операция &apos;Зайти в&apos; инициации сигнала завершится прямо в слоте, который подключен к нему.</translation>
     </message>
     <message>
@@ -1128,20 +1178,9 @@
         <source>Skip known frames when stepping</source>
         <translation>Пропускать известные кадры при пошаговой отладке</translation>
     </message>
-    <message>
-        <location/>
-        <source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
-        <translation>Включение вызовет всплывающие подсказки для значений переменных во время отладки. Это может замедлить отладку, не предоставляя достоверной информации, так как не учитывается область видимости. Данный параметр отключен по умолчанию.</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Use tooltips while debugging</source>
-        <translation>Использовать всплывающие подсказки во время отладки</translation>
-    </message>
     <message>
         <location/>
         <source>Enable reverse debugging</source>
-        <translatorcomment>что-то новенькое</translatorcomment>
         <translation>Включить обратную отладку</translation>
     </message>
     <message>
@@ -1154,6 +1193,16 @@
         <source>&lt;unlimited&gt;</source>
         <translation>&lt;бесконечна&gt;</translation>
     </message>
+    <message>
+        <location/>
+        <source>Show a message box when receiving a signal</source>
+        <translation>Показывать сообщение при получении сигнала</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Use tooltips in main editor while debugging</source>
+        <translation>Включает подсказки в основном редакторе при отладке</translation>
+    </message>
 </context>
 <context>
     <name>CompletionSettingsPage</name>
@@ -1216,7 +1265,7 @@
     <message>
         <location line="+12"/>
         <source>Unable to open %1 for writing: %2</source>
-        <translation>Невозможно открыть для записи %1: %2</translation>
+        <translation>Невозможно открыть %1 для записи: %2</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1278,13 +1327,13 @@ Would you like to overwrite them?</source>
     <name>Core::EditorManager</name>
     <message>
         <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+187"/>
-        <location line="+1491"/>
+        <location line="+1493"/>
         <source>Revert to Saved</source>
-        <translation>Вернуть к сохраненному</translation>
+        <translation>Вернуть к сохранённому</translation>
     </message>
     <message>
-        <location line="-1488"/>
-        <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+530"/>
+        <location line="-1490"/>
+        <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+531"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -1295,12 +1344,12 @@ Would you like to overwrite them?</source>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+1290"/>
+        <location line="+1292"/>
         <source>Close Others</source>
         <translation>Закрыть другие</translation>
     </message>
     <message>
-        <location line="-1289"/>
+        <location line="-1291"/>
         <source>Next Open Document in History</source>
         <translation>Следующий открытый документ в истории</translation>
     </message>
@@ -1327,7 +1376,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+45"/>
         <source>Revert File to Saved</source>
-        <translation>Вернуть файл к сохраненному состоянию</translation>
+        <translation>Вернуть файл к сохранённому состоянию</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -1430,12 +1479,12 @@ Would you like to overwrite them?</source>
         <translation>Ctrl+E,o</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>&amp;Advanced</source>
         <translation>&amp;Дополнительно</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+18"/>
         <source>Alt+V,Alt+I</source>
         <translation>Alt+V,Alt+I</translation>
     </message>
@@ -1505,7 +1554,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+92"/>
         <source>&lt;b&gt;Warning:&lt;/b&gt; You are changing a read-only file.</source>
-        <translation>&lt;b&gt;Внимание:&lt;/b&gt; Вы изменяете файл доступный только для чтения.</translation>
+        <translation>&lt;b&gt;Внимание:&lt;/b&gt; Вы изменяете файл, доступный только для чтения.</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -1520,7 +1569,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+1"/>
         <source>Revert %1 to Saved</source>
-        <translation>Откатить %1 к сохраненному</translation>
+        <translation>Вернуть %1 к сохранённому</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1530,7 +1579,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+3"/>
         <source>Close All Except %1</source>
-        <translation>Закрыть все кроме %1</translation>
+        <translation>Закрыть все, кроме %1</translation>
     </message>
     <message>
         <location line="+197"/>
@@ -1556,14 +1605,14 @@ Would you like to overwrite them?</source>
 <context>
     <name>Core::FileManager</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+305"/>
-        <source>Can&apos;t save file</source>
+        <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+306"/>
+        <source>Cannot save file</source>
         <translation>Не удалось сохранить файл</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Can&apos;t save changes to &apos;%1&apos;. Do you want to continue and loose your changes?</source>
-        <translation>Не удалось сохранить изменения в &apos;%1&apos;. Желаете продолжить с потерей ваших изменений?</translation>
+        <source>Cannot save changes to &apos;%1&apos;. Do you want to continue and lose your changes?</source>
+        <translation>Не удалось сохранить изменения в &apos;%1&apos;. Продолжить с потерей изменений?</translation>
     </message>
     <message>
         <location line="+113"/>
@@ -1573,7 +1622,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+1"/>
         <source>An item named &apos;%1&apos; already exists at this location. Do you want to overwrite it?</source>
-        <translation>Элемент с названием &apos;%1&apos; уже существует в указанном месте. Желаете ли его перезаписать?</translation>
+        <translation>Элемент с названием &apos;%1&apos; уже существует в указанном месте. Желаете его перезаписать?</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -1592,7 +1641,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Core::Internal::EditMode</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/editmode.cpp" line="+93"/>
+        <location filename="../../../src/plugins/coreplugin/editmode.cpp" line="+95"/>
         <source>Edit</source>
         <translation>Редактор</translation>
     </message>
@@ -1622,7 +1671,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+3"/>
         <source>Save Current as Default</source>
-        <translation>Сохранить состояние, как исходное</translation>
+        <translation>Сохранить состояние как исходное</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -1686,7 +1735,7 @@ Would you like to overwrite them?</source>
         <location line="+73"/>
         <location line="+37"/>
         <source>Placeholder</source>
-        <translation>Заполнитель</translation>
+        <translation type="unfinished">Заполнитель</translation>
     </message>
     <message>
         <location line="-31"/>
@@ -1724,7 +1773,7 @@ Would you like to overwrite them?</source>
     <message>
         <location/>
         <source>Reset to default</source>
-        <translation>Сбросить к состоянию по умолчанию</translation>
+        <translation>Сбросить к исходному состоянию</translation>
     </message>
     <message>
         <location/>
@@ -1754,6 +1803,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+10"/>
         <source>Environment</source>
+        <translatorcomment>Не путать с переменными среды окружения!</translatorcomment>
         <translation>Среда</translation>
     </message>
     <message>
@@ -1764,7 +1814,7 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
         <source>When files are externally modified:</source>
-        <translation>Когда файлы изменены из-вне:</translation>
+        <translation>Когда файлы изменены извне:</translation>
     </message>
     <message>
         <location/>
@@ -1773,19 +1823,19 @@ Would you like to overwrite them?</source>
     </message>
     <message>
         <location/>
-        <source>Reload all unmodified files</source>
-        <translation>Перезагрузить все неизменённые файлы</translation>
+        <source>Ignore modifications</source>
+        <translation>Игнорировать изменения</translation>
     </message>
     <message>
         <location/>
-        <source>Ignore modifications</source>
-        <translation>Игнорировать изменения</translation>
+        <source>Reload all modified files</source>
+        <translation>Перезагрузить все изменённые файлы</translation>
     </message>
 </context>
 <context>
     <name>Core::Internal::MainWindow</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+154"/>
+        <location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+156"/>
         <source>Qt Creator</source>
         <translation>Qt Creator</translation>
     </message>
@@ -1887,7 +1937,7 @@ Would you like to overwrite them?</source>
         <location line="+5"/>
         <location line="+4"/>
         <source>&amp;Redo</source>
-        <translation>&amp;Вернуть</translation>
+        <translation>&amp;Повторить</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1925,7 +1975,7 @@ Would you like to overwrite them?</source>
         <translation>П&amp;араметры...</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+11"/>
         <source>Minimize</source>
         <translation>Свернуть</translation>
     </message>
@@ -1955,7 +2005,7 @@ Would you like to overwrite them?</source>
         <translation>О программе &amp;Qt Creator...</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+11"/>
         <source>About &amp;Plugins...</source>
         <translation>О модул&amp;ях...</translation>
     </message>
@@ -1977,7 +2027,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Core::Internal::NavComboBox</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/navigationwidget.cpp" line="+524"/>
+        <location filename="../../../src/plugins/coreplugin/navigationwidget.cpp" line="+527"/>
         <source>Activate %1</source>
         <translation>Включить %1</translation>
     </message>
@@ -2020,7 +2070,7 @@ Would you like to overwrite them?</source>
     <name>Core::Internal::OpenEditorsWidget</name>
     <message>
         <location filename="../../../src/plugins/coreplugin/editormanager/openeditorsview.cpp" line="+100"/>
-        <location line="+116"/>
+        <location line="+147"/>
         <source>Open Documents</source>
         <translation>Открытые документы</translation>
     </message>
@@ -2037,7 +2087,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+2"/>
         <source>Close All Except %1</source>
-        <translation>Закрыть все кроме %1</translation>
+        <translation>Закрыть все, кроме %1</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2070,7 +2120,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Core::Internal::OutputPaneManager</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+172"/>
+        <location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+173"/>
         <source>Output</source>
         <translation>Вывод</translation>
     </message>
@@ -2140,7 +2190,7 @@ Would you like to overwrite them?</source>
     <name>Core::Internal::SaveItemsDialog</name>
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.cpp" line="+55"/>
-        <source>Don&apos;t Save</source>
+        <source>Do not Save</source>
         <translation>Не сохранять</translation>
     </message>
     <message>
@@ -2159,6 +2209,20 @@ Would you like to overwrite them?</source>
         <translation>Сохранить выбранное</translation>
     </message>
 </context>
+<context>
+    <name>Core::Internal::SettingsDialog</name>
+    <message>
+        <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.cpp" line="+58"/>
+        <source>Preferences</source>
+        <translatorcomment>Честно говоря, не знаю, как Preferences в Mac OS переводят</translatorcomment>
+        <translation>Параметры</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Options</source>
+        <translation>Параметры</translation>
+    </message>
+</context>
 <context>
     <name>Core::Internal::ShortcutSettings</name>
     <message>
@@ -2174,18 +2238,18 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+157"/>
         <source>Import Keyboard Mapping Scheme</source>
-        <translation type="unfinished">Импорт схемы отображения клавиатуры</translation>
+        <translation>Импорт схемы разметки клавиатуры</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+32"/>
         <source>Keyboard Mapping Scheme (*.kms)</source>
-        <translation type="unfinished">Схемы отображения клавиатуры (*.kms)</translation>
+        <translation>Схемы разметки клавиатуры (*.kms)</translation>
     </message>
     <message>
         <location line="-2"/>
         <source>Export Keyboard Mapping Scheme</source>
-        <translation type="unfinished">Экспорт схемы отображения клавиатуры</translation>
+        <translation>Экспорт схемы разметки клавиатуры</translation>
     </message>
 </context>
 <context>
@@ -2223,15 +2287,15 @@ Would you like to overwrite them?</source>
 <context>
     <name>Core::ModeManager</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+144"/>
+        <location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+145"/>
         <source>Switch to %1 mode</source>
-        <translation>Переключиться в режим %1</translation>
+        <translation>Переключить в режим %1</translation>
     </message>
 </context>
 <context>
     <name>Core::ScriptManager</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+237"/>
+        <location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+228"/>
         <source>Exception at line %1: %2
 %3</source>
         <translation>Исключение в строке %1: %2
@@ -2274,12 +2338,12 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/libs/utils/classnamevalidatinglineedit.cpp" line="+85"/>
         <source>The class name must not contain namespace delimiters.</source>
-        <translation>Имя класса не должно содержать разделителей пространств имен.</translation>
+        <translation>Имя класса не должно содержать разделителей пространств имён.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Please enter a class name.</source>
-        <translation>Пожалуйста, введите имя класса.</translation>
+        <translation>Введите имя класса.</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -2342,12 +2406,12 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+70"/>
         <source>Cannot obtain a handle to the inferior: %1</source>
-        <translation>Не удалось получить идентификатор подчиненного процесса: %1</translation>
+        <translation>Не удалось получить идентификатор подчинённого процесса: %1</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Cannot obtain exit status from inferior: %1</source>
-        <translation>Не удалось получить код возврата подчиненного процесса: %1</translation>
+        <translation>Не удалось получить код возврата подчинённого процесса: %1</translation>
     </message>
 </context>
 <context>
@@ -2360,7 +2424,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+8"/>
         <source>The name must not contain any of the characters &apos;%1&apos;.</source>
-        <translation>Символы &apos;%1&apos; не допустимы в имени.</translation>
+        <translation>Имя не должно содержать любой из символов &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -2376,7 +2440,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Core::Utils::FileSearch</name>
     <message numerus="yes">
-        <location filename="../../../src/libs/utils/filesearch.cpp" line="+45"/>
+        <location filename="../../../src/libs/utils/filesearch.cpp" line="+47"/>
         <source>%1: canceled. %n occurrences found in %2 files.</source>
         <translation>
             <numerusform>%1: отменено. %n совпадение найдено в %2 файлах.</numerusform>
@@ -2617,7 +2681,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Core::Utils::reloadPrompt</name>
     <message>
-        <location filename="../../../src/libs/utils/reloadpromptutils.cpp" line="+42"/>
+        <location filename="../../../src/libs/utils/reloadpromptutils.cpp" line="+43"/>
         <source>File Changed</source>
         <translation>Файл изменён</translation>
     </message>
@@ -2629,26 +2693,16 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+3"/>
         <source>The file %1 has changed outside Qt Creator. Do you want to reload it?</source>
-        <translation>Файл %1 изменен вне Qt Creator. Желаете ли перезагрузить его?</translation>
+        <translation type="unfinished">Файл %1 изменён вне Qt Creator. Желаете перезагрузить его?</translation>
     </message>
 </context>
 <context>
     <name>CppEditor::Internal::CPPEditor</name>
     <message>
-        <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+546"/>
-        <source>CTRL+SHIFT+r</source>
-        <translation>CTRL+SHIFT+r</translation>
-    </message>
-    <message>
-        <location line="+67"/>
+        <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+616"/>
         <source>Sort alphabetically</source>
         <translation>Сортировать по алфавиту</translation>
     </message>
-    <message>
-        <location line="+733"/>
-        <source>Rename &apos;%1&apos;</source>
-        <translation>Переименовать &apos;%1&apos;</translation>
-    </message>
 </context>
 <context>
     <name>CppEditor::Internal::ClassNamePage</name>
@@ -2689,7 +2743,7 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/plugins/cppeditor/cpphoverhandler.cpp" line="+87"/>
         <source>Unfiltered</source>
-        <translation type="unfinished">Вся</translation>
+        <translation>Вся</translation>
     </message>
 </context>
 <context>
@@ -2702,7 +2756,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+1"/>
         <source>Creates a C++ header file.</source>
-        <translation>Создает новый заголовочный файл C++.</translation>
+        <translation>Создание нового заголовочного файл C++.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2712,7 +2766,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+3"/>
         <source>Creates a C++ source file.</source>
-        <translation>Создает новый исходный файл C++.</translation>
+        <translation>Создание нового исходного файла C++.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2727,7 +2781,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+1"/>
         <source>Creates a header and a source file for a new class.</source>
-        <translation>Создает заголовочный и исходный файлы для нового класса.</translation>
+        <translation>Создание заголовочного и исходного файлов для нового класса.</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -2739,6 +2793,11 @@ Would you like to overwrite them?</source>
         <source>Switch between Method Declaration/Definition</source>
         <translation>Переключить объявление/определение метода</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Rename Symbol under Cursor</source>
+        <translation>Переименовать символ под курсором</translation>
+    </message>
 </context>
 <context>
     <name>CppFileSettingsPage</name>
@@ -2755,7 +2814,7 @@ Would you like to overwrite them?</source>
     <message>
         <location/>
         <source>Lower case file names</source>
-        <translation>Имена файлов в нижем регистре</translation>
+        <translation>Имена файлов в нижнем регистре</translation>
     </message>
     <message>
         <location/>
@@ -2766,13 +2825,13 @@ Would you like to overwrite them?</source>
         <location/>
         <source>License Template:</source>
         <translatorcomment>&quot;Шаблон лицензии&quot; обрезается</translatorcomment>
-        <translation>Файл лицензии:</translation>
+        <translation>Лицензия:</translation>
     </message>
 </context>
 <context>
     <name>CppPreprocessor</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+524"/>
+        <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+540"/>
         <source>%1: No such file or directory</source>
         <translation>%1: Нет такого файла или каталога</translation>
     </message>
@@ -2780,7 +2839,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppTools</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+52"/>
+        <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+53"/>
         <source>File Naming Conventions</source>
         <translation>Условия именования файлов</translation>
     </message>
@@ -2845,8 +2904,8 @@ Would you like to overwrite them?</source>
     </message>
     <message>
         <location line="+51"/>
-        <source>Choose a new license template file</source>
-        <translation>Выбор файла нового шаблона лицензии</translation>
+        <source>Choose a location for the new license template file</source>
+        <translation>Выбор нового файла шаблона лицензии</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2859,6 +2918,14 @@ Would you like to overwrite them?</source>
         <translation>Не удалось записать в %1: %2</translation>
     </message>
 </context>
+<context>
+    <name>CppTools::Internal::CppFindReferences</name>
+    <message>
+        <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+508"/>
+        <source>Searching...</source>
+        <translation>Поиск...</translation>
+    </message>
+</context>
 <context>
     <name>CppTools::Internal::CppFunctionsFilter</name>
     <message>
@@ -2870,13 +2937,13 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppTools::Internal::CppModelManager</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+259"/>
+        <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+276"/>
         <source>Scanning</source>
         <translatorcomment>Слово &quot;сканирование&quot; слишком длинное</translatorcomment>
         <translation>Анализ</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <source>Indexing</source>
         <translation>Индексация</translation>
     </message>
@@ -2910,7 +2977,7 @@ Would you like to overwrite them?</source>
         <translation>Поиск классов</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.h" line="+73"/>
+        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.h" line="+74"/>
         <source>Class Declarations</source>
         <translation>Объявления классов</translation>
     </message>
@@ -2931,7 +2998,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppTools::Internal::FunctionArgumentWidget</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+432"/>
+        <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+433"/>
         <source>%1 of %2</source>
         <translation>%1 из %2</translation>
     </message>
@@ -2939,7 +3006,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerconstants.h" line="+57"/>
+        <location filename="../../../src/plugins/debugger/debuggerconstants.h" line="+55"/>
         <source>Common</source>
         <translation>Общее</translation>
     </message>
@@ -2949,126 +3016,331 @@ Would you like to overwrite them?</source>
         <translation>Отладчик</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+414"/>
+        <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+432"/>
         <source>&lt;Encoding error&gt;</source>
         <translation>&lt;Ошибка кодировки&gt;</translation>
     </message>
 </context>
 <context>
-    <name>Debugger::Internal::AttachCoreDialog</name>
+    <name>Debugger::DebuggerManager</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+134"/>
-        <source>Select Executable</source>
-        <translation>Выбор программы</translation>
+        <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+460"/>
+        <source>Continue</source>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Select Core File</source>
-        <translation>Выбор файла ядра</translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::AttachExternalDialog</name>
-    <message>
-        <location line="-58"/>
-        <source>Process ID</source>
-        <translation>ID процесса</translation>
+        <location line="+1212"/>
+        <source>Interrupt</source>
+        <translation>Прервать</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Name</source>
-        <translation>Название</translation>
+        <location line="-1209"/>
+        <source>Reset Debugger</source>
+        <translation>Сбросить отладчик</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>State</source>
-        <translation>Состояние</translation>
+        <location line="+2"/>
+        <source>Step Over</source>
+        <translation>Перейти через</translation>
     </message>
     <message>
-        <location line="+165"/>
-        <source>Refresh</source>
-        <translation>Обновить</translation>
+        <location line="+3"/>
+        <source>Step Into</source>
+        <translation>Войти в</translation>
     </message>
-</context>
-<context>
-    <name>Debugger::Internal::AttachTcfDialog</name>
     <message>
-        <location line="+71"/>
-        <source>Select Executable</source>
-        <translation>Выбор программы</translation>
+        <location line="+3"/>
+        <source>Step Out</source>
+        <translation>Выйти из функции</translation>
     </message>
-</context>
-<context>
-    <name>Debugger::Internal::BreakHandler</name>
     <message>
-        <location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+196"/>
-        <source>Marker File:</source>
-        <translation type="unfinished">Отмеченный файл:</translation>
+        <location line="+3"/>
+        <source>Run to Line</source>
+        <translation>Выполнить до строки</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Marker Line:</source>
-        <translation type="unfinished">Отмеченная строка:</translation>
+        <location line="+2"/>
+        <source>Run to Outermost Function</source>
+        <translation>Выполнить до внешней функции</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Breakpoint Number:</source>
-        <translation>Номер точки останова:</translation>
+        <location line="+2"/>
+        <source>Jump to Line</source>
+        <translation>Перейти на строку</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Breakpoint Address:</source>
-        <translation>Адрес точки останова:</translation>
+        <location line="+2"/>
+        <source>Toggle Breakpoint</source>
+        <translation>Переключить точку останова</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Property</source>
-        <translation>Свойство</translation>
+        <source>Add to Watch Window</source>
+        <translation>Добавить в окно наблюдения</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Requested</source>
-        <translation type="unfinished">Требуемое</translation>
+        <location line="+2"/>
+        <source>Reverse Direction</source>
+        <translation>Обратное направление</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Obtained</source>
-        <translation type="unfinished">Полученное</translation>
+        <location line="+227"/>
+        <source>Stopped.</source>
+        <translation>Остановлено.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Internal Number:</source>
-        <translation>Внутренний номер:</translation>
+        <location line="+6"/>
+        <source>Running...</source>
+        <translation>Выполнение...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>File Name:</source>
-        <translation>Имя файла:</translation>
+        <location line="+6"/>
+        <source>Exited.</source>
+        <translation>Завершён.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Function Name:</source>
-        <translation>Название функции:</translation>
+        <location line="+78"/>
+        <location line="+21"/>
+        <source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
+        <translation>Изменение состояние точки останова требует или полностью остановленную программу, или полностью работающую.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Line Number:</source>
-        <translation>Номер строки:</translation>
+        <location line="+30"/>
+        <source>The application requires the debugger engine &apos;%1&apos;, which is disabled.</source>
+        <translation>Приложению требуется движок отладчика &apos;%1&apos;, который выключен.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Condition:</source>
-        <translation>Условие:</translation>
+        <location line="+647"/>
+        <source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on &apos;Rebuild&apos; for the debugging helper.</source>
+        <translation>Помощник отладчика используется для преобразования значений некоторых типов данных Qt и стандартной библиотеки к наглядному виду. Он должен быть собран для каждой версии Qt. Это можно сделать в параметрах Qt, выбрав профиль Qt и нажав на &apos;Пересобрать&apos;.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Ignore Count:</source>
-        <translation>Число пропусков:</translation>
+        <location line="-564"/>
+        <source>Debugging VS executables is currently not enabled.</source>
+        <translation>Отладка программ созданных VS сейчас отключена.</translation>
     </message>
     <message>
-        <location line="+216"/>
-        <source>Number</source>
-        <translation>Номер</translation>
+        <location line="+43"/>
+        <source>Starting debugger for tool chain &apos;%1&apos;...</source>
+        <translation>Запускается отладчик из инструментария &apos;%1&apos;...</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Warning</source>
+        <translation>Предупреждение</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot debug &apos;%1&apos; (tool chain: &apos;%2&apos;): %3</source>
+        <translation>Не удалось отладить &apos;%1&apos; (инструментарий: &apos;%2&apos;): %3</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Settings...</source>
+        <translation>Настройки...</translation>
+    </message>
+    <message>
+        <location line="+177"/>
+        <source>Save Debugger Log</source>
+        <translation>Сохранить журнал отладчика</translation>
+    </message>
+    <message>
+        <location line="+484"/>
+        <source>Stop Debugger</source>
+        <translation>Остановить отладчик</translation>
+    </message>
+    <message>
+        <location line="-187"/>
+        <source>%1 (explicitly set in the Debugger Options)</source>
+        <translation>%1 (установлено в параметрах отладчика)</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Open Qt preferences</source>
+        <translation>Открыть параметры Qt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Turn helper usage off</source>
+        <translation>Выключить помощника</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Continue anyway</source>
+        <translation>Всё равно продолжить</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Debugging helper missing</source>
+        <translation>Отсутствует помощник отладчика</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The debugger did not find the debugging helper library.</source>
+        <translation>Отладчик не смог найти библиотеку помощника.</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::AddressDialog</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+546"/>
+        <source>Select start address</source>
+        <translation>Выбор начального адреса</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Enter an address: </source>
+        <translation>Введите адрес: </translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::AttachCoreDialog</name>
+    <message>
+        <location line="-415"/>
+        <source>Select Executable</source>
+        <translation>Выбор программы</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select Core File</source>
+        <translation>Выбор файла ядра</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::AttachExternalDialog</name>
+    <message>
+        <location line="-58"/>
+        <source>Process ID</source>
+        <translation>ID процесса</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation>Название</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>State</source>
+        <translation>Состояние</translation>
+    </message>
+    <message>
+        <location line="+167"/>
+        <source>Refresh</source>
+        <translation>Обновить</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::AttachGdbAdapter</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/attachgdbadapter.cpp" line="+82"/>
+        <source>Cannot set up communication with child process: %1</source>
+        <translation>Не удалось установить связь с дочерним процессом: %1</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Attached to stopped inferior.</source>
+        <translation type="unfinished">Подключено к остановленному подчинённому.</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Inferior running.</source>
+        <translation type="unfinished">Подчинённый выполняется.</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Inferior process could not be stopped:
+</source>
+        <translation type="unfinished">Не удалось остановить подчинённый процесс:
+</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Gdb process could not be stopped:
+</source>
+        <translation>Не удалось остановить процесс gdb:
+</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::AttachTcfDialog</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+72"/>
+        <source>Select Executable</source>
+        <translation>Выбор программы</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::BreakHandler</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+200"/>
+        <source>Marker File:</source>
+        <translation type="unfinished">Отмеченный файл:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Marker Line:</source>
+        <translation type="unfinished">Отмеченная строка:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Breakpoint Number:</source>
+        <translation>Номер точки останова:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Breakpoint Address:</source>
+        <translation>Адрес точки останова:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Property</source>
+        <translation>Свойство</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Requested</source>
+        <translation type="unfinished">Требуемое</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Obtained</source>
+        <translation type="unfinished">Полученное</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Internal Number:</source>
+        <translation>Внутренний номер:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>File Name:</source>
+        <translation>Имя файла:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Function Name:</source>
+        <translation>Название функции:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Line Number:</source>
+        <translation>Номер строки:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Condition:</source>
+        <translation>Условие:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ignore Count:</source>
+        <translation>Число пропусков:</translation>
+    </message>
+    <message>
+        <location line="+215"/>
+        <source>Number</source>
+        <translation>Номер</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -3095,6 +3367,11 @@ Would you like to overwrite them?</source>
         <source>Ignore</source>
         <translation type="unfinished">Пропуски</translation>
     </message>
+    <message>
+        <location line="+0"/>
+        <source>Address</source>
+        <translation type="unfinished">Адрес</translation>
+    </message>
     <message>
         <location line="+62"/>
         <source>Breakpoint will only be hit if this condition is met.</source>
@@ -3113,23 +3390,15 @@ Would you like to overwrite them?</source>
         <source>Breakpoints</source>
         <translation>Точки останова</translation>
     </message>
-    <message numerus="yes">
-        <location line="+54"/>
+    <message>
+        <location line="+61"/>
         <source>Delete breakpoint</source>
-        <translation type="unfinished">
-            <numerusform>Удалить точку останова</numerusform>
-            <numerusform>Удалить точки останова</numerusform>
-            <numerusform>Удалить точки останова</numerusform>
-        </translation>
+        <translation>Удалить точку останова</translation>
     </message>
-    <message numerus="yes">
+    <message>
         <location line="+3"/>
         <source>Delete all breakpoints</source>
-        <translation type="unfinished">
-            <numerusform>Удалить все точки останова</numerusform>
-            <numerusform>Удалить все точки останова</numerusform>
-            <numerusform>Удалить все точки останова</numerusform>
-        </translation>
+        <translation>Удалить все точки останова</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -3151,14 +3420,10 @@ Would you like to overwrite them?</source>
         <source>Always adjust column widths to contents</source>
         <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
     </message>
-    <message numerus="yes">
+    <message>
         <location line="+4"/>
         <source>Edit condition...</source>
-        <translation type="unfinished">
-            <numerusform>Изменить условие...</numerusform>
-            <numerusform>Изменить условия...</numerusform>
-            <numerusform>Изменить условия...</numerusform>
-        </translation>
+        <translation>Изменить условие...</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3196,7 +3461,7 @@ Would you like to overwrite them?</source>
         <translation>Установить точку останова на функцию &quot;main&quot;</translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Conditions on Breakpoint %1</source>
         <translation>Условия точки останова %1</translation>
     </message>
@@ -3204,7 +3469,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::Internal::CdbDebugEngine</name>
     <message>
-        <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+126"/>
+        <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+132"/>
         <source>Unable to load the debugger engine library &apos;%1&apos;: %2</source>
         <translation>Не удалось загрузить библиотеку отладчика &apos;%1&apos;: %2</translation>
     </message>
@@ -3220,14 +3485,14 @@ Would you like to overwrite them?</source>
         <translation>Не удалось определить &apos;%1&apos; в библиотеке отладчика &apos;%2&apos;</translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+353"/>
         <source>The dumper library was not found at %1.</source>
         <translation type="unfinished">Библиотека дампера не найдена в %1.</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>The console stub process was unable to start &apos;%1&apos;.</source>
-        <translation type="unfinished">Не удалось запустить процесс консоли &apos;%1&apos;.</translation>
+        <translation>Не удалось запустить процесс консоли &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -3240,31 +3505,111 @@ Would you like to overwrite them?</source>
         <translation>Отладчик работает</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+20"/>
         <source>Attaching to a process failed for process id %1: %2</source>
         <translation>Поключение к процессу ID %1 не удалось: %2</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+27"/>
+        <source>Unable to set the image path to %1: %2</source>
+        <translation>Не удалось установить путь образа &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Unable to create a process &apos;%1&apos;: %2</source>
         <translation>Не удалось создать процесс &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+408"/>
+        <location line="+40"/>
+        <source>The process exited with exit code %1.</source>
+        <translation>Процесс завершился с кодом %1.</translation>
+    </message>
+    <message>
+        <location line="+191"/>
+        <source>Continuing with &apos;%1&apos;...</source>
+        <translation>Продолжение &apos;%1&apos;...</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Unable to continue: %1</source>
+        <translation>Не удалось продолжить: %1</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Reverse stepping is not implemented.</source>
+        <translation type="unfinished">Обратное движение не реализовано.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Stepping %1</source>
+        <translation type="unfinished">Шаг %1</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Running to 0x%1...</source>
+        <translation>Выподняется до 0x%1...</translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>Running requested...</source>
+        <translation type="unfinished">Потребовано выполнение...</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Running up to %1:%2...</source>
+        <translation>Выподнение до строки %1:%2...</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Running up to function &apos;%1()&apos;...</source>
+        <translation>Выполнение до функции &apos;%1()&apos;...</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Jump to line is not implemented</source>
+        <translation>Переход на строку не реализован</translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Unable to assign the value &apos;%1&apos; to &apos;%2&apos;: %3</source>
         <translation>Невозможно присвоить &apos;%2&apos; значение &apos;%1&apos;: %3</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
+        <source>Unable to retrieve %1 bytes of memory at 0x%2: %3</source>
+        <translation>Не удалось получить %1 байт памяти начиная с 0x%2: %3</translation>
+    </message>
+    <message>
+        <location line="+32"/>
         <source>Cannot retrieve symbols while the debuggee is running.</source>
-        <translation type="unfinished">Невозможно получить символы, пока отлаживаемая программа работает.</translation>
+        <translation>Не удалось получить символы во время работы отлаживаемой программы.</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+64"/>
         <location line="+6"/>
         <source>Debugger Error</source>
         <translation>Ошибка отладчика</translation>
     </message>
+    <message>
+        <location line="+48"/>
+        <source>Stopped, current thread: %1</source>
+        <translation>Остановлено, текущий поток: %1</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Changing threads: %1 -&gt; %2</source>
+        <translation>Смена потоков: %1 -&gt; %2</translation>
+    </message>
+    <message>
+        <location line="+79"/>
+        <source>Thread %1: Missing debug information for top stack frame (%2).</source>
+        <translation>Поток %1: Отсутствует отладочная информация о вершине кадра стека (%2).</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Thread %1: No debug information available (%2).</source>
+        <translation>Поток %1: Отладочная информация недоступна (%2).</translation>
+    </message>
 </context>
 <context>
     <name>Debugger::Internal::CdbDumperHelper</name>
@@ -3294,7 +3639,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished">Загружена особая библиотека дампера &apos;%1&apos; (%2).</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disabling dumpers due to debuggee crash...</source>
         <translation type="unfinished">Отключение дамперов из-за падения отлаживаемой программы...</translation>
     </message>
@@ -3321,245 +3666,100 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+219"/>
         <source>Querying dumpers for &apos;%1&apos;/&apos;%2&apos; (%3)</source>
-        <translation type="unfinished">Запрос дамперов для &apos;%1&apos;/&apos;%2&apos; (%3)</translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::CdbOptionsPageWidget</name>
-    <message>
-        <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="-23"/>
-        <source>Cdb</source>
-        <translation>Cdb</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <source>Autodetect</source>
-        <translation>Автоопределение</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <source>&quot;Debugging Tools for Windows&quot; could not be found.</source>
-        <translation>Не удалось обнаружить &quot;Debugging Tools for Windows&quot;.</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Checked:
-%1</source>
-        <translation>Проверено:
-%1</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Autodetection</source>
-        <translation>Автоопределение</translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::CdbSymbolPathListEditor</name>
-    <message>
-        <location filename="../../../src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp" line="+42"/>
-        <source>Symbol Server...</source>
-        <translation>Сервер символов...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Adds the Microsoft symbol server providing symbols for operating system libraries.Requires specifying a local cache directory.</source>
-        <translation>Добавляет сервер символов Microsoft, который предоставляет их для файлов операционной системы. Требует указания каталога локального кэша.</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Pick a local cache directory</source>
-        <translation>Выберите каталог для локального кэша</translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::DebugMode</name>
-    <message>
-        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+194"/>
-        <source>Debug</source>
-        <translation>Отладка</translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::DebuggerManager</name>
-    <message>
-        <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+346"/>
-        <source>Continue</source>
-        <translation>Продолжить</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+909"/>
-        <source>Interrupt</source>
-        <translation>Прервать</translation>
-    </message>
-    <message>
-        <location line="-905"/>
-        <source>Reset Debugger</source>
-        <translation>Сбросить отладчик</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Step Over</source>
-        <translation>Перейти через</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step Into</source>
-        <translation>Войти в</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step Over Instruction</source>
-        <translation>Перейти через инструкцию</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step One Instruction</source>
-        <translation>Пройти на одну инструкцию</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step Out</source>
-        <translation>Выйти из функции</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Run to Line</source>
-        <translation>Выполнить до строки</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Run to Outermost Function</source>
-        <translation>Выполнить до внешней функции</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Jump to Line</source>
-        <translation>Перейти на строку</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Toggle Breakpoint</source>
-        <translation>Переключить точку останова</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Add to Watch Window</source>
-        <translation>Добавить в окно наблюдения</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Reverse Direction</source>
-        <translation>Обратное направление</translation>
-    </message>
-    <message>
-        <location line="+252"/>
-        <source>Stop requested...</source>
-        <translation>Потребована остановка...</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+18"/>
-        <source>Stopped.</source>
-        <translation>Остановлено.</translation>
-    </message>
-    <message>
-        <location line="-12"/>
-        <source>Running requested...</source>
-        <translation>Потребован запуск...</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Running...</source>
-        <translation>Выполнение...</translation>
-    </message>
-    <message>
-        <location line="+91"/>
-        <location line="+23"/>
-        <source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
-        <translation>Изменение состояние точки останова требует или полностью остановленную программу, или полностью работающую.</translation>
-    </message>
-    <message>
-        <location line="+38"/>
-        <source>The application requires the debugger engine &apos;%1&apos;, which is disabled.</source>
-        <translation>Приложению требуется движок отладчика &apos;%1&apos;, который выключен.</translation>
+        <translation type="unfinished">Запрос дамперов для &apos;%1&apos;/&apos;%2&apos; (%3)</translation>
     </message>
+</context>
+<context>
+    <name>Debugger::Internal::CdbOptionsPageWidget</name>
     <message>
-        <location line="+711"/>
-        <source> (explicitly set in the Debugger Options)</source>
-        <translation> (установлено в параметрах отладчика)</translation>
+        <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="-23"/>
+        <source>Cdb</source>
+        <translation>Cdb</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on &apos;Rebuild&apos; for the debugging helper.</source>
-        <translation>Помощник отладчика используется для преобразования значений некоторых типов данных Qt и стандартной библиотеки к наглядному виду. Он должен быть собран для каждой версии Qt. Это можно сделать в параметрах Qt, выбрав профиль Qt и нажав на &apos;Пересобрать&apos;.</translation>
+        <location line="+35"/>
+        <source>Autodetect</source>
+        <translation>Автоопределение</translation>
     </message>
     <message>
-        <location line="-661"/>
-        <source>Debugging VS executables is currently not enabled.</source>
-        <translation>Отладка программ созданных VS сейчас отключена.</translation>
+        <location line="+35"/>
+        <source>&quot;Debugging Tools for Windows&quot; could not be found.</source>
+        <translation>Не удалось обнаружить &quot;Debugging Tools for Windows&quot;.</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Starting debugger for tool chain &apos;%1&apos;...</source>
-        <translation>Запускается отладчик из инструментария &apos;%1&apos;...</translation>
+        <location line="+1"/>
+        <source>Checked:
+%1</source>
+        <translation>Проверено:
+%1</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Warning</source>
-        <translation>Предупреждение</translation>
+        <location line="+1"/>
+        <source>Autodetection</source>
+        <translation>Автоопределение</translation>
     </message>
+</context>
+<context>
+    <name>Debugger::Internal::CdbSymbolPathListEditor</name>
     <message>
-        <location line="+0"/>
-        <source>Cannot debug &apos;%1&apos; (tool chain: &apos;%2&apos;): %3</source>
-        <translation>Не удалось отладить &apos;%1&apos; (инструментарий: &apos;%2&apos;): %3</translation>
+        <location filename="../../../src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp" line="+42"/>
+        <source>Symbol Server...</source>
+        <translation>Сервер символов...</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Settings...</source>
-        <translation>Настройки...</translation>
+        <location line="+1"/>
+        <source>Adds the Microsoft symbol server providing symbols for operating system libraries.Requires specifying a local cache directory.</source>
+        <translation>Добавляет сервер символов Microsoft, который предоставляет их для файлов операционной системы. Требует указания каталога локального кэша.</translation>
     </message>
     <message>
-        <location line="+206"/>
-        <source>Save Debugger Log</source>
-        <translation>Сохранить журнал отладчика</translation>
+        <location line="+6"/>
+        <source>Pick a local cache directory</source>
+        <translation>Выберите каталог для локального кэша</translation>
     </message>
+</context>
+<context>
+    <name>Debugger::Internal::CoreGdbAdapter</name>
     <message>
-        <location line="+98"/>
-        <source>Stop Debugger</source>
-        <translation>Остановить отладчик</translation>
+        <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+82"/>
+        <source>Cannot set up communication with child process: %1</source>
+        <translation>Не удалось установить связь с дочерним процессом: %1</translation>
     </message>
     <message>
-        <location line="+282"/>
-        <source>Open Qt preferences</source>
-        <translation>Открыть параметры Qt</translation>
+        <location line="+51"/>
+        <source>Attached to core.</source>
+        <translation type="unfinished">Подключено к дампу.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Turn helper usage off</source>
-        <translation>Выключить помощника</translation>
+        <location line="+24"/>
+        <source>Symbols found.</source>
+        <translation>Символы найдены.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Continue anyway</source>
-        <translation>Всё равно продолжить</translation>
+        <location line="+4"/>
+        <source>Symbols not found in &quot;%1&quot; failed:
+%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Debugging helper missing</source>
-        <translation>Отсутствует помощник отладчика</translation>
+        <location line="+39"/>
+        <source>Gdb process could not be stopped:
+</source>
+        <translation>Не удалось остановить процесс gdb:
+</translation>
     </message>
+</context>
+<context>
+    <name>Debugger::Internal::DebugMode</name>
     <message>
-        <location line="+1"/>
-        <source>The debugger did not find the debugging helper library.</source>
-        <translation>Отладчик не смог найти библиотеку помощника.</translation>
+        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+196"/>
+        <source>Debug</source>
+        <translation>Отладка</translation>
     </message>
 </context>
 <context>
     <name>Debugger::Internal::DebuggerOutputWindow</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+296"/>
+        <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+297"/>
         <source>Debugger</source>
         <translation>Отладчик</translation>
     </message>
@@ -3567,7 +3767,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::Internal::DebuggerPlugin</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+262"/>
+        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+264"/>
         <source>Option &apos;%1&apos; is missing the parameter.</source>
         <translation>У настройки &apos;%1&apos; пропущен параметр.</translation>
     </message>
@@ -3582,12 +3782,12 @@ Would you like to overwrite them?</source>
         <translation>Неверный параметр отладчика: %1</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+22"/>
         <source>Error evaluating command line arguments: %1</source>
         <translation>Ошибка определения параметров командной строки: %1</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Start and Debug External Application...</source>
         <translation>Запустить под отладчиком внешнее приложение...</translation>
     </message>
@@ -3614,7 +3814,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+7"/>
         <source>Start and Attach to Remote Application...</source>
-        <translation type="unfinished">Запустить и подключить к удаленному приложению...</translation>
+        <translation type="unfinished">Запустить и подключить к удалённому приложению...</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3622,7 +3822,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished">Отцепить отладчик</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Stop Debugger/Interrupt Debugger</source>
         <translation>Остановить/прервать отладчик</translation>
     </message>
@@ -3632,7 +3832,7 @@ Would you like to overwrite them?</source>
         <translation>Сбросить отладчик</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+75"/>
         <source>&amp;Views</source>
         <translation type="unfinished">&amp;Виды</translation>
     </message>
@@ -3647,7 +3847,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished">Компоновка по умолчанию</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+79"/>
         <source>Threads:</source>
         <translation>Потоки:</translation>
     </message>
@@ -3657,7 +3857,7 @@ Would you like to overwrite them?</source>
         <translation>Подключение к PID %1.</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+75"/>
         <source>Remove Breakpoint</source>
         <translation>Удалить точки останова</translation>
     </message>
@@ -3677,7 +3877,7 @@ Would you like to overwrite them?</source>
         <translation>Установить точку останова</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+229"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
@@ -3686,11 +3886,16 @@ Would you like to overwrite them?</source>
         <source>Cannot attach to PID 0</source>
         <translation>Нельзя подключиться к PID 0</translation>
     </message>
+    <message>
+        <location line="+17"/>
+        <source>Attaching to core %1.</source>
+        <translation>Подключение к дампу %1.</translation>
+    </message>
 </context>
 <context>
-    <name>Debugger::Internal::DebuggerRunner</name>
+    <name>Debugger::Internal::DebuggerRunControlFactory</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+73"/>
+        <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+78"/>
         <source>Debug</source>
         <translation>Отладка</translation>
     </message>
@@ -3698,12 +3903,12 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::Internal::DebuggerSettings</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggeractions.cpp" line="+119"/>
+        <location filename="../../../src/plugins/debugger/debuggeractions.cpp" line="+118"/>
         <source>Debugger properties...</source>
         <translation>Параметры отладчика...</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
         <source>Adjust column widths to contents</source>
         <translation>Выровнять ширину столбцов по содержимому</translation>
     </message>
@@ -3713,17 +3918,32 @@ Would you like to overwrite them?</source>
         <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Use alternating row colors</source>
         <translation>Использовать чередующиеся цвета строк</translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Show a message box when receiving a signal</source>
+        <translation>Показывать сообщение при получении сигнала</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>Log time stamps</source>
-        <translation type="unfinished">Ставить метки времени</translation>
+        <translation>Ставить метки времени</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+7"/>
+        <source>Operate by instruction</source>
+        <translation type="unfinished">Шаг через инструкцию</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>This switches the debugger to instruction-wise operation mode. In this mode, stepping operates on single instructions and the source location view also shows the disassembled instructions.</source>
+        <translation type="unfinished">Переключает отладчик для работы на уровне инструкций процессора. В этом режиме шаги происходят в пределах одной инструкции, а в окне исходника так же отображается её мнемоника.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Watch expression &quot;%1&quot;</source>
         <translation>Наблюдать выражение &quot;%1&quot;</translation>
     </message>
@@ -3758,47 +3978,62 @@ Would you like to overwrite them?</source>
         <translation>Синхронизировать точки останова</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Hexadecimal</source>
-        <translation>Шестнадцатиричный</translation>
+        <location line="+23"/>
+        <source>Automatically quit debugger</source>
+        <translation>Автоматически закрывать отладчик</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Use tooltips in main editor when debugging</source>
+        <translation>Подсказки в основном редакторе при отладке</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
+        <translation>Включает всплывающие подсказки для значений переменных во время отладки. Это может её замедлить, не предоставляя достоверной информации, так как не учитывается область видимости. Данный параметр отключён по умолчанию.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Decimal</source>
-        <translation>Десятичный</translation>
+        <source>Use tooltips in locals view when debugging</source>
+        <translation>Подсказки в обзоре локальных переменных при отладке</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Octal</source>
-        <translation>Восьмиричный</translation>
+        <location line="+1"/>
+        <source>Checking this will enable tooltips in the locals view during debugging.</source>
+        <translation>Включает всплывающие подсказки в обзоре локальных переменных во время отладки.</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Binary</source>
-        <translation>Двоичный</translation>
+        <location line="+8"/>
+        <source>Use tooltips in breakpoints view when debugging</source>
+        <translation>Подсказки в обзоре точек останова при отладке</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Raw</source>
-        <translation>Как есть</translation>
+        <location line="+1"/>
+        <source>Checking this will enable tooltips in the breakpoints view during debugging.</source>
+        <translation>Включает подсказки в обзоре точек останова во время отладки.</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Natural</source>
-        <translation>Исходный</translation>
+        <location line="+8"/>
+        <source>Show address data in breakpoints view when debugging</source>
+        <translation>Показывать адрес в обзоре точек останова при отладке</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Automatically quit debugger</source>
-        <translation>Автоматически закрывать отладчик</translation>
+        <location line="+1"/>
+        <source>Checking this will show a column with address information in the breakpoint view during debugging.</source>
+        <translation>Включает отображение столбца с информацией об адресе в обзоре точек останова во время отладки.</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use tooltips when debugging</source>
-        <translation>Использовать всплывающие подсказки при отладке</translation>
+        <location line="+9"/>
+        <source>Show address data in stack view when debugging</source>
+        <translation>Показывать адрес в обзоре стека при отладке</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+1"/>
+        <source>Checking this will show a column with address information in the stack view during debugging.</source>
+        <translation>Включает столбец с информацией об адресе с обзоре стека во время отладки.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>List source files</source>
         <translation>Показать файлы исходников</translation>
     </message>
@@ -3826,7 +4061,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::Internal::DebuggingHelperOptionPage</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-906"/>
+        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-925"/>
         <source>Debugging Helper</source>
         <translation>Помощник отладчика</translation>
     </message>
@@ -3841,122 +4076,40 @@ Would you like to overwrite them?</source>
         <translation>Ctrl+Shift+F11</translation>
     </message>
 </context>
-<context>
-    <name>Debugger::Internal::DisassemblerHandler</name>
-    <message>
-        <location filename="../../../src/plugins/debugger/disassemblerhandler.cpp" line="+135"/>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Symbol</source>
-        <translation>Символ</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Mnemonic</source>
-        <translation>Мнемоника</translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::DisassemblerWindow</name>
-    <message>
-        <location filename="../../../src/plugins/debugger/disassemblerwindow.cpp" line="+46"/>
-        <source>Disassembler</source>
-        <translation>Дизассемблер</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <source>Adjust column widths to contents</source>
-        <translation>Выровнять ширину столбцов по содержимому</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Always adjust column widths to contents</source>
-        <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Reload disassembler listing</source>
-        <translation>Перезагрузить листинг дизассемблера</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Always reload disassembler listing</source>
-        <translation>Всегда перезагружать листинг дизассемблера</translation>
-    </message>
-</context>
 <context>
     <name>Debugger::Internal::GdbEngine</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+266"/>
+        <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+327"/>
         <source>The Gdb process failed to start. Either the invoked program &apos;%1&apos; is missing, or you may have insufficient permissions to invoke the program.</source>
         <translation>Процесс Gdb не смог запуститься. Или вызываемая программа &apos;%1&apos; отсутствует, или у вас нет прав на ее вызов.</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>The Gdb process crashed some time after starting successfully.</source>
         <translation>Процесс Gdb вылетел через некоторое время после успешного запуска.</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+40"/>
+        <location line="+3"/>
         <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
         <translation>У последней функции waitFor...() истекло время ожидания. Состояние QProcess не изменилось, и вы можете попробовать вызвать waitFor...() снова.</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+4"/>
         <source>An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel.</source>
         <translation>Возникла ошибка при отправке данных процессу Gdb. Например, процесс может уже не работать или он мог закрыть свой входной канал.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
         <translation>Возникла ошибка при получении данных от процесса Gdb. Например, процесс может уже не работать.</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>An unknown error in the Gdb process occurred. This is the default return value of error().</source>
-        <translation>Неизвестная ошибка возникла у процесса Gdb. Это значение по умолчанию у error().</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location line="+40"/>
-        <location line="+965"/>
-        <location line="+15"/>
-        <location line="+21"/>
-        <location line="+407"/>
+        <location line="+1044"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location line="-1437"/>
-        <source>The upload process failed to start. Either the invoked script &apos;%1&apos; is missing, or you may have insufficient permissions to invoke the program.</source>
-        <translation>Процесс выгрузки не смог запуститься. Или запускаемый скрипт &apos;%1&apos; отсутствует, или у вас недостаточно прав для запуска программы.</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>The upload process crashed some time after starting successfully.</source>
-        <translation>Процесс выгрузки вылетел через некоторое время после успешного запуска.</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
-        <translation>Возникла ошибка при отправке данных процессу выгрузки. Например, процесс может уже не работать или он мог закрыть свой входной канал.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
-        <translation>Возникла ошибка при получении данных от процесса выгрузки. Например, процесс может уже не работать.</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>An unknown error in the upload process occurred. This is the default return value of error().</source>
-        <translation>Неизвестная ошибка возникла у процесса выгрузки. Это значение по умолчанию у error().</translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="-927"/>
         <source>Library %1 loaded.</source>
         <translation>Библиотека %1 загружена.</translation>
     </message>
@@ -3991,83 +4144,76 @@ Would you like to overwrite them?</source>
         <translation>Поток %1 выбран.</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+43"/>
         <source>Reading %1...</source>
         <translation>Чтение %1...</translation>
     </message>
     <message>
-        <location line="+102"/>
-        <source>Debugger Error</source>
-        <translation>Ошибка отладчика</translation>
-    </message>
-    <message>
-        <location line="+115"/>
+        <location line="+224"/>
         <source>Stopping temporarily.</source>
         <translation>Временно остановлено.</translation>
     </message>
     <message>
-        <location line="+80"/>
-        <source>Continuing after temporary stop.</source>
-        <translation>Продолжение после временной остановки.</translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Core file loaded.</source>
-        <translation>Файл ядра загружен.</translation>
+        <location line="+49"/>
+        <source>Process failed to start.</source>
+        <translation>Не удалось запустить процесс.</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+139"/>
         <source>Jumped. Stopped.</source>
         <translation>Переход сделан. Остановлено.</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <location line="+243"/>
+        <location line="+226"/>
         <source>Run to Function finished. Stopped.</source>
         <translation>Запуск до функции выполнен. Остановлено.</translation>
     </message>
     <message>
-        <location line="-160"/>
-        <source>Program exited with exit code %1</source>
-        <translation>Программа завершилась с кодом %1</translation>
+        <location line="-99"/>
+        <source>Processing queued commands.</source>
+        <translation>Обработка очереди команд.</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Program exited after receiving signal %1</source>
-        <translation>Программазавершилась после получения сигнала %1</translation>
+        <location line="+15"/>
+        <source>Loading %1...</source>
+        <translation>Загружается %1...</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Program exited normally</source>
-        <translation>Программа нормально завершилась</translation>
+        <location line="+127"/>
+        <source>Stopped at breakpoint.</source>
+        <translation>Остановлено на точке останова.</translation>
     </message>
     <message>
-        <location line="+34"/>
-        <source>Processing queued commands.</source>
-        <translation>Обработка очереди команд.</translation>
+        <location line="+33"/>
+        <source>&lt;p&gt;The inferior stopped because it received a signal from the Operating System.&lt;p&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;Signal name : &lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Signal meaning : &lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <translation>&lt;p&gt;Приложение остановлено так как оно получило сигнал от операционной системы.&lt;p&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;Сигнал: &lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Назначение: &lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
-    <message>
-        <location line="+14"/>
-        <source>Loading %1...</source>
-        <translation>Загружается %1...</translation>
+    <message>
+        <location line="+4"/>
+        <location line="+1"/>
+        <source> &lt;Unknown&gt; </source>
+        <translation> &lt;Неизвестный&gt; </translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Stopped at breakpoint.</source>
-        <translation>Остановлено на точке останова.</translation>
+        <location line="+2"/>
+        <source>Signal received</source>
+        <translation>Получен сигнал</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-190"/>
+        <location line="+195"/>
+        <location line="+20"/>
+        <location line="+106"/>
         <source>Stopped.</source>
         <translation>Остановлено.</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-124"/>
         <source>Stopped: &quot;%1&quot;</source>
         <translation>Остановлено: &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+76"/>
         <source>The debugger you are using identifies itself as:</source>
         <translation>Отладчик, используемый вами, определяет себя как:</translation>
     </message>
@@ -4082,38 +4228,40 @@ Using gdb 6.7 or later is strongly recommended.</source>
     </message>
     <message>
         <location line="+29"/>
-        <location line="+15"/>
-        <location line="+21"/>
+        <source>Starting executable failed</source>
+        <translation>Не удалось запустить программу</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>Starting executable failed:
 </source>
-        <translation>Запуск программы не удался:
+        <translation>Не удалось запустить программу:
 </translation>
     </message>
     <message>
-        <location line="+146"/>
-        <location line="+27"/>
-        <source>Debugger Startup Failure</source>
-        <translation>Запуск отладчика не удался</translation>
+        <location line="+2633"/>
+        <source>Adapter start failed</source>
+        <translation>Не удалось запустить адаптер</translation>
     </message>
     <message>
-        <location line="-26"/>
-        <source>Cannot set up communication with child process: %1</source>
-        <translation>Не удалось установить связь с дочерним процессом: %1</translation>
+        <location line="+14"/>
+        <source>Inferior start preparation failed</source>
+        <translation type="unfinished">Не удалось запустить подготовку подчинённого</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Starting Debugger: </source>
-        <translation>Запускается отладчик: </translation>
+        <location line="+106"/>
+        <source>Inferior start failed</source>
+        <translation type="unfinished">Не удалось запустить подчинённого</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Cannot start debugger: %1</source>
-        <translation>Невозможно запустить отладчик: %1</translation>
+        <location line="+12"/>
+        <source>Inferior shutdown failed</source>
+        <translation type="unfinished">Не удалось остановить подчинённого</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Gdb Running...</source>
-        <translation>Gdb запущен...</translation>
+        <location line="-109"/>
+        <source>Inferior prepared for startup.</source>
+        <translation type="unfinished">Подчинённый готов к запуску.</translation>
     </message>
     <message>
         <location line="+71"/>
@@ -4126,27 +4274,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>В настройках указан файл скрипта &apos;%1&apos;, который сейчас недоступен. Если файл скрипта не обязателен, просто очистите поле, чтобы не было этого предупреждения.</translation>
     </message>
     <message>
-        <location line="+95"/>
-        <source>Attached to running process. Stopped.</source>
-        <translation>Подключено к работающему процессу. Остановлено.</translation>
-    </message>
-    <message>
-        <location line="+55"/>
-        <source>Connecting to remote server failed:</source>
-        <translation>Не удалось подключение к удаленному серверу:</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Debugger exited.</source>
-        <translation>Отладчик закончил работу.</translation>
-    </message>
-    <message>
-        <location line="+591"/>
-        <source>&lt;could not retreive module information&gt;</source>
-        <translation>&lt;не удалось получить информацию о модуле&gt;</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="-1956"/>
         <source>Unable to run &apos;%1&apos;: %2</source>
         <translation>Не удалось запустить &apos;%1&apos;: %2</translation>
     </message>
@@ -4158,12 +4286,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     </message>
     <message>
         <location line="+30"/>
-        <location line="+83"/>
+        <location line="+93"/>
         <source>Retrieving data for stack view...</source>
         <translation>Получение данных о стеке...</translation>
     </message>
     <message numerus="yes">
-        <location line="+688"/>
+        <location line="+698"/>
         <source>Dumper version %1, %n custom dumpers found.</source>
         <translation type="unfinished">
             <numerusform>Дампер версии %1, обнаружен %n пользовательский дампер.</numerusform>
@@ -4172,18 +4300,103 @@ Using gdb 6.7 or later is strongly recommended.</source>
         </translation>
     </message>
     <message>
-        <location line="+644"/>
+        <location line="+666"/>
         <source>The dumper library was not found at %1.</source>
         <translation type="unfinished">Библиотека дампера не найдена в &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="-1067"/>
+        <location line="-1094"/>
         <source>&lt;not in scope&gt;</source>
         <extracomment>Variable</extracomment>
         <translation>&lt;не в области&gt;</translation>
     </message>
+    <message>
+        <location line="-2268"/>
+        <source>An unknown error in the Gdb process occurred. </source>
+        <translation>Неизвестная ошибка возникла у процесса Gdb. </translation>
+    </message>
+    <message>
+        <location line="+322"/>
+        <source>Stop requested...</source>
+        <translation>Потребована остановка...</translation>
+    </message>
+    <message>
+        <location line="+134"/>
+        <source>Executable failed</source>
+        <translation>Программа завершилась с ошибкой</translation>
+    </message>
+    <message>
+        <location line="+166"/>
+        <source>Function reached. Stopped.</source>
+        <translation>Достигнута функция. Остановлено.</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Program exited with exit code %1.</source>
+        <translation>Программа завершилась с кодом %1.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Program exited after receiving signal %1.</source>
+        <translation>Программа завершилась после получения сигнала %1.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Program exited normally.</source>
+        <translation>Программа нормально завершилась.</translation>
+    </message>
+    <message>
+        <location line="-481"/>
+        <source>Running...</source>
+        <translation>Выполнение...</translation>
+    </message>
+    <message>
+        <location line="+294"/>
+        <source>Continuing after temporary stop.</source>
+        <translation>Продолжение после временного останова.</translation>
+    </message>
+    <message>
+        <location line="+697"/>
+        <source>Running requested...</source>
+        <translation>Потребован запуск...</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Step requested...</source>
+        <translation>Потребован шаг...</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Step by instruction requested...</source>
+        <translation>Потребован шаг через инструкцию...</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Finish function requested...</source>
+        <translation>Потребован выход из функции...</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Step next requested...</source>
+        <translation type="unfinished">Потребован шаг через...</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Step next instruction requested...</source>
+        <translation type="unfinished">Потребован шаг через инструкцию...</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Run to line %1 requested...</source>
+        <translation>Потребовано выполнение до строки %1...</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Run to function %1 requested...</source>
+        <translation>Потребовано выполнение до функции %1...</translation>
+    </message>
     <message numerus="yes">
-        <location line="+94"/>
+        <location line="+1074"/>
         <source>Retrieving data for watch view (%n requests pending)...</source>
         <translation>
             <numerusform>Получение наблюдаемых данных (%n запрос ожидается)...</numerusform>
@@ -4192,17 +4405,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
         </translation>
     </message>
     <message>
-        <location line="+257"/>
+        <location line="+289"/>
         <source>Finished retrieving data.</source>
         <translation>Закончено получение данных.</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+43"/>
         <source>Debugging helpers not found.</source>
         <translation type="unfinished">Помощники отладчика не найдены.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+131"/>
         <source>Custom dumper setup: %1</source>
         <translation type="unfinished">Настройка пользовательского дампера: %1</translation>
     </message>
@@ -4222,7 +4435,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         </translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>%1 &lt;shadowed %2&gt;</source>
         <extracomment>Variable %1 is the variable name, %2 is a simple count</extracomment>
         <translation type="unfinished">%1 &lt;скрывает %2&gt;</translation>
@@ -4231,10 +4444,10 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <location line="+4"/>
         <source>&lt;shadowed&gt;</source>
         <extracomment>Type of local variable or parameter shadowed by another</extracomment>
-        <translation type="unfinished">&lt;скрыто&gt;</translation>
+        <translation type="unfinished">&lt;перекрыто&gt;</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+131"/>
         <source>&lt;n/a&gt;</source>
         <translation type="unfinished">&lt;н/д&gt;</translation>
     </message>
@@ -4244,7 +4457,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>&lt;безымянное объединение&gt;</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>&lt;no information&gt;</source>
         <extracomment>About variable&apos;s value</extracomment>
         <translation>&lt;нет информации&gt;</translation>
@@ -4269,6 +4482,33 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <source>Loading dumpers via debugger call (%1)...</source>
         <translation type="unfinished">Загрузка дамперов через вызов отладчика (%1)...</translation>
     </message>
+    <message>
+        <location line="+240"/>
+        <location line="+18"/>
+        <location line="+14"/>
+        <source>Disassembler failed: %1</source>
+        <translation>Не удалось дизассемблировать: %1</translation>
+    </message>
+    <message>
+        <location line="+123"/>
+        <source>Setting breakpoints...</source>
+        <translation>Установка точек останова...</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Starting inferior...</source>
+        <translation type="unfinished">Запуск подчинённого...</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Adapter shutdown failed</source>
+        <translation>Не удалось выключить адаптер</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <source>Adapter crashed</source>
+        <translation>Адаптер аварийно завершился</translation>
+    </message>
 </context>
 <context>
     <name>Debugger::Internal::GdbOptionsPage</name>
@@ -4288,6 +4528,14 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Выбор размещения скрипта начальных действий</translation>
     </message>
 </context>
+<context>
+    <name>Debugger::Internal::MemoryViewAgent</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/debuggeragents.cpp" line="+92"/>
+        <source>Memory $</source>
+        <translation>Память $</translation>
+    </message>
+</context>
 <context>
     <name>Debugger::Internal::ModulesModel</name>
     <message>
@@ -4324,17 +4572,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Обновить список модулей</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+27"/>
         <source>Adjust column widths to contents</source>
         <translation>Выровнять ширину столбцов по содержимому</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Always adjust column widths to contents</source>
         <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
         <source>Show source files for module &quot;%1&quot;</source>
         <translation>Показать исходники для модуля &quot;%1&quot;</translation>
     </message>
@@ -4374,7 +4622,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Показать символы в файле &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+79"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
@@ -4397,66 +4645,217 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::OutputCollector</name>
     <message>
-        <location filename="../../../src/plugins/debugger/outputcollector.cpp" line="+95"/>
-        <source>Cannot create temporary file: %1</source>
-        <translation>Не удалось создать временный файл: %1</translation>
+        <location filename="../../../src/plugins/debugger/outputcollector.cpp" line="+95"/>
+        <source>Cannot create temporary file: %1</source>
+        <translation>Не удалось создать временный файл: %1</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Cannot create FiFo %1: %2</source>
+        <translation>Не удалось создать FiFo %1: %2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cannot open FiFo %1: %2</source>
+        <translation>Не удалось открыть FiFo %1: %2</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::PlainGdbAdapter</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+112"/>
+        <source>Cannot set up communication with child process: %1</source>
+        <translation>Не удалось установить связь с дочерним процессом: %1</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Starting executable failed:
+</source>
+        <translation>Не удалось запустить программу:
+</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Inferior started.</source>
+        <translation type="unfinished">Подчинённый запущен.</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Inferior process could not be stopped:
+</source>
+        <translation type="unfinished">Не удалось остановить подчинённый процесс:
+</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Gdb process could not be stopped:
+</source>
+        <translation>Не удалось остановить процесс gdb:
+</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Debugger Error</source>
+        <translation>Ошибка отладчика</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::RegisterHandler</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/registerhandler.cpp" line="+112"/>
+        <source>Name</source>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value (base %1)</source>
+        <translation>Значение (основание %1)</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::RegisterWindow</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/registerwindow.cpp" line="+151"/>
+        <source>Registers</source>
+        <translation>Регистры</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Adjust column widths to contents</source>
+        <translation>Выровнять ширину столбцов по содержимому</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Always adjust column widths to contents</source>
+        <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
+    </message>
+    <message>
+        <location line="-34"/>
+        <source>Reload register listing</source>
+        <translation>Перезагрузить список регистров</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Always reload register listing</source>
+        <translation>Всегда перезагружать список регистров</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Open memory editor</source>
+        <translation>Открыть редактор памяти</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open memory editor at %1</source>
+        <translation>Открыть редактор памяти с %1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hexadecimal</source>
+        <translation>Шестнадцатиричный</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Decimal</source>
+        <translation>Десятичный</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Octal</source>
+        <translation>Восьмиричный</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Binary</source>
+        <translation>Двоичный</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::RemoteGdbAdapter</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+90"/>
+        <source>Cannot set up communication with child process: %1</source>
+        <translation>Не удалось установить связь с дочерним процессом: %1</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>The upload process failed to start. Either the invoked script &apos;%1&apos; is missing, or you may have insufficient permissions to invoke the program.</source>
+        <translation>Не удалось запустить процесс выгрузки. Или исполняемый скрипт &apos;%1&apos; отсутствует, или у вас недостаточно прав для запуска программы.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>The upload process crashed some time after starting successfully.</source>
+        <translation>Процесс выгрузки аварийно завершился через некоторое время после успешного запуска.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
+        <translation>У последней функции waitFor...() истекло время ожидания. Состояние QProcess не изменилось, и вы можете попробовать вызвать waitFor...() снова.</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Cannot create FiFo %1: %2</source>
-        <translation>Не удалось создать FiFo %1: %2</translation>
+        <location line="+5"/>
+        <source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
+        <translation>Возникла ошибка при отправке данных процессу выгрузки. Например, процесс может уже не работать или он мог закрыть свой входной канал.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Cannot open FiFo %1: %2</source>
-        <translation>Не удалось открыть FiFo %1: %2</translation>
+        <location line="+5"/>
+        <source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
+        <translation>Возникла ошибка при получении данных от процесса выгрузки. Например, процесс может уже не работать.</translation>
     </message>
-</context>
-<context>
-    <name>Debugger::Internal::RegisterHandler</name>
     <message>
-        <location filename="../../../src/plugins/debugger/registerhandler.cpp" line="+90"/>
-        <source>Name</source>
-        <translation>Имя</translation>
+        <location line="+4"/>
+        <source>An unknown error in the upload process occurred. This is the default return value of error().</source>
+        <translation>У процесса выгрузки возникла неизвестная ошибка. Это значение error() возвращает по умолчанию.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Value</source>
-        <translation>Значение</translation>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation>Ошибка</translation>
     </message>
-</context>
-<context>
-    <name>Debugger::Internal::RegisterWindow</name>
     <message>
-        <location filename="../../../src/plugins/debugger/registerwindow.cpp" line="+54"/>
-        <source>Registers</source>
-        <translation>Регистры</translation>
+        <location line="+52"/>
+        <source>Starting remote executable failed:
+</source>
+        <translation>Не удалось удалённо запустить программу:
+</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Adjust column widths to contents</source>
-        <translation>Выровнять ширину столбцов по содержимому</translation>
+        <location line="+15"/>
+        <location line="+22"/>
+        <source>Connecting to remote server failed:
+</source>
+        <translation>Не удалось подключиться к удалённому серверу:
+</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Always adjust column widths to contents</source>
-        <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
+        <location line="-3"/>
+        <source>Attached to stopped inferior.</source>
+        <translation type="unfinished">Подключено к остановленному подчинённому.</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Reload register listing</source>
-        <translation>Перезагрузить список регистров</translation>
+        <location line="+43"/>
+        <source>Inferior process could not be stopped:
+</source>
+        <translation type="unfinished">Не удалось остановить подчинённый процесс:
+</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Always reload register listing</source>
-        <translation>Всегда перезагружать список регистров</translation>
+        <location line="+12"/>
+        <source>Gdb process could not be stopped:
+</source>
+        <translation>Не удалось остановить процесс gdb:
+</translation>
     </message>
 </context>
 <context>
     <name>Debugger::Internal::ScriptEngine</name>
     <message>
-        <location filename="../../../src/plugins/debugger/script/scriptengine.cpp" line="+467"/>
+        <location filename="../../../src/plugins/debugger/script/scriptengine.cpp" line="+244"/>
+        <source>Running requested...</source>
+        <translation>Потребован запуск...</translation>
+    </message>
+    <message>
+        <location line="+228"/>
         <source>&apos;%1&apos; contains no identifier</source>
         <translation>&apos;%1&apos; не содержит идентификаторов</translation>
     </message>
@@ -4471,7 +4870,8 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Робкий отказ вычислить выражение &apos;%1&apos; с возможными побочными эффектами</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+81"/>
+        <location line="+50"/>
         <source>Stopped.</source>
         <translation>Остановлено.</translation>
     </message>
@@ -4515,37 +4915,43 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::StackHandler</name>
     <message>
-        <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+54"/>
+        <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+55"/>
+        <location line="+14"/>
         <source>Address:</source>
         <translation>Адрес:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-13"/>
+        <location line="+14"/>
         <source>Function:</source>
         <translation>Функция:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-13"/>
+        <location line="+14"/>
         <source>File:</source>
         <translation>Файл:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-13"/>
+        <location line="+14"/>
         <source>Line:</source>
         <translation>Строка:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-13"/>
+        <location line="+14"/>
         <source>From:</source>
         <translation>Из:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-13"/>
+        <location line="+14"/>
         <source>To:</source>
         <translation>Ð’:</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -4555,7 +4961,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>&lt;Более&gt;</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+44"/>
         <source>Level</source>
         <translation>Уровень</translation>
     </message>
@@ -4583,22 +4989,42 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::StackWindow</name>
     <message>
-        <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+55"/>
+        <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+60"/>
         <source>Stack</source>
         <translation>Стек</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Copy contents to clipboard</source>
         <translation>Скопировать содержимое в буфер обмена</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Open memory editor</source>
+        <translation>Открыть редактор памяти</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open memory editor at %1</source>
+        <translation>Открыть редактор памяти с %1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open disassembler</source>
+        <translation>Открыть дизассемблер</translation>
+    </message>
     <message>
         <location line="+3"/>
+        <source>Open disassembler at %1</source>
+        <translation>Открыть дизассемблер с %1</translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Adjust column widths to contents</source>
         <translation>Выровнять ширину столбцов по содержимому</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Always adjust column widths to contents</source>
         <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
     </message>
@@ -4632,12 +5058,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::TcfEngine</name>
     <message>
-        <location filename="../../../src/plugins/debugger/tcf/tcfengine.cpp" line="+189"/>
+        <location filename="../../../src/plugins/debugger/tcf/tcfengine.cpp" line="+183"/>
         <source>%1.</source>
         <translation>%1.</translation>
     </message>
     <message>
-        <location line="+381"/>
+        <location line="+38"/>
+        <source>Running requested...</source>
+        <translation>Потребован запуск...</translation>
+    </message>
+    <message>
+        <location line="+340"/>
         <source>Stopped.</source>
         <translation>Остановлено.</translation>
     </message>
@@ -4645,7 +5076,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::ThreadsHandler</name>
     <message>
-        <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+107"/>
+        <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+108"/>
         <source>Thread: %1</source>
         <translation>Поток: %1</translation>
     </message>
@@ -4673,10 +5104,100 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
     </message>
 </context>
+<context>
+    <name>Debugger::Internal::TrkGdbAdapter</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1502"/>
+        <source>Connecting to trk server adapter failed:
+</source>
+        <translation>Не удалось подключиться к адаптеру trk сервера:
+</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Inferior running.</source>
+        <translation type="unfinished">Подчинённый выполняется.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Connecting to remote server failed:</source>
+        <translation>Не удалось подключение к удалённому серверу:</translation>
+    </message>
+    <message>
+        <location line="+266"/>
+        <source>Inferior process could not be stopped:
+</source>
+        <translation type="unfinished">Не удалось остановить подчинённый процесс:
+</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Gdb process could not be stopped:
+</source>
+        <translation>Не удалось остановить процесс gdb:
+</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::TrkOptionsPage</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
+        <source>S60 / Trk</source>
+        <translation>S60 / Trk</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::TrkOptionsWidget</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/trkoptionswidget.ui"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Gdb</source>
+        <translation>Gdb</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Symbian ARM gdb location:</source>
+        <translation>Размещение gdb для Symbian ARM:</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Cygwin location:</source>
+        <translation>Размещение Cygwin:</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Communication</source>
+        <translation>Связь</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Serial Port</source>
+        <translation>Последовательный порт</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Bluetooth</source>
+        <translation>Bluetooth</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Device:</source>
+        <translation>Устройство:</translation>
+    </message>
+</context>
 <context>
     <name>Debugger::Internal::WatchData</name>
     <message>
-        <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+69"/>
+        <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+70"/>
         <source>&lt;not in scope&gt;</source>
         <translation>&lt;вне области&gt;</translation>
     </message>
@@ -4684,7 +5205,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::WatchHandler</name>
     <message>
-        <location line="+187"/>
+        <location line="+224"/>
         <source>Expression</source>
         <translation>Выражение</translation>
     </message>
@@ -4719,12 +5240,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Внутрениий ID</translation>
     </message>
     <message>
-        <location line="+955"/>
+        <location line="+1"/>
+        <source>Generation</source>
+        <translation>Поколение</translation>
+    </message>
+    <message>
+        <location line="+1074"/>
         <source>&lt;Edit&gt;</source>
         <translation type="unfinished">&lt;Изменить&gt;</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-1056"/>
         <source>Root</source>
         <translation type="unfinished">Корень</translation>
     </message>
@@ -4747,7 +5273,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::WatchModel</name>
     <message>
-        <location line="+372"/>
+        <location line="+404"/>
         <source>decimal</source>
         <translation type="unfinished">десятичный</translation>
     </message>
@@ -4767,7 +5293,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation type="unfinished">восьмиричный</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+83"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
@@ -4785,7 +5311,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::WatchWindow</name>
     <message>
-        <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+120"/>
+        <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+127"/>
         <source>Locals and Watchers</source>
         <translation type="unfinished">Локальные и наблюдаемые переменные</translation>
     </message>
@@ -4810,24 +5336,34 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Сменить формат выражения</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+14"/>
+        <source>Open memory editor...</source>
+        <translation>Открыть редактор памяти...</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Adjust column widths to contents</source>
         <translation>Выровнять ширину столбцов по содержимому</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Always adjust column widths to contents</source>
         <translation>Всегда выравнивать ширину столбцов по содержимому</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-29"/>
         <source>Insert new watch item</source>
         <translation>Вставить новый наблюдаемый элемент</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select widget to watch</source>
-        <translation type="unfinished">Выбрать виджет для слежения</translation>
+        <translation>Выбрать виджет для слежения</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Open memory editor at %1</source>
+        <translation>Открыть редактор памяти с %1</translation>
     </message>
 </context>
 <context>
@@ -4848,12 +5384,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
         <source>Debugging helper</source>
-        <translation type="unfinished">Помощник отладчика</translation>
+        <translation>Помощник отладчика</translation>
     </message>
     <message>
         <location/>
         <source>This will enable nice display of Qt and Standard Library objects in the Locals&amp;Watchers view</source>
-        <translation type="unfinished">Включит удобное отображение объектов Qt и стандартной библиотеки в окне наблюдения за переменными</translation>
+        <translation type="unfinished">Включит удобное отображение объектов Qt и стандартной библиотеки в окне локальных и наблюдаемых переменных</translation>
     </message>
     <message>
         <location/>
@@ -4868,7 +5404,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location/>
         <source>Use debugging helper from custom location</source>
-        <translation type="unfinished">Использовать особое размещение помощника</translation>
+        <translation>Использовать особый путь к помощнику</translation>
     </message>
     <message>
         <location/>
@@ -4878,13 +5414,13 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location/>
         <source>Debug debugging helper</source>
-        <translation type="unfinished">Отладить помощника отладчика</translation>
+        <translation>Отладить помощника отладчика</translation>
     </message>
 </context>
 <context>
     <name>DependenciesModel</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+121"/>
+        <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+123"/>
         <source>Unable to add dependency</source>
         <translation>Не удалось добавить зависимость</translation>
     </message>
@@ -4914,12 +5450,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/designer/designerconstants.h" line="+38"/>
         <source>Designer</source>
-        <translation type="unfinished">Дизайнер</translation>
+        <translation>Дизайнер</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Class Generation</source>
-        <translation type="unfinished">Создание класса</translation>
+        <translation>Создание класса</translation>
     </message>
 </context>
 <context>
@@ -4957,31 +5493,18 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location/>
         <source>Support for changing languages at runtime</source>
-        <translation>Поддержка смены языка во время работы</translation>
+        <translation>Поддержка смены языка во время работы программы</translation>
     </message>
     <message>
         <location/>
-        <source>Include Qt module name</source>
-        <translation>Подключить модуль Qt по имени</translation>
-    </message>
-</context>
-<context>
-    <name>Designer::Internal::EditorWidget</name>
-    <message>
-        <location filename="../../../src/plugins/designer/editorwidget.cpp" line="+174"/>
-        <source>Action editor</source>
-        <translation>Редактор действий</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Signals and slots editor</source>
-        <translation>Редактор сигналов и слотов</translation>
+        <source>Use Qt module name in #include-directive</source>
+        <translation>Использовать в директиве #include название модуля Qt</translation>
     </message>
 </context>
 <context>
     <name>Designer::Internal::FormClassWizardDialog</name>
     <message>
-        <location filename="../../../src/plugins/designer/cpp/formclasswizarddialog.cpp" line="+52"/>
+        <location filename="../../../src/plugins/designer/cpp/formclasswizarddialog.cpp" line="+50"/>
         <source>Qt Designer Form Class</source>
         <translation>Класс формы Qt Designer</translation>
     </message>
@@ -4989,7 +5512,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Designer::Internal::FormClassWizardPage</name>
     <message>
-        <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+146"/>
+        <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+148"/>
         <source>%1 - Error</source>
         <translation>%1 - Ошибка</translation>
     </message>
@@ -5024,7 +5547,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+1"/>
         <source>Creates a Qt Designer form file (.ui).</source>
-        <translation>Создает файл формы Qt Designer (.ui).</translation>
+        <translation>Создание файла формы Qt Designer (.ui).</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -5034,38 +5557,43 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+1"/>
         <source>Creates a Qt Designer form file (.ui) with a matching class.</source>
-        <translation>Создает файл формы Qt Designer (.ui) с подходящим классом.</translation>
+        <translation>Создание файла формы Qt Designer (.ui) с подходящим классом.</translation>
     </message>
 </context>
 <context>
     <name>Designer::Internal::FormEditorW</name>
     <message>
-        <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+272"/>
-        <source>Designer widgetbox</source>
-        <translation>Набор виджетов дизайнера</translation>
+        <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+334"/>
+        <location line="+170"/>
+        <source>Widget Box</source>
+        <translation>Панель виджетов</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Object inspector</source>
+        <location line="-165"/>
+        <location line="+169"/>
+        <source>Object Inspector</source>
         <translation>Инспектор объектов</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Property editor</source>
+        <location line="-164"/>
+        <location line="+168"/>
+        <source>Property Editor</source>
         <translation>Редактор свойств</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Signals and slots editor</source>
+        <location line="-163"/>
+        <location line="+167"/>
+        <source>Signals &amp; Slots Editor</source>
         <translation>Редактор сигналов и слотов</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Action editor</source>
+        <location line="-163"/>
+        <location line="+167"/>
+        <source>Action Editor</source>
         <translation>Редактор действий</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-125"/>
         <source>For&amp;m editor</source>
         <translation>Редактор &amp;форм</translation>
     </message>
@@ -5097,7 +5625,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+5"/>
         <source>Edit tab order</source>
-        <translation>Изменение порядка переходов</translation>
+        <translation>Изменение порядка обхода</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -5140,7 +5668,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Ctrl+J</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+20"/>
+        <source>Views</source>
+        <translation>Представления</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Locked</source>
+        <translation type="unfinished">Закрыто</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Reset to Default Layout</source>
+        <translation type="unfinished">Восстановить исходное размещение</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Ctrl+Alt+R</source>
         <translation>Ctrl+Alt+R</translation>
     </message>
@@ -5155,12 +5698,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Предпросмотр в</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+48"/>
         <source>Designer</source>
         <translation>Дизайнер</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+161"/>
         <source>The image could not be created: %1</source>
         <translation>Картинка не может быть создана: %1</translation>
     </message>
@@ -5181,7 +5724,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Designer::Internal::FormWindowEditor</name>
     <message>
-        <location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+163"/>
+        <location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+166"/>
         <source>untitled</source>
         <translation>неозаглавленный</translation>
     </message>
@@ -5220,7 +5763,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Не удалось найти в %2 определение класса &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+475"/>
         <source>Error finding/adding a slot.</source>
         <translation>Ошибка поиска/добавления слота.</translation>
     </message>
@@ -5252,48 +5795,7 @@ Rebuilding the project might help.</source>
     <message>
         <location/>
         <source>Remove</source>
-        <translation>Удалить</translation>
-    </message>
-</context>
-<context>
-    <name>DuiEditor::Internal::DuiEditorPlugin</name>
-    <message>
-        <location filename="../../../src/plugins/duieditor/duieditorplugin.cpp" line="+98"/>
-        <source>Creates a Qt QML file.</source>
-        <translation>Создает файл Qt QML.</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Qt QML File</source>
-        <translation>Файл Qt QML</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Qt</source>
-        <translation>Qt</translation>
-    </message>
-</context>
-<context>
-    <name>DuiEditor::Internal::ScriptEditor</name>
-    <message>
-        <location filename="../../../src/plugins/duieditor/duieditor.cpp" line="+449"/>
-        <source>&lt;Select Symbol&gt;</source>
-        <translation>&lt;Выберите символ&gt;</translation>
-    </message>
-    <message>
-        <location line="+101"/>
-        <source>Rename...</source>
-        <translation>Переименовать...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>New id:</source>
-        <translation>Новый id:</translation>
-    </message>
-    <message>
-        <location line="+150"/>
-        <source>Rename id &apos;%1&apos;...</source>
-        <translation>Переименовать id &apos;%1&apos;...</translation>
+        <translation>Удалить</translation>
     </message>
 </context>
 <context>
@@ -5429,7 +5931,7 @@ It also automatically sets the correct Qt version.</source>
 <context>
     <name>ExtensionSystem::PluginErrorView</name>
     <message>
-        <location filename="../../../src/libs/extensionsystem/pluginerrorview.cpp" line="+78"/>
+        <location filename="../../../src/libs/extensionsystem/pluginerrorview.cpp" line="+79"/>
         <source>Invalid</source>
         <translation>Неверный</translation>
     </message>
@@ -5560,7 +6062,7 @@ Reason: %3</source>
 <context>
     <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
-        <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+851"/>
+        <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+908"/>
         <source>%1,%2</source>
         <translation>%1,%2</translation>
     </message>
@@ -5576,19 +6078,19 @@ Reason: %3</source>
         <translation>Не реализовано в FakeVim</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <location line="+714"/>
+        <location line="+126"/>
+        <location line="+742"/>
         <location line="+19"/>
         <source>E20: Mark &apos;%1&apos; not set</source>
         <translation>E20: Отметка &apos;%1&apos; не установлена</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+114"/>
         <source>File &apos;%1&apos; exists (add ! to override)</source>
         <translation>Файл &apos;%1&apos; уже существует (добавьте !, чтобы перезаписать)</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Cannot open file &apos;%1&apos; for writing</source>
         <translation>Не удалось открыть файл &apos;%1&apos; для записи</translation>
     </message>
@@ -5608,7 +6110,7 @@ Reason: %3</source>
         <translation>&quot;%1&quot; %2L, %3C</translation>
     </message>
     <message numerus="yes">
-        <location line="+17"/>
+        <location line="+18"/>
         <source>%n lines filtered</source>
         <translation type="unfinished">
             <numerusform>%n строка отфильтрована</numerusform>
@@ -5646,9 +6148,9 @@ Reason: %3</source>
         <translation type="unfinished">поиск дошёл до ВЕРХА и продолжился СНИЗУ</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+575"/>
         <source>Already at oldest change</source>
-        <translation>Уже на старейшем изменении</translation>
+        <translation>Уже на первом изменении</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -5682,15 +6184,19 @@ Reason: %3</source>
         <source>Saving succeeded</source>
         <translation>Сохранение выполнено успешно</translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location line="+2"/>
-        <source>%1 files not saaved</source>
-        <translation>%1 файлов не сохранено</translation>
+        <source>%n files not saved</source>
+        <translation>
+            <numerusform>не сохранён %n файл</numerusform>
+            <numerusform>не сохранено %n файла</numerusform>
+            <numerusform>не сохранено %n файлов</numerusform>
+        </translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Not an editor command: </source>
-        <translation>Не команда редактора: </translation>
+        <source>Not an editor command: %1</source>
+        <translation>Не команда редактора: %1</translation>
     </message>
     <message>
         <location line="+112"/>
@@ -5886,7 +6392,7 @@ Reason: %3</source>
 <context>
     <name>Find::Internal::FindToolBar</name>
     <message>
-        <location filename="../../../src/plugins/find/findtoolbar.cpp" line="+138"/>
+        <location filename="../../../src/plugins/find/findtoolbar.cpp" line="+139"/>
         <source>Current Document</source>
         <translation>Текущий документ</translation>
     </message>
@@ -5977,12 +6483,12 @@ Reason: %3</source>
 <context>
     <name>Find::SearchResultWindow</name>
     <message>
-        <location filename="../../../src/plugins/find/searchresultwindow.h" line="+69"/>
+        <location filename="../../../src/plugins/find/searchresultwindow.h" line="+78"/>
         <source>Search Results</source>
         <translation>Результаты поиска</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+60"/>
+        <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+74"/>
         <source>No matches found!</source>
         <translation>Совпадений не найдено!</translation>
     </message>
@@ -5991,6 +6497,21 @@ Reason: %3</source>
         <source>Expand All</source>
         <translation>Развернуть всё</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace with:</source>
+        <translation>Заменить на:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Replace all occurances</source>
+        <translation type="unfinished">Заменить все совпадения</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace</source>
+        <translation>Заменить</translation>
+    </message>
 </context>
 <context>
     <name>GdbOptionsPage</name>
@@ -6012,7 +6533,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Environment:</source>
-        <translation>Среда:</translation>
+        <translation>Переменные среды окружения:</translation>
     </message>
     <message>
         <location/>
@@ -6075,7 +6596,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Style:</source>
-        <translation>Стиль:</translation>
+        <translation>Начертание:</translation>
     </message>
     <message>
         <location/>
@@ -6173,7 +6694,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Make arguments:</source>
-        <translation>Параметры make:</translation>
+        <translation>Параметры сборки:</translation>
     </message>
     <message>
         <location/>
@@ -6184,36 +6705,59 @@ Reason: %3</source>
 <context>
     <name>GenericProject</name>
     <message>
-        <location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+90"/>
+        <location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+93"/>
         <source>&lt;new&gt;</source>
         <translation>&lt;новый&gt;</translation>
     </message>
 </context>
+<context>
+    <name>GenericProjectManager::Internal::GenericBuildConfigurationFactory</name>
+    <message>
+        <location line="+38"/>
+        <source>Create</source>
+        <translation>Создать</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>New configuration</source>
+        <translation>Новая конфигурация</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New Configuration Name:</source>
+        <translation>Название новой конфигурации:</translation>
+    </message>
+</context>
 <context>
     <name>GenericProjectManager::Internal::GenericBuildSettingsWidget</name>
     <message>
-        <location line="+438"/>
+        <location line="+450"/>
         <source>Build directory:</source>
         <translation>Каталог сборки:</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Toolchain:</source>
+        <location line="+17"/>
+        <source>Tool Chain:</source>
         <translation>Инструментарий:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Generic Manager</source>
-        <translation type="unfinished">Универсальное управление</translation>
+        <translation type="unfinished">Базовое управление</translation>
     </message>
 </context>
 <context>
     <name>GenericProjectManager::Internal::GenericMakeStepConfigWidget</name>
     <message>
-        <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+174"/>
+        <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+189"/>
         <source>Override %1:</source>
         <translation>Заменить %1:</translation>
     </message>
+    <message>
+        <location line="+32"/>
+        <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
+        <translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2</translation>
+    </message>
 </context>
 <context>
     <name>GenericProjectManager::Internal::GenericProjectWizard</name>
@@ -6225,7 +6769,7 @@ Reason: %3</source>
     <message>
         <location line="+1"/>
         <source>Creates a generic project, supporting any build system.</source>
-        <translation>Создается проект, поддерживающий любую систему сборки.</translation>
+        <translation>Создание базового проекта, поддерживающего любую систему сборки.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6248,7 +6792,7 @@ Reason: %3</source>
     <message>
         <location line="+4"/>
         <source>Generic Project</source>
-        <translation type="unfinished">Универсальный проект</translation>
+        <translation>Базовый проект</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6271,7 +6815,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/clonewizardpage.cpp" line="+58"/>
         <source>Specify repository URL, checkout directory and path.</source>
-        <translation>Выбор URL репозитория, каталога выгрузки и пути.</translation>
+        <translation>Выбор URL репозитория, каталога извлечения и пути.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6284,7 +6828,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/branchdialog.cpp" line="+75"/>
         <source>Checkout</source>
-        <translation>Выгрузить</translation>
+        <translation>Извлечь</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6324,7 +6868,7 @@ Reason: %3</source>
     <message>
         <location line="+36"/>
         <source>Would you like to create a local branch &apos;%1&apos; tracking the remote branch &apos;%2&apos;?</source>
-        <translation>Желаете создать локальную вертку &apos;%1&apos;, отслеживающую удаленную ветку &apos;%2&apos;?</translation>
+        <translation>Желаете создать локальную вертку &apos;%1&apos;, отслеживающую удалённую ветку &apos;%2&apos;?</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6385,18 +6929,18 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/clonewizard.cpp" line="+53"/>
         <source>Clones a project from a git repository.</source>
-        <translation>Клонирует проект из репозитория GIT.</translation>
+        <translation>Клонирование проекта из репозитория GIT.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Git Repository Clone</source>
-        <translation>Клонирование репозитория Git</translation>
+        <translation>Клонировать репозиторий Git</translation>
     </message>
 </context>
 <context>
     <name>Git::Internal::GitClient</name>
     <message>
-        <location filename="../../../src/plugins/git/gitclient.cpp" line="+66"/>
+        <location filename="../../../src/plugins/git/gitclient.cpp" line="+71"/>
         <source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source>
         <translation type="unfinished">Следует иметь в виду, что модуль Git до сих пор не умеет работать с сервером. Поэтому, ручная настройка ssh-авторизации и другое не будет работать.</translation>
     </message>
@@ -6408,14 +6952,14 @@ Reason: %3</source>
     <message>
         <location line="+5"/>
         <source>Unable to parse the file output.</source>
-        <translation type="unfinished">Не удалось обработать файловый вывод.</translation>
+        <translation type="unfinished">Не удалось разобрать файловый вывод.</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>%1 Executing: %2 %3
+        <location line="+7"/>
+        <source>Executing: %1 %2
 </source>
-        <extracomment>&lt;timestamp&gt; Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation>%1 Выполняется: %2 %3
+        <extracomment>Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
+        <translation>Выполняется: %1 %2
 </translation>
     </message>
     <message>
@@ -6458,7 +7002,7 @@ Reason: %3</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+37"/>
+        <location line="+33"/>
         <source>Unable to reset %n file(s) in %1: %2</source>
         <translation>
             <numerusform>Не удалось сбросить %n файл в %1: %2</numerusform>
@@ -6491,7 +7035,7 @@ Reason: %3</source>
         <translation type="unfinished">Не удалось запустить показ: %1: %2</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+148"/>
         <source>Changes</source>
         <translation>Изменения</translation>
     </message>
@@ -6524,7 +7068,7 @@ Reason: %3</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Unable to commit %n file(s): %1
 </source>
         <translation>
@@ -6537,7 +7081,7 @@ Reason: %3</source>
         </translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+79"/>
         <source>Revert</source>
         <translation>Откат</translation>
     </message>
@@ -6552,28 +7096,15 @@ Reason: %3</source>
         <translation>Файл не изменялся.</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>There are no modified files.</source>
         <translation>Нет изменённых файлов.</translation>
     </message>
 </context>
-<context>
-    <name>Git::Internal::GitOutputWindow</name>
-    <message>
-        <location filename="../../../src/plugins/git/gitoutputwindow.cpp" line="+48"/>
-        <source>Git Output</source>
-        <translation>Вывод Git</translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Git</source>
-        <translation>Git</translation>
-    </message>
-</context>
 <context>
     <name>Git::Internal::GitPlugin</name>
     <message>
-        <location filename="../../../src/plugins/git/gitplugin.cpp" line="+230"/>
+        <location filename="../../../src/plugins/git/gitplugin.cpp" line="+232"/>
         <source>&amp;Git</source>
         <translation>&amp;Git</translation>
     </message>
@@ -6677,16 +7208,6 @@ Reason: %3</source>
         <source>Unstage &quot;%1&quot; from Commit</source>
         <translation>Убрать &quot;%1&quot; из подготовленного</translation>
     </message>
-    <message>
-        <location line="+6"/>
-        <source>Revert...</source>
-        <translation>Откатить...</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Revert &quot;%1&quot;...</source>
-        <translation>Откатить &quot;%1&quot;...</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>Diff Current Project</source>
@@ -6808,17 +7329,27 @@ Reason: %3</source>
         <translation>Не удалось найти рабочий каталог</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Another submit is currently beeing executed.</source>
-        <translation>В данный момент уже идёт другая фиксация.</translation>
+        <location line="+61"/>
+        <source>Revert</source>
+        <translation>Откатить</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+1"/>
+        <source>Would you like to revert all pending changes to the project?</source>
+        <translation>Откатить все незафиксированные изменения проекта?</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Another submit is currently being executed.</source>
+        <translation>В данный момент уже идёт другая отправка.</translation>
+    </message>
+    <message>
+        <location line="+30"/>
         <source>Cannot create temporary file: %1</source>
         <translation>Не удалось создать временный файл: %1</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+58"/>
         <source>Closing git editor</source>
         <translation>Закрытие редактора git</translation>
     </message>
@@ -6908,7 +7439,7 @@ Reason: %3</source>
 <context>
     <name>Git::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/git/settingspage.cpp" line="+89"/>
+        <location filename="../../../src/plugins/git/settingspage.cpp" line="+90"/>
         <source>Git</source>
         <translation>Git</translation>
     </message>
@@ -6920,7 +7451,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/settingspage.ui"/>
         <source>Environment variables</source>
-        <translation>Переменные среды</translation>
+        <translation>Переменные среды окружения</translation>
     </message>
     <message>
         <location/>
@@ -6930,7 +7461,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>From system</source>
-        <translation>Из системы</translation>
+        <translation>Системное</translation>
     </message>
     <message>
         <location/>
@@ -6940,8 +7471,8 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Git needs to find Perl in the environment as well.</source>
-        <translation>Git необходимо, чтобы Perl можно было
-найти через переменные окружения.</translation>
+        <translation>Git необходимо, чтобы можно было найти
+Perl через переменные среды окружения.</translation>
     </message>
     <message>
         <location/>
@@ -6972,7 +7503,7 @@ Reason: %3</source>
 <context>
     <name>GitCommand</name>
     <message>
-        <location filename="../../../src/plugins/git/gitcommand.cpp" line="+55"/>
+        <location filename="../../../src/plugins/git/gitcommand.cpp" line="+57"/>
         <source>
 &apos;%1&apos; failed (exit code %2).
 </source>
@@ -7013,12 +7544,12 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousclonewizard.cpp" line="+81"/>
         <source>Clones a project from a Gitorious repository.</source>
-        <translation>Клонирует проект из репозитория Gitorious.</translation>
+        <translation>Клонирование проекта из репозитория Gitorious.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gitorious Repository Clone</source>
-        <translation>Клонировать из репозитория Gitorious</translation>
+        <translation>Клонировать репозиторий Gitorious</translation>
     </message>
 </context>
 <context>
@@ -7106,7 +7637,7 @@ Reason: %3</source>
         <translation>WizardPage</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp" line="+63"/>
+        <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp" line="+83"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
@@ -7121,7 +7652,7 @@ Reason: %3</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+74"/>
         <source>Choose a repository of the project &apos;%1&apos;.</source>
         <translation>Выберите репозиторий проекта &apos;%1&apos;.</translation>
     </message>
@@ -7150,6 +7681,16 @@ Reason: %3</source>
         <source>Personal Repositories</source>
         <translation>Частные репозитории</translation>
     </message>
+    <message>
+        <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui"/>
+        <source>Filter:</source>
+        <translation type="unfinished">Фильтр:</translation>
+    </message>
+    <message>
+        <location/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
 </context>
 <context>
     <name>HelloWorld::Internal::HelloWorldPlugin</name>
@@ -7174,7 +7715,7 @@ Reason: %3</source>
         <translation>Моя первая PushButton!</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Hello World!</source>
         <translation>Привет, Мир!</translation>
     </message>
@@ -7329,7 +7870,7 @@ Reason: %3</source>
 <context>
     <name>Help::Internal::HelpMode</name>
     <message>
-        <location filename="../../../src/plugins/help/helpmode.cpp" line="+43"/>
+        <location filename="../../../src/plugins/help/helpmode.cpp" line="+46"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
@@ -7337,7 +7878,7 @@ Reason: %3</source>
 <context>
     <name>Help::Internal::HelpPlugin</name>
     <message>
-        <location filename="../../../src/plugins/help/helpplugin.cpp" line="+197"/>
+        <location filename="../../../src/plugins/help/helpplugin.cpp" line="+209"/>
         <location line="+46"/>
         <source>Contents</source>
         <translation>Содержание</translation>
@@ -7365,7 +7906,7 @@ Reason: %3</source>
         <translation>Домой</translation>
     </message>
     <message>
-        <location line="+226"/>
+        <location line="+231"/>
         <source>Previous</source>
         <translation>Назад</translation>
     </message>
@@ -7375,7 +7916,7 @@ Reason: %3</source>
         <translation>Вперёд</translation>
     </message>
     <message>
-        <location line="-209"/>
+        <location line="-214"/>
         <source>Add Bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
@@ -7440,19 +7981,19 @@ Reason: %3</source>
         <translation>Ctrl+0</translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+201"/>
         <location line="+4"/>
-        <location line="+128"/>
+        <location line="+146"/>
         <source>Unfiltered</source>
         <translation>Вся</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+12"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;No documentation available.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Документации нет&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;Нет доступной документации.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+54"/>
         <source>Filtered by:</source>
         <translation>Документация:</translation>
     </message>
@@ -7480,6 +8021,19 @@ Reason: %3</source>
         <translation>Выделить всё</translation>
     </message>
 </context>
+<context>
+    <name>Help::Internal::XbelReader</name>
+    <message>
+        <location filename="../../../src/plugins/help/xbelsupport.cpp" line="+119"/>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Содержимое файла не соответствует XBEL версии 1.0.</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Unknown title</source>
+        <translation>Неизвестный заголовок</translation>
+    </message>
+</context>
 <context>
     <name>HelpViewer</name>
     <message>
@@ -7759,104 +8313,288 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp.</translation>
         <translation>Исходный файл Objective-C</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>CVS submit template</source>
-        <translation>Шаблон сообщения о фиксации CVS</translation>
+        <location line="+1"/>
+        <source>CVS submit template</source>
+        <translation>Шаблон сообщения о фиксации CVS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qt Designer file</source>
+        <translation>Файл Qt Designer</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>QML file</source>
+        <translation>Файл QML</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Generic Qt Creator Project file</source>
+        <translation>Файл базового проекта Qt Creator</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Generic Project Files</source>
+        <translation>Файлы базовых проектов</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Generic Project Include Paths</source>
+        <translation>Пути включения базового проекта</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Generic Project Configuration File</source>
+        <translation>Файл настроек базового проекта</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Perforce submit template</source>
+        <translation>Шаблон сообщения о фиксации Perforce</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Qml Project file</source>
+        <translation>Файл проекта Qml</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qt Project file</source>
+        <translation>Файл проекта Qt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qt Project include file</source>
+        <translation>Включаемый файл проекта Qt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>message catalog</source>
+        <translation>Исходный файл перевода</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qt Script file</source>
+        <translation>Файл сценария Qt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qt Resource file</source>
+        <translation>Файл ресурсов Qt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Subversion submit template</source>
+        <translation>Шаблон сообщения о фиксации Subversion</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Plain text document</source>
+        <translation>Обычный текстовый документ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>XML document</source>
+        <translation>Документ XML</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Differences between files</source>
+        <translation>Разница между файлами</translation>
+    </message>
+</context>
+<context>
+    <name>MyMain</name>
+    <message>
+        <location filename="../../../src/libs/aggregation/examples/text/main.cpp" line="+57"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation>Н/Д</translation>
+    </message>
+</context>
+<context>
+    <name>NameDemanglerPrivate</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+310"/>
+        <source>Premature end of input</source>
+        <translation>Данные на входе преждевременно закончились</translation>
+    </message>
+    <message>
+        <location line="+90"/>
+        <source>Invalid encoding</source>
+        <translation>Неверная кодировка</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Invalid name</source>
+        <translation>Неверное имя</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <location line="+9"/>
+        <source>Invalid nested-name</source>
+        <translation>Неверный nested-name</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+8"/>
+        <source>Invalid template args</source>
+        <translation>Неверные аргументы шаблона</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+8"/>
+        <source>Invalid template-param</source>
+        <translation>Неверный template-param</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Invalid qualifiers: unexpected &apos;volatile&apos;</source>
+        <translation>Неверный спецификатор: неожиданный &apos;volatile&apos;</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Invalid qualifiers: &apos;const&apos; appears twice</source>
+        <translation>Неверный спецификатор: &apos;const&apos; указан дважды</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Invalid non-negative number</source>
+        <translation>Неверное неотрицательное число</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+9"/>
+        <location line="+2"/>
+        <source>Invalid template-arg</source>
+        <translation>Неверный template-arg</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+15"/>
+        <location line="+43"/>
+        <source>Invalid expression</source>
+        <translation>Неверное выражение</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Invalid primary expression</source>
+        <translation>Неверное основное выражение</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+5"/>
+        <location line="+3"/>
+        <source>Invalid expr-primary</source>
+        <translation>Неверное expr-primary</translation>
+    </message>
+    <message>
+        <location line="+135"/>
+        <location line="+5"/>
+        <location line="+67"/>
+        <source>Invalid type</source>
+        <translation>Неверный тип</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Qt Designer file</source>
-        <translation>Файл Qt Designer</translation>
+        <location line="+138"/>
+        <source>Invalid built-in type</source>
+        <translation>Неверный встроенный тип</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>QML file</source>
-        <translation>Файл QML</translation>
+        <location line="+7"/>
+        <source>Invalid builtin-type</source>
+        <translation>Неверный встроенный тип</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Generic Qt Creator Project file</source>
-        <translation>Файл стандартного проекта Qt Creator</translation>
+        <location line="+16"/>
+        <location line="+8"/>
+        <source>Invalid function type</source>
+        <translation>Неверный тип функции</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Generic Project Files</source>
-        <translation>Файлы стандартного проекта</translation>
+        <location line="+79"/>
+        <location line="+320"/>
+        <source>Invalid unqualified-name</source>
+        <translation>Неверный unqualified-name</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Generic Project Include Paths</source>
-        <translation>Пути включения стандартного проекта</translation>
+        <location line="-232"/>
+        <source>Invalid operator-name &apos;%s&apos;</source>
+        <translation>Неверное имя оператора &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Generic Project Configuration File</source>
-        <translation>Файл настроек стандартного проекта</translation>
+        <location line="+22"/>
+        <location line="+10"/>
+        <source>Invalid array-type</source>
+        <translation>Неверный array-type</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Perforce submit template</source>
-        <translation>Шаблон сообщения о фиксации Perforce</translation>
+        <location line="+16"/>
+        <source>Invalid pointer-to-member-type</source>
+        <translation>Неверный тип указателя на член класса</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Qml Project file</source>
-        <translation>Файл проекта Qml</translation>
+        <location line="+45"/>
+        <location line="+10"/>
+        <location line="+35"/>
+        <source>Invalid substitution</source>
+        <translation>Неверная подстановка</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Qt Project file</source>
-        <translation>Файл проекта Qt</translation>
+        <location line="-41"/>
+        <source>Invalid substitution: element %1 was requested, but there are only %2</source>
+        <translation>Неверная подстановка: необходим элемент %1, но есть только %2</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Qt Project include file</source>
-        <translation>Включаемый файл проекта Qt</translation>
+        <location line="+11"/>
+        <source>Invalid substitution: There are no elements</source>
+        <translation>Неверная подстановка: нет элементов</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>message catalog</source>
-        <translation>Исходный файл перевода</translation>
+        <location line="+101"/>
+        <source>Invalid special-name</source>
+        <translation>Неверный special-name</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Qt Script file</source>
-        <translation>Файл сценария Qt</translation>
+        <location line="+43"/>
+        <location line="+4"/>
+        <location line="+11"/>
+        <source>Invalid local-name</source>
+        <translation>Неверный local-name</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Qt Resource file</source>
-        <translation>Файл ресурсов Qt</translation>
+        <location line="+16"/>
+        <source>Invalid discriminator</source>
+        <translation>Неверный классификатор</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Subversion submit template</source>
-        <translation>Шаблон сообщения о фиксации Subversion</translation>
+        <location line="+32"/>
+        <location line="+11"/>
+        <location line="+4"/>
+        <source>Invalid ctor-dtor-name</source>
+        <translation>Неверный ctor-dtor-name</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Plain text document</source>
-        <translation>Обычный текстовый документ</translation>
+        <location line="+48"/>
+        <location line="+3"/>
+        <source>Invalid call-offset</source>
+        <translation>Неверный call-offset</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>XML document</source>
-        <translation>Документ XML</translation>
+        <location line="+22"/>
+        <source>Invalid v-offset</source>
+        <translation>Неверный v-offset</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Differences between files</source>
-        <translation>Разница между файлами</translation>
+        <location line="+12"/>
+        <source>Invalid digit</source>
+        <translation>Неверная цифра</translation>
     </message>
-</context>
-<context>
-    <name>MyMain</name>
     <message>
-        <location filename="../../../src/libs/aggregation/examples/text/main.cpp" line="+57"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation>Н/Д</translation>
+        <location line="+9"/>
+        <source>At position %1: </source>
+        <translation>Со смещением %1: </translation>
     </message>
 </context>
 <context>
@@ -8058,28 +8796,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Изменение %1: %2</translation>
     </message>
 </context>
-<context>
-    <name>Perforce::Internal::PerforceOutputWindow</name>
-    <message>
-        <location filename="../../../src/plugins/perforce/perforceoutputwindow.cpp" line="+48"/>
-        <source>Perforce Output</source>
-        <translation>Вывод Perforce</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Diff</source>
-        <translation>Сравнить</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <source>Perforce</source>
-        <translation>Perforce</translation>
-    </message>
-</context>
 <context>
     <name>Perforce::Internal::PerforcePlugin</name>
     <message>
-        <location filename="../../../src/plugins/perforce/perforceplugin.cpp" line="+254"/>
+        <location filename="../../../src/plugins/perforce/perforceplugin.cpp" line="+243"/>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
     </message>
@@ -8312,22 +9032,22 @@ p, li { white-space: pre-wrap; }
         <translation>Не удалось создать временный файл.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+33"/>
         <source>Project has no files</source>
         <translation>Проект не содержит файлов</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>p4 annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>p4 annotate %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>p4 filelog</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8337,14 +9057,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
-        <source>%1 Executing: %2
+        <location line="+110"/>
+        <source>Executing: %1
 </source>
-        <translation type="unfinished">%1 Выполняется: %2
+        <translation>Выполняется: %1
 </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+70"/>
         <source>The process terminated with exit code %1.</source>
         <translation>Процесс завершился с кодом %1.</translation>
     </message>
@@ -8364,7 +9084,7 @@ p, li { white-space: pre-wrap; }
         <translation>Perforce не ответил за отведённое время (%1 ms).</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>p4 diff %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8374,7 +9094,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+41"/>
         <source>Closing p4 Editor</source>
         <translation type="unfinished">Закрытие редактора Perforce</translation>
     </message>
@@ -8389,11 +9109,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ошибка в результате проверки сообщения. Желаете все же отправить этот список изменений</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+18"/>
+        <source>Cannot open temporary file.</source>
+        <translation>Не удалось открыть временный файл.</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <location line="+8"/>
         <source>Cannot execute p4 submit.</source>
         <translation type="unfinished">Не удалось запустить отправку Perforce.</translation>
     </message>
+    <message>
+        <location line="+6"/>
+        <source>p4 submit failed (exit code %1).</source>
+        <translation type="unfinished">Отправка Perforce не удалась (код возврата %1).</translation>
+    </message>
     <message>
         <location line="+7"/>
         <source>Pending change</source>
@@ -8410,7 +9140,7 @@ p, li { white-space: pre-wrap; }
         <translation>Неверная конфигурация: %1</translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+63"/>
         <source>Timeout waiting for &quot;where&quot; (%1).</source>
         <translation type="unfinished">Время вышло для &quot;where&quot; (%1).</translation>
     </message>
@@ -8451,13 +9181,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Use default P4 environment variables</source>
-        <translation>Использовать умолчальные
-значения переменных среды</translation>
+        <translation>Использовать умолчальные для p4
+переменных среды окружения</translation>
     </message>
     <message>
         <location/>
         <source>Environment variables</source>
-        <translation>Переменные среды</translation>
+        <translation>Переменные среды окружения</translation>
     </message>
     <message>
         <location/>
@@ -8626,15 +9356,8 @@ p, li { white-space: pre-wrap; }
         <translation>Не удалось загрузить библиотеку, так как состояние != Resolved</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>
-Library base name: %1</source>
-        <translation>
-Базовое имя библиотеки: %1</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Plugin is not valid (doesn&apos;t derive from IPlugin)</source>
+        <location line="+35"/>
+        <source>Plugin is not valid (does not derive from IPlugin)</source>
         <translation>Модуль некорректен (не потомок IPlugin)</translation>
     </message>
     <message>
@@ -8666,7 +9389,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::AbstractProcessStep</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+182"/>
+        <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+188"/>
         <source>&lt;font color=&quot;#0000ff&quot;&gt;Starting: %1 %2&lt;/font&gt;
 </source>
         <translation>&lt;font color=&quot;#0000ff&quot;&gt;Запускается: %1 %2&lt;/font&gt;
@@ -8709,7 +9432,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::BuildManager</name>
     <message numerus="yes">
-        <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+56"/>
+        <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+61"/>
         <source>Finished %n of %1 build steps</source>
         <translation>
             <numerusform>Завершен %n из %1 этапов сборки</numerusform>
@@ -8753,7 +9476,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::CustomExecutableRunConfiguration</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+231"/>
+        <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+250"/>
         <source>Custom Executable</source>
         <translation>Особая программа</translation>
     </message>
@@ -8763,7 +9486,7 @@ Library base name: %1</source>
         <translation>Не удалось найти программу, пожалуйста, укажите её.</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+124"/>
         <location line="+32"/>
         <source>Run %1</source>
         <translation>Выполнить %1</translation>
@@ -8772,16 +9495,75 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::CustomExecutableRunConfigurationFactory</name>
     <message>
-        <location line="+47"/>
+        <location line="+49"/>
         <location line="+16"/>
         <source>Custom Executable</source>
         <translation>Особая программа</translation>
     </message>
 </context>
+<context>
+    <name>ProjectExplorer::DebuggingHelperLibrary</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+131"/>
+        <source>The target directory %1 could not be created.</source>
+        <translation>Не удалось создать целевой каталог %1.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>The existing file %1 could not be removed.</source>
+        <translation>Не удалось удалить существующий файл %1.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>The file %1 could not be copied to %2.</source>
+        <translation>Не удалось скопировать файл %1 в %2.</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>The debugger helpers could not be built in any of the directories:
+- %1
+
+Reason: %2</source>
+        <translation>Не удалось собрать помощников отладчика в каталогах:
+- %1
+
+Причина: %2</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Building debugging helper library in %1
+</source>
+        <translation>Сборка библиотеки помощника отладчика в %1
+</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Running %1 %2...
+</source>
+        <translation>Выполнение %1 %2...
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+21"/>
+        <source>%1 not found in PATH
+</source>
+        <translation>программа %1 не найдена в PATH
+</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+11"/>
+        <source>Running %1 ...
+</source>
+        <translation>Выполнение %1...
+</translation>
+    </message>
+</context>
 <context>
     <name>ProjectExplorer::EnvironmentModel</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+169"/>
+        <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+180"/>
         <source>Variable</source>
         <translation>Переменная</translation>
     </message>
@@ -8790,16 +9572,28 @@ Library base name: %1</source>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
+    <message>
+        <location line="+119"/>
+        <location line="+254"/>
+        <source>&lt;VARIABLE&gt;</source>
+        <translation>&lt;переменная&gt;</translation>
+    </message>
+    <message>
+        <location line="-243"/>
+        <source>&lt;VALUE&gt;</source>
+        <translation>&lt;значение&gt;</translation>
+    </message>
+    <message>
+        <location line="-241"/>
+        <location line="+72"/>
+        <source>&lt;UNSET&gt;</source>
+        <translation>&lt;не задано&gt;</translation>
+    </message>
 </context>
 <context>
     <name>ProjectExplorer::EnvironmentWidget</name>
     <message>
-        <location line="+271"/>
-        <source>Show Details</source>
-        <translation>Подробнее</translation>
-    </message>
-    <message>
-        <location line="+44"/>
+        <location line="+332"/>
         <source>&amp;Edit</source>
         <translation>&amp;Изменить</translation>
     </message>
@@ -8819,17 +9613,12 @@ Library base name: %1</source>
         <translation>&amp;Сбросить</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+74"/>
         <source>Summary: No changes to Environment</source>
-        <translation>Итого: Среда не изменилась</translation>
-    </message>
-    <message>
-        <location line="-125"/>
-        <source>Hide Details</source>
-        <translation>Скрыть продробности</translation>
+        <translation>Итого: переменные среды окружения не изменены</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="-6"/>
         <source>Unset &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Сброшено значение &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -8839,6 +9628,14 @@ Library base name: %1</source>
         <translation>Присвоено &lt;b&gt;%1&lt;/b&gt; значение &lt;b&gt;%2&lt;/b&gt;</translation>
     </message>
 </context>
+<context>
+    <name>ProjectExplorer::Internal::ActiveConfigurationWidget</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+181"/>
+        <source>Active run configuration</source>
+        <translation>Активная конфигурация запуска</translation>
+    </message>
+</context>
 <context>
     <name>ProjectExplorer::Internal::AllProjectsFilter</name>
     <message>
@@ -8850,41 +9647,20 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::AllProjectsFind</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+61"/>
+        <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+64"/>
         <source>All Projects</source>
         <translation>Все проекты</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>File &amp;pattern:</source>
-        <translation>Ш&amp;аблон файла:</translation>
-    </message>
-</context>
-<context>
-    <name>ProjectExplorer::Internal::ApplicationRunConfigurationRunner</name>
-    <message>
-        <location filename="../../../src/plugins/projectexplorer/applicationrunconfiguration.cpp" line="+89"/>
-        <source>Run</source>
-        <translation>Выполнить</translation>
-    </message>
-</context>
-<context>
-    <name>ProjectExplorer::Internal::ApplicationRunControl</name>
-    <message>
-        <location line="+52"/>
-        <source>Starting %1...</source>
-        <translation>Запускается %1...</translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>%1 exited with code %2</source>
-        <translation>%1 завершилась с кодом %2</translation>
+        <translation>Ш&amp;аблон:</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::BuildSettingsPanel</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+78"/>
+        <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+80"/>
         <source>Build Settings</source>
         <translation>Настройки сборки</translation>
     </message>
@@ -8892,17 +9668,27 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::BuildSettingsWidget</name>
     <message>
-        <location line="+88"/>
-        <source>Create &amp;New</source>
-        <translation>Соз&amp;дать новую</translation>
+        <location line="+73"/>
+        <source>Edit Build Configuration:</source>
+        <translation>Изменить конфигурацию сборки:</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+6"/>
+        <source>Add</source>
+        <translation>Добавить</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <location line="+32"/>
         <source>&amp;Clone Selected</source>
         <translation>Д&amp;ублировать выделенную</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+38"/>
         <source>Build Steps</source>
         <translation>Этапы сборки</translation>
     </message>
@@ -8912,18 +9698,7 @@ Library base name: %1</source>
         <translation>Этапы очистки</translation>
     </message>
     <message>
-        <location line="-75"/>
-        <source>Build Configuration:</source>
-        <translation>Конфигурация сборки:</translation>
-    </message>
-    <message>
-        <location line="+122"/>
-        <source>New configuration</source>
-        <translation>Новая конфигурация</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <location line="+51"/>
+        <location line="+69"/>
         <source>New Configuration Name:</source>
         <translation>Название новой конфигурации:</translation>
     </message>
@@ -8936,32 +9711,32 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::BuildStepsPage</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/buildstepspage.ui"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+60"/>
+        <source>No Build Steps</source>
+        <translation>Этапов сборки нет</translation>
     </message>
     <message>
-        <location/>
-        <source>+</source>
-        <translation>+</translation>
+        <location line="+6"/>
+        <source>Add build step</source>
+        <translation>Добавить этап сборки</translation>
     </message>
     <message>
-        <location/>
-        <source>-</source>
-        <translation>-</translation>
+        <location line="+0"/>
+        <source>Add clean step</source>
+        <translation>Добавить этап очистки</translation>
     </message>
     <message>
-        <location/>
-        <source>^</source>
-        <translation>^</translation>
+        <location line="+5"/>
+        <source>Remove build step</source>
+        <translation>Удалить этап сборки</translation>
     </message>
     <message>
-        <location/>
-        <source>v</source>
-        <translation>v</translation>
+        <location line="+0"/>
+        <source>Remove clean step</source>
+        <translation>Удалить этап очистки</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+104"/>
+        <location line="+41"/>
         <source>Build Steps</source>
         <translation>Этапы сборки</translation>
     </message>
@@ -8970,11 +9745,6 @@ Library base name: %1</source>
         <source>Clean Steps</source>
         <translation>Этапы очистки</translation>
     </message>
-    <message>
-        <location filename="../../../src/plugins/projectexplorer/buildstepspage.ui"/>
-        <source>No step selected</source>
-        <translation>Этап не выбран</translation>
-    </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::CompileOutputWindow</name>
@@ -8982,19 +9752,19 @@ Library base name: %1</source>
         <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.cpp" line="+47"/>
         <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.h" line="+51"/>
         <source>Compile Output</source>
-        <translation>Вывод компилятора</translation>
+        <translation>Консоль сборки</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::CoreListenerCheckingForRunningBuild</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+116"/>
+        <location filename="../../../src/plugins/projectexplorer/corelistenercheckingforrunningbuild.cpp" line="+48"/>
         <source>Cancel Build &amp;&amp; Close</source>
         <translation>Отменить сборку и закрыть</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Don&apos;t Close</source>
+        <source>Do not Close</source>
         <translation>Не закрывать</translation>
     </message>
     <message>
@@ -9024,20 +9794,20 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::CurrentProjectFind</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+62"/>
+        <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+64"/>
         <source>Current Project</source>
         <translation>Текущий проект</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>File &amp;pattern:</source>
-        <translation>Ш&amp;аблон файла:</translation>
+        <translation>Ш&amp;аблон:</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::CustomExecutableConfigurationWidget</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="-420"/>
+        <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="-435"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -9059,10 +9829,10 @@ Library base name: %1</source>
     <message>
         <location line="+2"/>
         <source>Run in &amp;Terminal</source>
-        <translation>Выполнить в &amp;терминале</translation>
+        <translation>Запускать в &amp;терминале</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+14"/>
         <source>Run Environment</source>
         <translation>Среда выполнения</translation>
     </message>
@@ -9074,7 +9844,7 @@ Library base name: %1</source>
     <message>
         <location line="+1"/>
         <source>System Environment</source>
-        <translation>Среда системы</translation>
+        <translation>Системная среда</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9082,7 +9852,17 @@ Library base name: %1</source>
         <translation>Среда сборки</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="+102"/>
+        <source>No Executable specified.</source>
+        <translation>Программа не указана.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
+        <translation>Выполняется программа: &lt;b&gt;%1&lt;/b&gt; %2</translation>
+    </message>
+    <message>
+        <location line="-110"/>
         <source>Base environment for this runconfiguration:</source>
         <translation>Базовая среда для этой конфигурации запуска:</translation>
     </message>
@@ -9090,15 +9870,33 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::DependenciesPanel</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+70"/>
+        <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+169"/>
         <source>Dependencies</source>
         <translation>Зависимости</translation>
     </message>
 </context>
+<context>
+    <name>ProjectExplorer::Internal::DependenciesWidget</name>
+    <message>
+        <location line="-26"/>
+        <source>%1 has no dependencies.</source>
+        <translation>%1 ни от чего не зависит.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 depends on %2.</source>
+        <translation>%1 зависит от %2.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 depends on: %2.</source>
+        <translation>%1 зависит от: %2.</translation>
+    </message>
+</context>
 <context>
     <name>ProjectExplorer::Internal::DetailedModel</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectmodels.cpp" line="+231"/>
+        <location filename="../../../src/plugins/projectexplorer/projectmodels.cpp" line="+232"/>
         <source>%1 of project %2</source>
         <translation>%1 проекта %2</translation>
     </message>
@@ -9116,7 +9914,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::EditorSettingsPanel</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+62"/>
+        <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+63"/>
         <source>Editor Settings</source>
         <translation>Настройки редактора</translation>
     </message>
@@ -9132,7 +9930,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::FolderNavigationWidgetFactory</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="+193"/>
+        <location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="+194"/>
         <source>File System</source>
         <translation>Файловая система</translation>
     </message>
@@ -9142,6 +9940,27 @@ Library base name: %1</source>
         <translation>Согласовать с редактором</translation>
     </message>
 </context>
+<context>
+    <name>ProjectExplorer::Internal::LocalApplicationRunControl</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/applicationrunconfiguration.cpp" line="+137"/>
+        <source>Starting %1...</source>
+        <translation>Запускается %1...</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>%1 exited with code %2</source>
+        <translation>%1 завершился с кодом %2</translation>
+    </message>
+</context>
+<context>
+    <name>ProjectExplorer::Internal::LocalApplicationRunControlFactory</name>
+    <message>
+        <location line="-74"/>
+        <source>Run</source>
+        <translation>Выполнить</translation>
+    </message>
+</context>
 <context>
     <name>ProjectExplorer::Internal::NewSessionInputDialog</name>
     <message>
@@ -9158,7 +9977,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::OutputPane</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+70"/>
+        <location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+75"/>
         <source>Re-run this run-configuration</source>
         <translation>Перезапустить эту конфигурацию запуска</translation>
     </message>
@@ -9176,7 +9995,7 @@ Library base name: %1</source>
     <message>
         <location line="+56"/>
         <source>Application Output</source>
-        <translation>Вывод приложения</translation>
+        <translation>Консоль приложения</translation>
     </message>
     <message>
         <location line="+116"/>
@@ -9192,7 +10011,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::OutputWindow</name>
     <message>
-        <location line="+82"/>
+        <location line="+84"/>
         <source>Application Output Window</source>
         <translation>Окно вывода приложения</translation>
     </message>
@@ -9204,16 +10023,30 @@ Library base name: %1</source>
         <source>Custom Process Step</source>
         <translation>Особый этап</translation>
     </message>
+    <message>
+        <location line="+41"/>
+        <source>Custom Process Step</source>
+        <comment>item in combobox</comment>
+        <translation>Особый</translation>
+    </message>
 </context>
 <context>
-    <name>ProjectExplorer::Internal::ProcessStepWidget</name>
+    <name>ProjectExplorer::Internal::ProcessStepConfigWidget</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/processstep.ui"/>
-        <source>Enable custom process step</source>
-        <translation>Включить особый этап</translation>
+        <location line="+27"/>
+        <source>&lt;b&gt;Process Step&lt;/b&gt; %1 %2 %3</source>
+        <translation>&lt;b&gt;Особый:&lt;/b&gt; %1 %2 %3</translation>
     </message>
     <message>
-        <location/>
+        <location line="+3"/>
+        <source>(disabled)</source>
+        <translation>(отключён)</translation>
+    </message>
+</context>
+<context>
+    <name>ProjectExplorer::Internal::ProcessStepWidget</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/processstep.ui"/>
         <source>Name:</source>
         <translation>Название:</translation>
     </message>
@@ -9232,24 +10065,62 @@ Library base name: %1</source>
         <source>Command Arguments:</source>
         <translation>Параметры:</translation>
     </message>
+    <message>
+        <location/>
+        <source>Enable Custom Process Step</source>
+        <translation>Включить этот этап</translation>
+    </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::ProjectExplorerSettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+55"/>
+        <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+56"/>
         <source>Build and Run</source>
         <translation>Сборка и запуск</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Projectexplorer</source>
-        <translation>Обозреватель проекта</translation>
+        <source>Projects</source>
+        <translation>Проекты</translation>
+    </message>
+</context>
+<context>
+    <name>ProjectExplorer::Internal::ProjectExplorerSettingsPageUi</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
+        <source>Build and Run</source>
+        <translation>Сборка и запуск</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Save all files before Build</source>
+        <translation>Сохранять все файлы перед сборкой</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Always build Project before Running</source>
+        <translation>Всегда собирать проект перед запуском</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Show Compiler Output on building</source>
+        <translation>Показывать вывод компилятора при сборке</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Use jom instead of nmake</source>
+        <translation>Использовать jom вместо nmake</translation>
+    </message>
+    <message>
+        <location/>
+        <source>&lt;i&gt;jom&lt;/i&gt; is a drop-in replacement for &lt;i&gt;nmake&lt;/i&gt; which distributes the compilation process to multiple CPU cores. For more details, see the &lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;jom Homepage&lt;/a&gt;. Disable it if you experience problems with your builds.</source>
+        <translation>&lt;i&gt;jom&lt;/i&gt; - это замена &lt;i&gt;nmake&lt;/i&gt;, распределяющая процесс компиляции на несколько ядер процессора. Более подробную информацию о ней можно получить на &lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;домашней странице jom&lt;/a&gt;. Если возникнут проблемы с вашими файлами Makefile, то просто выключите её использование.</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::ProjectFileFactory</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/pluginfilefactory.cpp" line="+68"/>
+        <location filename="../../../src/plugins/projectexplorer/pluginfilefactory.cpp" line="+70"/>
         <source>Could not open the following project: &apos;%1&apos;</source>
         <translation>Не удалось открыть указанный проект: &apos;%1&apos;</translation>
     </message>
@@ -9257,7 +10128,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::ProjectFileWizardExtension</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectfilewizardextension.cpp" line="+167"/>
+        <location filename="../../../src/plugins/projectexplorer/projectfilewizardextension.cpp" line="+168"/>
         <source>Failed to add one or more files to project
 &apos;%1&apos; (%2).</source>
         <translation>Не удалось добавить один или более файлов в проект
@@ -9269,10 +10140,31 @@ Library base name: %1</source>
         <translation>Не удалось добавить &apos;%1&apos; в контроль версий.</translation>
     </message>
 </context>
+<context>
+    <name>ProjectExplorer::Internal::ProjectLabel</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+375"/>
+        <source>Edit Project Settings for Project &lt;b&gt;%1&lt;/b&gt;</source>
+        <translation>Изменение настроек проекта &lt;b&gt;%1&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>No Project loaded</source>
+        <translation>Проект не загружен</translation>
+    </message>
+</context>
+<context>
+    <name>ProjectExplorer::Internal::ProjectPushButton</name>
+    <message>
+        <location line="+11"/>
+        <source>Select Project</source>
+        <translation>Выбрать проект</translation>
+    </message>
+</context>
 <context>
     <name>ProjectExplorer::Internal::ProjectTreeWidget</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projecttreewidget.cpp" line="+140"/>
+        <location filename="../../../src/plugins/projectexplorer/projecttreewidget.cpp" line="+144"/>
         <source>Simplify tree</source>
         <translation>Упростить дерево</translation>
     </message>
@@ -9301,26 +10193,58 @@ Library base name: %1</source>
     </message>
 </context>
 <context>
-    <name>ProjectExplorer::Internal::ProjectWindow</name>
+    <name>ProjectExplorer::Internal::ProjectWelcomePage</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+116"/>
-        <source>Project Explorer</source>
-        <translation>Обзор проекта</translation>
+        <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+47"/>
+        <source>Develop</source>
+        <translation>Разработка</translation>
     </message>
+</context>
+<context>
+    <name>ProjectExplorer::Internal::ProjectWelcomePageWidget</name>
     <message>
-        <location line="+13"/>
-        <source>Projects</source>
-        <translation>Проекты</translation>
+        <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.ui"/>
+        <source>Form</source>
+        <translation>Форма</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Startup</source>
-        <translation>Запуск</translation>
+        <location/>
+        <source>Manage Sessions...</source>
+        <translation>Управление сессиями...</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Create New Project...</source>
+        <translation> Создать проект... </translation>
+    </message>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.cpp" line="+79"/>
+        <source>Open Recent Project</source>
+        <translation>Недавние проекты</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Path</source>
-        <translation>Путь</translation>
+        <source>Resume Session</source>
+        <translation>Продолжение сессии</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>%1 (last session)</source>
+        <translation>%1 (последняя сессия)</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>New Project...</source>
+        <translation>Новый проект...</translation>
+    </message>
+</context>
+<context>
+    <name>ProjectExplorer::Internal::ProjectWindow</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+121"/>
+        <location line="+54"/>
+        <source>Active Build and Run Configurations</source>
+        <translation>Текущие конфигурации сборки и выполнения</translation>
     </message>
 </context>
 <context>
@@ -9336,29 +10260,6 @@ Library base name: %1</source>
         <translation>Будут добавлены файлы:</translation>
     </message>
 </context>
-<context>
-    <name>ProjectExplorer::Internal::ProjetExplorerSettingsPageUi</name>
-    <message>
-        <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
-        <source>Build and Run</source>
-        <translation>Сборка и запуск</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Save all files before Build</source>
-        <translation>Сохранять все файлы перед сборкой</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Always build Project before Running</source>
-        <translation>Всегда собирать проект перед запуском</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Show Compiler Output on building</source>
-        <translation>Показывать вывод компилятора при сборке</translation>
-    </message>
-</context>
 <context>
     <name>ProjectExplorer::Internal::RemoveFileDialog</name>
     <message>
@@ -9385,7 +10286,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::RunSettingsPanel</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+117"/>
+        <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+119"/>
         <source>Run Settings</source>
         <translation>Настройки запуска</translation>
     </message>
@@ -9402,32 +10303,32 @@ Library base name: %1</source>
         <source>-</source>
         <translation>-</translation>
     </message>
-    <message>
-        <location/>
-        <source>Active run configuration:</source>
-        <translation type="unfinished">Активная конфигурация сборки:</translation>
-    </message>
     <message>
         <location/>
         <source>Edit run configuration:</source>
-        <translation type="unfinished">Изменить конфигурацию запуска:</translation>
+        <translation>Изменить конфигурацию запуска:</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::RunSettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+67"/>
+        <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+65"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::SessionDialog</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+22"/>
+        <source>Switch to session</source>
+        <translation>Сделать активной</translation>
+    </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
         <source>Session Manager</source>
@@ -9436,7 +10337,7 @@ Library base name: %1</source>
     <message>
         <location/>
         <source>Create New Session</source>
-        <translation>Создать новую</translation>
+        <translation>Создать</translation>
     </message>
     <message>
         <location/>
@@ -9457,7 +10358,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::SessionFile</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+156"/>
+        <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+157"/>
         <source>Session</source>
         <translation>Сессия</translation>
     </message>
@@ -9465,7 +10366,7 @@ Library base name: %1</source>
         <location line="+184"/>
         <source>Untitled</source>
         <comment>default file name to display</comment>
-        <translation type="unfinished">Неозаглавленный</translation>
+        <translation>Неозаглавленный</translation>
     </message>
 </context>
 <context>
@@ -9482,7 +10383,7 @@ Library base name: %1</source>
         <location line="-352"/>
         <location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+62"/>
         <source>Build Issues</source>
-        <translation>Вывод сборки</translation>
+        <translation>Сообщения сборки</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -9492,7 +10393,7 @@ Library base name: %1</source>
     <message>
         <location line="+16"/>
         <source>Show Warnings</source>
-        <translation type="unfinished">Показывать предупреждения</translation>
+        <translation>Показывать предупреждения</translation>
     </message>
 </context>
 <context>
@@ -9505,7 +10406,7 @@ Library base name: %1</source>
     <message>
         <location line="+7"/>
         <source>Cannot retrieve debugging output!</source>
-        <translation type="unfinished">Не удалось получить отладочный вывод!</translation>
+        <translation>Не удалось получить отладочный вывод!</translation>
     </message>
 </context>
 <context>
@@ -9547,7 +10448,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::ProjectExplorerPlugin</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+63"/>
+        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+256"/>
         <source>Projects</source>
         <translation>Проекты</translation>
     </message>
@@ -9574,7 +10475,7 @@ Library base name: %1</source>
     <message>
         <location line="+66"/>
         <source>Session Manager...</source>
-        <translation>Управление сессией...</translation>
+        <translation>Управление сессиями...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9602,12 +10503,22 @@ Library base name: %1</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
+        <source>Show in Explorer...</source>
+        <translation>Показать в проводнике...</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show in Finder...</source>
-        <translation type="unfinished">Показать в Finder...</translation>
+        <translation>Показать в Finder...</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+2"/>
+        <source>Show containing folder...</source>
+        <translation type="unfinished">Показать содержимое папки...</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Recent Projects</source>
         <translation>Недавние проекты</translation>
     </message>
@@ -9629,7 +10540,7 @@ Library base name: %1</source>
     <message>
         <location line="+7"/>
         <source>Session</source>
-        <translation>Сессия</translation>
+        <translation>Сессии</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -9744,12 +10655,12 @@ Library base name: %1</source>
         <translation>Добавить новый...</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
         <source>Add Existing Files...</source>
         <translation>Добавить существующие файлы...</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
         <source>Remove File...</source>
         <translation>Убрать файл...</translation>
     </message>
@@ -9759,7 +10670,7 @@ Library base name: %1</source>
         <translation>Переименовать</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+126"/>
         <source>Load Project</source>
         <translation>Загрузить проект</translation>
     </message>
@@ -9770,13 +10681,13 @@ Library base name: %1</source>
         <translation>Новый проект</translation>
     </message>
     <message>
-        <location line="+866"/>
+        <location line="+860"/>
         <source>New File</source>
         <comment>Title of dialog</comment>
         <translation>Новый файл</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Add Existing Files</source>
         <translation>Добавить существующие файлы</translation>
     </message>
@@ -9819,7 +10730,27 @@ to version control (%2)?</source>
         <translation>Не удалось добавить файлы под контроль версий</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
+        <source>Launching Windows Explorer failed</source>
+        <translation>Не удалось запустить Проводник Windows</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not find explorer.exe in path to launch Windows Explorer.</source>
+        <translation>Не удалось найти explorer.exe по адресу для запуска Проводника Windows.</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Launching a file explorer failed</source>
+        <translation>Не удалось запустить проводник файлов</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not find xdg-open to launch the native file explorer.</source>
+        <translation>Не удалось найти xdg-open для запуска стандартного обозревателя файлов.</translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <source>Remove file failed</source>
         <translation>Не удалось убрать файл</translation>
     </message>
@@ -9842,7 +10773,7 @@ to version control (%2)?</source>
 <context>
     <name>ProjectExplorer::SessionManager</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+299"/>
+        <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+300"/>
         <source>Error while restoring session</source>
         <translation>Ошибка при восстановлении сессии</translation>
     </message>
@@ -9870,7 +10801,7 @@ to version control (%2)?</source>
         <location line="+4"/>
         <location line="+24"/>
         <source>Untitled</source>
-        <translation type="unfinished">Безымянная</translation>
+        <translation>Безымянная</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9878,12 +10809,20 @@ to version control (%2)?</source>
         <translation>Сессия (&apos;%1&apos;)</translation>
     </message>
 </context>
+<context>
+    <name>ProjectWelcomePage</name>
+    <message>
+        <location filename="../../../src/plugins/projectexplorer/projectwelcomeplugin.ui"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+</context>
 <context>
     <name>QMakeStep</name>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qmakestep.ui"/>
         <source>QMake Build Configuration:</source>
-        <translation>Настройка QMake сборки:</translation>
+        <translation>Тип сборки QMake:</translation>
     </message>
     <message>
         <location/>
@@ -9970,56 +10909,93 @@ to version control (%2)?</source>
         <translatorcomment>не думаю, что стоит переводить</translatorcomment>
         <translation>Info</translation>
     </message>
+</context>
+<context>
+    <name>QTestLib::Internal::QTestOutputPane</name>
     <message>
-        <location filename="../../../src/plugins/help/xbelsupport.cpp" line="+117"/>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Содержимое файла не соответствует XBEL версии 1.0.</translation>
+        <location line="+266"/>
+        <source>Test Results</source>
+        <translation>Результаты тестирования</translation>
     </message>
     <message>
-        <location line="+73"/>
-        <source>Unknown title</source>
-        <translation>Неизвестный заголовок</translation>
+        <location line="+7"/>
+        <source>Result</source>
+        <translation>Результат</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/texteditor/colorscheme.cpp" line="+209"/>
-        <source>Not a color scheme file.</source>
-        <translation>Это не файл цветовой схемы.</translation>
+        <location line="+0"/>
+        <source>Message</source>
+        <translation>Сообщение</translation>
     </message>
+</context>
+<context>
+    <name>QTestLib::Internal::QTestOutputWidget</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/fontsettings.cpp" line="+135"/>
-        <source>Customized</source>
-        <translation type="unfinished">Настроенная</translation>
+        <location line="+45"/>
+        <source>All Incidents</source>
+        <translation type="unfinished">Все инциденты</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Show Only:</source>
+        <translation>Показать только:</translation>
+    </message>
+</context>
+<context>
+    <name>QmlEditor::Internal::QmlEditorPlugin</name>
+    <message>
+        <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+103"/>
+        <source>Qt</source>
+        <translation>Qt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Creates a Qt QML file.</source>
+        <translation>Создание файла Qt QML.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qt QML File</source>
+        <translation>Файл Qt QML</translation>
+    </message>
+</context>
+<context>
+    <name>QmlEditor::Internal::QmlModelManager</name>
+    <message>
+        <location filename="../../../src/plugins/qmleditor/qmlmodelmanager.cpp" line="+98"/>
+        <source>Indexing</source>
+        <translation>Индексация</translation>
     </message>
 </context>
 <context>
-    <name>QTestLib::Internal::QTestOutputPane</name>
+    <name>QmlEditor::Internal::ScriptEditor</name>
     <message>
-        <location filename="../../../src/plugins/qtestlib/qtestlibplugin.cpp" line="+266"/>
-        <source>Test Results</source>
-        <translation>Результаты тестирования</translation>
+        <location filename="../../../src/plugins/qmleditor/qmleditor.cpp" line="+468"/>
+        <source>&lt;Select Symbol&gt;</source>
+        <translation>&lt;Выберите символ&gt;</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Result</source>
-        <translation>Результат</translation>
+        <location line="+101"/>
+        <source>Rename...</source>
+        <translation>Переименовать...</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Message</source>
-        <translation>Сообщение</translation>
+        <location line="+1"/>
+        <source>New id:</source>
+        <translation>Новый id:</translation>
     </message>
-</context>
-<context>
-    <name>QTestLib::Internal::QTestOutputWidget</name>
     <message>
-        <location line="+45"/>
-        <source>All Incidents</source>
-        <translation type="unfinished">Все инциденты</translation>
+        <location line="+189"/>
+        <source>Rename id &apos;%1&apos;...</source>
+        <translation>Переименовать id &apos;%1&apos;...</translation>
     </message>
+</context>
+<context>
+    <name>QmlProjectManager::Internal::QmlMakeStepConfigWidget</name>
     <message>
-        <location line="+9"/>
-        <source>Show Only:</source>
-        <translation>Показать только:</translation>
+        <location filename="../../../src/plugins/qmlprojectmanager/qmlmakestep.cpp" line="+134"/>
+        <source>&lt;b&gt;QML Make&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Сборка QML&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -10032,7 +11008,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates a QML application.</source>
-        <translation>Создаёт приложение QML.</translation>
+        <translation>Создание приложения QML.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -10040,7 +11016,7 @@ to version control (%2)?</source>
         <translation>Проекты</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+70"/>
         <source>The project %1 could not be opened.</source>
         <translation>Не удалось открыть проект %1.</translation>
     </message>
@@ -10048,7 +11024,7 @@ to version control (%2)?</source>
 <context>
     <name>QmlProjectManager::Internal::QmlNewProjectWizardDialog</name>
     <message>
-        <location line="-134"/>
+        <location line="-136"/>
         <source>New QML Project</source>
         <translation>Новый проект QML</translation>
     </message>
@@ -10068,7 +11044,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates a QML project from an existing directory of QML files.</source>
-        <translation>Создает проект QML из существующего каталога с файлами QML.</translation>
+        <translation>Создание проекта QML из существующего каталога с файлами QML.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -10107,26 +11083,25 @@ to version control (%2)?</source>
 <context>
     <name>QmlProjectManager::Internal::QmlRunConfiguration</name>
     <message>
-        <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+327"/>
-        <location line="+18"/>
-        <location line="+81"/>
+        <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+339"/>
+        <location line="+101"/>
         <source>QML Viewer</source>
         <translation>Просмотр QML</translation>
     </message>
     <message>
-        <location line="-80"/>
-        <source>Could not find the qmlviewer executable, please specify one.</source>
-        <translation>Не удалось найти программу qmlviewer, пожалуйста, укажите путь к ней.</translation>
-    </message>
-    <message>
-        <location line="+53"/>
-        <location line="+35"/>
-        <location line="+41"/>
+        <location line="-31"/>
+        <location line="+40"/>
+        <location line="+49"/>
         <source>&lt;Current File&gt;</source>
         <translation>&lt;Текущий файл&gt;</translation>
     </message>
     <message>
-        <location line="-48"/>
+        <location line="-57"/>
+        <source>QML Viewer arguments:</source>
+        <translation type="unfinished">Параметры просмотрщика QML:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Main QML File:</source>
         <translation>Основной файл QML:</translation>
     </message>
@@ -10196,11 +11171,6 @@ to version control (%2)?</source>
         <source>Widget h&amp;eader file:</source>
         <translation>&amp;Заголовочный файл:</translation>
     </message>
-    <message>
-        <location/>
-        <source>The header file as to be specified i source code. </source>
-        <translation>Заголовочный файл, который должен быть указан в исходном коде. </translation>
-    </message>
     <message>
         <location/>
         <source>Widge&amp;t source file:</source>
@@ -10296,6 +11266,11 @@ to version control (%2)?</source>
         <source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
         <translation>Файлы значков (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
     </message>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui"/>
+        <source>The header file has to be specified in source code.</source>
+        <translation>Заголовочный файл, указываемый в исходном коде.</translation>
+    </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::ClassList</name>
@@ -10326,7 +11301,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates a Qt4 console application.</source>
-        <translation>Создает консольное приложение Qt4.</translation>
+        <translation>Создание консольного приложения Qt4.</translation>
     </message>
 </context>
 <context>
@@ -10334,7 +11309,7 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp" line="+52"/>
         <source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not provide a GUI.</source>
-        <translation>Этот мастер создает проект консольного приложения Qt4. Оно будет наследником от QCoreApplication и без GUI.</translation>
+        <translation>Этот мастер создаст проект консольного приложения Qt4. Оно будет наследником от QCoreApplication и без GUI.</translation>
     </message>
 </context>
 <context>
@@ -10418,7 +11393,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates a Qt4 Designer Custom Widget or a Custom Widget Collection.</source>
-        <translation>Создаст пользовательский виджет Qt4 Designer или Набор пользовательских виджетов.</translation>
+        <translation>Создание пользовательского виджета Qt4 Designer или набора пользовательских виджетов.</translation>
     </message>
 </context>
 <context>
@@ -10460,7 +11435,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates an empty Qt project.</source>
-        <translation>Создаст пустой проект Qt.</translation>
+        <translation>Создание пустого проекта Qt.</translation>
     </message>
 </context>
 <context>
@@ -10497,6 +11472,171 @@ to version control (%2)?</source>
         <translation>Укажите базовую информацию о классах, для которых желаете создать шаблоны исходных файлов.</translation>
     </message>
 </context>
+<context>
+    <name>Qt4ProjectManager::Internal::GettingStartedWelcomePage</name>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepage.h" line="+47"/>
+        <source>Getting Started</source>
+        <translation>Начало работы</translation>
+    </message>
+</context>
+<context>
+    <name>Qt4ProjectManager::Internal::GettingStartedWelcomePageWidget</name>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Examples not installed</source>
+        <translation>Примеры не установлены</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Open</source>
+        <translation>Открыть</translation>
+    </message>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+56"/>
+        <source>Tutorials</source>
+        <translation>Учебники</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Explore Qt Examples</source>
+        <translation>Обзор примеров Qt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Did You Know?</source>
+        <translation>Знаете ли вы?</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&lt;b&gt;Qt Creator - A quick tour&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Краткий курс по Qt Creator&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Creating an address book</source>
+        <translation>Создание адресной книги</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Understanding widgets</source>
+        <translation>Что такое виджет</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Building with qmake</source>
+        <translation>Сборка с помощью qmake</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Writing test cases</source>
+        <translation>Создание тестов</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Choose an example...</source>
+        <translation>Выберите пример...</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Cmd</source>
+        <comment>Shortcut key</comment>
+        <translation>Cmd</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Alt</source>
+        <comment>Shortcut key</comment>
+        <translation>Alt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You can switch between Qt Creator&apos;s modes using &lt;tt&gt;Ctrl+number&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Welcome&lt;/li&gt;&lt;li&gt;2 - Edit&lt;/li&gt;&lt;li&gt;3 - Debug&lt;/li&gt;&lt;li&gt;4 - Projects&lt;/li&gt;&lt;li&gt;5 - Help&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Output&lt;/li&gt;&lt;/ul&gt;</source>
+        <translation>Вы можете переключать режим Qt Creator используя &lt;tt&gt;Ctrl+число&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Приветствие&lt;/li&gt;&lt;li&gt;2 - Правка&lt;/li&gt;&lt;li&gt;3 - Отладка&lt;/li&gt;&lt;li&gt;4 - Проекты&lt;/li&gt;&lt;li&gt;5 - Справка&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Вывод&lt;/li&gt;&lt;/ul&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>You can show and hide the side bar using &lt;tt&gt;%1+0&lt;tt&gt;.</source>
+        <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
+        <translation>Вы можете включать и прятать боковую панель используя &lt;tt&gt;%1+0&lt;tt&gt;.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can fine tune the &lt;tt&gt;Find&lt;/tt&gt; function by selecting &amp;quot;Whole Words&amp;quot; or &amp;quot;Case Sensitive&amp;quot;. Simply click on the icons on the right end of the line edit.</source>
+        <translation>Вы можете тонко настроить функцию &lt;tt&gt;Поиск&lt;/tt&gt;, выбирая &amp;quot;Слово целиком&amp;quot; или &amp;quot;Учитывать регистр&amp;quot;. Просто кликните на иконку справа от конца редактируемой строки.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <translation>Если вы добавите &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;внешние библиотеки&lt;/a&gt;, то Qt Creator автоматически предложит подсветку синтаксиса и дополнение кода.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
+        <translation>Автодополнение кода ориентировано на ВерблюжийРегистр. Например, чтобы получить &lt;tt&gt;namespaceUri&lt;/tt&gt; вы можете просто ввести &lt;tt&gt;nU&lt;/tt&gt; и нажать &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You can force code completion at any time using &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
+        <translation>Вы можете в любой момент вызвать дополнение кода нажатием &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can start Qt Creator with a session by calling &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</source>
+        <translation>Qt Creator может открывать сессию при запуске, для этого нужно выполнить команду &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can return to edit mode from any other mode at any time by hitting &lt;tt&gt;Escape&lt;/tt&gt;.</source>
+        <translation>Вы можете вернуться в режим редактирования из любого другого нажатием на &lt;tt&gt;Escape&lt;/tt&gt;.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You can switch between the output pane by hitting &lt;tt&gt;%1+n&lt;/tt&gt; where n is the number denoted on the buttons at the window bottom:&lt;ul&gt;&lt;li&gt;1 - Build Issues&lt;/li&gt;&lt;li&gt;2 - Search Results&lt;/li&gt;&lt;li&gt;3 - Application Output&lt;/li&gt;&lt;li&gt;4 - Compile Output&lt;/li&gt;&lt;/ul&gt;</source>
+        <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
+        <translation>Вы можете переключать окно вывода используя &lt;tt&gt;%1+n&lt;/tt&gt;, где n - это число указанное на кнопку внизу окна:&lt;ul&gt;&lt;li&gt;1 - Сообщения сборки&lt;/li&gt;&lt;li&gt;2 - Результаты поиска&lt;/li&gt;&lt;li&gt;3 - Консоль программы&lt;/li&gt;&lt;li&gt;4 - Консоль сборки&lt;/li&gt;&lt;/ul&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
+        <translation>Вы можете осуществлять быстрый поиск методов, классов, справки и прочего используя &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Панель поисковика&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <translation>Вы можете добавить собственные этапы сборки в &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;настройках сборки&lt;/a&gt;.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <translation>Внутри одной сессии вы можете добавлять &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;зависимости&lt;/a&gt; проектов друг от друга.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
+        <translation>Вы можете устанавливать предпочитаемую кодировку редактора для каждого проекта в &lt;tt&gt;Проекты -&gt; Настройки редактора -&gt; Кодировка по умолчанию&lt;/tt&gt;.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can modify the binary that is being executed when you press the &lt;tt&gt;Run&lt;/tt&gt; button: Add a &lt;tt&gt;Custom Executable&lt;/tt&gt; by clicking the &lt;tt&gt;+&lt;/tt&gt; button in &lt;tt&gt;Projects -&gt; Run Settings -&gt; Run Configuration&lt;/tt&gt; and then select the new target in the combo box.</source>
+        <translation>Вы можете сменить программу, которая запускается при нажатии на кнопку &lt;tt&gt;Run&lt;/tt&gt;: Добавьте &lt;tt&gt;Другую программу&lt;/tt&gt; нажатием на кнопку &lt;tt&gt;+&lt;/tt&gt; в &lt;tt&gt;Проекты - Настройки запуска - Конфигурация запуска&lt;/tt&gt; и выберите новую цель в выпадающем списке.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
+        <translation>Вы можете использовать Qt Creator с &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;системами контроля версий&lt;/a&gt;, такими как Subversion, Perforce, CVS и Git.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
+        <translation>В редакторе клавиша &lt;tt&gt;F2&lt;/tt&gt; переключает объявление и определение, а &lt;tt&gt;F4&lt;/tt&gt; - заголовочный и исходный файл.</translation>
+    </message>
+</context>
 <context>
     <name>Qt4ProjectManager::Internal::GuiAppWizard</name>
     <message>
@@ -10507,7 +11647,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates a Qt4 Gui Application with one form.</source>
-        <translation>Создает графическое приложение Qt4 с одной формой.</translation>
+        <translation>Создание графического приложения Qt4 с одной формой.</translation>
     </message>
     <message>
         <location line="+125"/>
@@ -10533,7 +11673,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates a C++ Library.</source>
-        <translation>Создает библиотеку C++.</translation>
+        <translation>Создание библиотеки C++.</translation>
     </message>
 </context>
 <context>
@@ -10564,6 +11704,14 @@ to version control (%2)?</source>
         <translation>Этот мастер создаст проект библиотеки С++.</translation>
     </message>
 </context>
+<context>
+    <name>Qt4ProjectManager::Internal::MakeStepFactory</name>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+327"/>
+        <source>Make</source>
+        <translation>Сборка</translation>
+    </message>
+</context>
 <context>
     <name>Qt4ProjectManager::Internal::ModulesPage</name>
     <message>
@@ -10678,7 +11826,7 @@ to version control (%2)?</source>
     <message>
         <location line="+20"/>
         <source>Change Variable Assignment</source>
-        <translation type="unfinished">Изменить значение переменной</translation>
+        <translation>Изменить значение переменной</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -10688,7 +11836,7 @@ to version control (%2)?</source>
     <message>
         <location line="+14"/>
         <source>Change Scope Condition</source>
-        <translation type="unfinished">Изменить условие области</translation>
+        <translation>Изменить условие области</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -10730,22 +11878,60 @@ to version control (%2)?</source>
     </message>
     <message>
         <location line="+6"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt; Importing the settings will automatically add the Qt Version from:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; to the list of Qt versions.</source>
-        <translation>&lt;b&gt;Замечание:&lt;/b&gt; импорт настроек автоматически добавит версию Qt из:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; в список версий Qt.</translation>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Importing the settings will automatically add the Qt Version identified by &lt;br&gt;&lt;b&gt;%1&lt;/b&gt; to the list of Qt versions.</source>
+        <translation type="unfinished">&lt;b&gt;Замечание:&lt;/b&gt; импорт настроек автоматически добавит версию Qt определенную как &lt;b&gt;%1&lt;/b&gt; в список версий Qt.</translation>
+    </message>
+</context>
+<context>
+    <name>Qt4ProjectManager::Internal::QMakeStepFactory</name>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+336"/>
+        <source>QMake</source>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::Qt4BuildEnvironmentWidget</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+63"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+51"/>
+        <source>Clear system environment</source>
+        <translation>Чистая системная среда</translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>Build Environment</source>
-        <translation>Среда сборки</translation>
+        <translation>Переменные среды окружения сборки</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::Qt4PriFileNode</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+297"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+352"/>
+        <source>Headers</source>
+        <translation>Заговолочные</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sources</source>
+        <translation>Исходники</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forms</source>
+        <translation>Формы</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resources</source>
+        <translation>Ресурсы</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Other files</source>
+        <translation>Другие файлы</translation>
+    </message>
+    <message>
+        <location line="+155"/>
         <location line="+7"/>
         <source>Failed!</source>
         <translation>Не удалось!</translation>
@@ -10763,12 +11949,12 @@ to version control (%2)?</source>
     <message>
         <location line="+33"/>
         <source>There are unsaved changes for project file %1.</source>
-        <translation>Имеются несохраненные изменения в файле проекта %1.</translation>
+        <translation>Имеются несохранённые изменения в файле проекта %1.</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Error while parsing file %1. Giving up.</source>
-        <translation type="unfinished">Ошибка при обработке файла %1. Отмена.</translation>
+        <translation>Ошибка при обработке файла %1. Отмена.</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -10817,59 +12003,35 @@ to version control (%2)?</source>
         <translation>Каталог сборки:</translation>
     </message>
     <message>
-        <location/>
-        <source>&lt;a href=&quot;import&quot;&gt;Import existing build&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;import&quot;&gt;Импорт существующей сборки&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+75"/>
-        <source>Shadow Build Directory</source>
-        <translation>Каталог фоновой сборки</translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>General</source>
-        <translation>Основное</translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Default Qt Version</source>
-        <translation>Версия Qt по умолчанию</translation>
-    </message>
-    <message>
-        <location line="+166"/>
-        <source>gcc</source>
-        <translation>gcc</translation>
+        <location/>
+        <source>&lt;a href=&quot;import&quot;&gt;Import existing build&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;import&quot;&gt;Импорт существующей сборки&lt;/a&gt;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>icc</source>
-        <translation>icc</translation>
+        <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+71"/>
+        <source>Shadow Build Directory</source>
+        <translation>Каталог фоновой сборки</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>mingw</source>
-        <translation>mingw</translation>
+        <location line="+47"/>
+        <location line="+65"/>
+        <source>Default Qt Version (%1)</source>
+        <translation>Версия Qt по умолчанию (%1)</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>msvc</source>
-        <translation>msvc</translation>
+        <location line="-61"/>
+        <source>No Qt Version set</source>
+        <translation>Не выбрана версия Qt</translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>wince</source>
-        <translation>wince</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>winscw</source>
-        <translation>winscw</translation>
+        <source>using Qt version: &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;with tool chain &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;building in &lt;b&gt;%3&lt;/b&gt;</source>
+        <translation>Используемая версия Qt: &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Инструментарий: &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;Каталог сборки: &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>gcce</source>
-        <translation>gcce</translation>
+        <location line="+17"/>
+        <source>General</source>
+        <translation>Основное</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
@@ -10885,7 +12047,7 @@ to version control (%2)?</source>
 <context>
     <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+169"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+181"/>
         <location line="+5"/>
         <source>Run qmake</source>
         <translation>Выполнить qmake</translation>
@@ -10894,8 +12056,8 @@ to version control (%2)?</source>
 <context>
     <name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+73"/>
-        <location line="+437"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+72"/>
+        <location line="+458"/>
         <source>Qt4RunConfiguration</source>
         <translation>Qt4RunConfiguration</translation>
     </message>
@@ -10908,7 +12070,17 @@ to version control (%2)?</source>
 <context>
     <name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
     <message>
-        <location line="-392"/>
+        <location line="-336"/>
+        <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2 %3</source>
+        <translation>Выполняется программа: &lt;b&gt;%1&lt;/b&gt; %2 %3</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>(in terminal)</source>
+        <translation>(в терминале)</translation>
+    </message>
+    <message>
+        <location line="-73"/>
         <source>Run Environment</source>
         <translation>Среда выполнения</translation>
     </message>
@@ -10920,7 +12092,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>System Environment</source>
-        <translation>Среда системы</translation>
+        <translation>Системная среда</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10928,22 +12100,22 @@ to version control (%2)?</source>
         <translation>Среда сборки</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="-34"/>
         <source>Arguments:</source>
         <translation>Параметры:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run in Terminal</source>
-        <translation>Выполнить в терминале</translation>
+        <translation>Запускать в терминале</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>Base environment for this runconfiguration:</source>
         <translation>Базовая среда для этой конфигурации сборки:</translation>
     </message>
     <message>
-        <location line="-54"/>
+        <location line="-51"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -10964,7 +12136,7 @@ to version control (%2)?</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Working Directory:</source>
         <translation>Рабочий каталог:</translation>
     </message>
@@ -10977,24 +12149,24 @@ to version control (%2)?</source>
 <context>
     <name>Qt4ProjectManager::Internal::QtOptionsPageWidget</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+69"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+109"/>
         <source>&lt;specify a name&gt;</source>
         <translation>&lt;укажите имя&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>&lt;specify a path&gt;</source>
-        <translation>&lt;укажите путь&gt;</translation>
+        <source>&lt;specify a qmake location&gt;</source>
+        <translation>&lt;укажите размещение qmake&gt;</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Select QTDIR</source>
-        <translation>Выбор QTDIR</translation>
+        <location line="+10"/>
+        <source>Select QMake Executable</source>
+        <translation>Выберите исполняемый файлы QMake</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Select the Qt Directory</source>
-        <translation>Выбор каталога Qt</translation>
+        <source>Select the MinGW Directory</source>
+        <translation>Выберите каталог MinGW</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11009,22 +12181,34 @@ to version control (%2)?</source>
     <message>
         <location line="+3"/>
         <source>Manual</source>
-        <translation>Ручная</translation>
+        <translation>Особые</translation>
     </message>
     <message>
-        <location line="+244"/>
-        <source>The Qt Version %1 is not installed. Run make install</source>
-        <translation>Qt версии %1 не установлена. Выполните make install</translation>
+        <location line="+120"/>
+        <source>Building helpers</source>
+        <translation type="unfinished">Помощники сборки</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source>&lt;html&gt;&lt;body&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;File:&lt;/td&gt;&lt;td&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Last&amp;nbsp;modified:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Size:&lt;/td&gt;&lt;td&gt;%3 Bytes&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <extracomment>Tooltip showing the debugging helper library file.</extracomment>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;Файл:&lt;/td&gt;&lt;td&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Изменён:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Размер:&lt;/td&gt;&lt;td&gt;%3 байт&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>The Qt Version identified by %1 is not installed. Run make install</source>
+        <translation>Версия Qt определённая как %1 не установлена. Выполните make install</translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>%1 is not a valid Qt directory</source>
-        <translation>%1 не является каталогом Qt</translation>
+        <source>%1 does not specify a valid Qt installation</source>
+        <translation type="unfinished">%1 не является корректно установленной Qt</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Found Qt version %1, using mkspec %2</source>
-        <translation>Обнаружена Qt версии %1, использующая mkspec %2</translation>
+        <translation>Обнаружена Qt версии %1,
+использующая mkspec %2</translation>
     </message>
 </context>
 <context>
@@ -11049,11 +12233,6 @@ to version control (%2)?</source>
         <source>Name</source>
         <translation>Название</translation>
     </message>
-    <message>
-        <location/>
-        <source>Path</source>
-        <translation>Путь</translation>
-    </message>
     <message>
         <location/>
         <source>Debugging Helper</source>
@@ -11064,11 +12243,6 @@ to version control (%2)?</source>
         <source>Version Name:</source>
         <translation>Название версии:</translation>
     </message>
-    <message>
-        <location/>
-        <source>Path:</source>
-        <translation>Путь:</translation>
-    </message>
     <message>
         <location/>
         <source>MinGw Directory:</source>
@@ -11117,6 +12291,16 @@ p, li { white-space: pre-wrap; }
         <source>MWC Directory:</source>
         <translation>Каталог MWC:</translation>
     </message>
+    <message>
+        <location/>
+        <source>QMake Location</source>
+        <translation>Размещение QMake</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Path to QMake:</source>
+        <translation>Путь до QMake:</translation>
+    </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::QtWizard</name>
@@ -11126,10 +12310,28 @@ p, li { white-space: pre-wrap; }
         <translation>Не удалось открыть проект %1.</translation>
     </message>
 </context>
+<context>
+    <name>Qt4ProjectManager::Internal::S60DeviceDebugRunControl</name>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+792"/>
+        <source>Launching debugger...</source>
+        <translation>Запускается отладчик...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Debugging finished.</source>
+        <translation>Отладка завершена.</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Warning: Cannot locate the symbol file belonging to %1.</source>
+        <translation>Внимание! Не удалось обнаружить файл символов, соответствующих %1.</translation>
+    </message>
+</context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunConfiguration</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+58"/>
+        <location line="-708"/>
         <source>%1 on Device</source>
         <translation>%1 на устройстве</translation>
     </message>
@@ -11139,15 +12341,25 @@ p, li { white-space: pre-wrap; }
         <translation>QtS60DeviceRunConfiguration</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+189"/>
         <source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
         <translation type="unfinished">Не удалось обработать %1. Нельзя запустить конфигурацию запуска устройства QtS60 %2.</translation>
     </message>
+    <message>
+        <location line="-62"/>
+        <source>Cannot open %1: %2</source>
+        <translation>Не удалось открыть %1: %2</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Unable to find the executable in the package file %1.</source>
+        <translation>Не удалось найти исполняемый файл в пакете %1.</translation>
+    </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
     <message>
-        <location line="+183"/>
+        <location line="+266"/>
         <source>%1 on Device</source>
         <translation>%1 на устройстве</translation>
     </message>
@@ -11155,7 +12367,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
     <message>
-        <location line="-125"/>
+        <location line="-152"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -11166,21 +12378,16 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <source>Self-sign</source>
-        <translation type="unfinished">Автоподпись</translation>
+        <source>Device on Serial Port:</source>
+        <translation>Последовательный порт устройства:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+19"/>
         <source>Choose certificate file (.cer)</source>
         <translation>Выбор файл сертификата (.cer)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Custom signature:</source>
-        <translation>Пользовательская подпись:</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Choose key file (.key / .pem)</source>
         <translation>Выбор файл ключа (.key / .pem)</translation>
     </message>
@@ -11189,57 +12396,105 @@ p, li { white-space: pre-wrap; }
         <source>Key file:</source>
         <translation>Файл ключа:</translation>
     </message>
+    <message>
+        <location line="-18"/>
+        <source>Self-signed certificate</source>
+        <translation>Собственный сертификат</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Custom certificate:</source>
+        <translation>Особый сертификат:</translation>
+    </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunControl</name>
     <message>
-        <location line="+195"/>
+        <location line="+369"/>
+        <source>Could not start application: %1</source>
+        <translation>Не удалось запустить приложение: %1</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Starting application...</source>
+        <translation>Запуск приложения...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Application running with pid %1.</source>
+        <translation>Приложение выполняется с PID %1.</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Finished.</source>
+        <translation>Завершено.</translation>
+    </message>
+</context>
+<context>
+    <name>Qt4ProjectManager::Internal::S60DeviceRunControlBase</name>
+    <message>
+        <location line="-165"/>
         <source>Creating %1.sisx ...</source>
         <translation>Создание %1.sisx...</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+57"/>
-        <location line="+20"/>
-        <location line="+19"/>
+        <location line="+1"/>
+        <source>Executable file: %1</source>
+        <translation>Исполняемый файл: %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+55"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-16"/>
         <location line="+28"/>
         <source>An error occurred while creating the package.</source>
         <translation>Возникла ошибка при создание пакета.</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <location line="+20"/>
         <location line="+19"/>
-        <source> </source>
-        <translation> </translation>
+        <source>Package: %1
+Deploying application to &apos;%2&apos;...</source>
+        <translation>Пакет: %1
+Установка приложения на &apos;%2&apos;...</translation>
     </message>
     <message>
-        <location line="-7"/>
-        <source>An error occurred while installing the package.</source>
-        <translation>Возникла ошибка при установке пакета.</translation>
+        <location line="+5"/>
+        <source>Could not connect to phone on port &apos;%1&apos;: %2
+Check if the phone is connected and the TRK application is running.</source>
+        <translation>Не удалось подключиться к телефону через порт &apos;%1&apos;: %2
+Убедитесь, что телефон подключён, и на нём работает приложение TRK.</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Did you compile the trklauncher application in tests\manual\trk ?</source>
-        <translation>Вы собрали приложение trklauncher в test/manual/trk?</translation>
+        <location line="+8"/>
+        <source>Could not create file %1 on device: %2</source>
+        <translation>Не удалось создать файл %1 на устройстве: %2</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>An error occurred while starting the application.</source>
-        <translation>Возникла ошибка при запуске приложения.</translation>
+        <location line="+5"/>
+        <source>Copying install file...</source>
+        <translation>Копирование установочного файла...</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Finished.</source>
-        <translation>Завершено.</translation>
+        <location line="+1"/>
+        <source>0% copied.</source>
+        <translation>0% скопировано.</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <source>%1% copied.</source>
+        <translation>%1% скопировано.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Installing application...</source>
+        <translation>Установка приложения...</translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Failed to start %1.</source>
         <translation>Не удалось запустить %1.</translation>
     </message>
@@ -11250,8 +12505,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+3"/>
-        <source>Some error has occurred while running %1.</source>
-        <translation>Возникли ошибки при выполнении %1.</translation>
+        <source>An error has occurred while running %1.</source>
+        <translation>Возникла ошибка при выполнении %1.</translation>
     </message>
 </context>
 <context>
@@ -11298,7 +12553,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::Internal::S60EmulatorRunConfiguration</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+54"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+55"/>
         <source>%1 in Emulator</source>
         <translation>%1 в эмуляторе</translation>
     </message>
@@ -11308,15 +12563,15 @@ p, li { white-space: pre-wrap; }
         <translation>QtS60EmulatorRunConfiguration</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+87"/>
         <source>Could not parse %1. The QtS60 emulator run configuration %2 can not be started.</source>
-        <translation type="unfinished">Не удалось обработать %1. Нельзя запустить конфигурацию запуска эмуляции QtS60 %2.</translation>
+        <translation>Не удалось обработать %1. Нельзя запустить конфигурацию запуска эмуляции QtS60 %2.</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
     <message>
-        <location line="+95"/>
+        <location line="+98"/>
         <source>%1 in Emulator</source>
         <translation>%1 в эмуляторе</translation>
     </message>
@@ -11337,7 +12592,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::Internal::S60EmulatorRunControl</name>
     <message>
-        <location line="+123"/>
+        <location line="+100"/>
         <source>Starting %1...</source>
         <translation>Запускается %1...</translation>
     </message>
@@ -11352,6 +12607,24 @@ p, li { white-space: pre-wrap; }
         <translation>%1 завершился с кодом %2</translation>
     </message>
 </context>
+<context>
+    <name>Qt4ProjectManager::Internal::S60Manager</name>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+111"/>
+        <source>Run in Emulator</source>
+        <translation>Выполнить на эмуляторе</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Run on Device</source>
+        <translation>Выполнить на устройстве</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Debug on Device</source>
+        <translation>Отладить на устройстве</translation>
+    </message>
+</context>
 <context>
     <name>Qt4ProjectManager::Internal::ValueEditor</name>
     <message>
@@ -11453,12 +12726,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::MakeStep</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+79"/>
+        <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="-247"/>
         <source>&lt;font color=&quot;#ff0000&quot;&gt;Could not find make command: %1 in the build environment&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;#ff0000&quot;&gt;Не удалось найти в среде сборки команду: %1&lt;/font&gt;</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+57"/>
         <source>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;No Makefile found, assuming project is clean.&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;Не найден файл Makefile, предположительно проект очищен.&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
@@ -11466,7 +12739,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::MakeStepConfigWidget</name>
     <message>
-        <location line="+71"/>
+        <location line="+77"/>
+        <source>&lt;b&gt;Make Step:&lt;/b&gt; %1 not found in the environment.</source>
+        <translation>&lt;b&gt;Этап сборки:&lt;/b&gt;программа %1 не найдена.</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2 in %3</source>
+        <translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2 в %3</translation>
+    </message>
+    <message>
+        <location line="-43"/>
         <source>Override %1:</source>
         <translation>Заменить %1:</translation>
     </message>
@@ -11474,7 +12757,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::QMakeStep</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+102"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="-232"/>
         <source>
 &lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;No valid Qt version set. Set one in Preferences &lt;/b&gt;&lt;/font&gt;
 </source>
@@ -11497,10 +12780,51 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;font color=&quot;#0000ff&quot;&gt;Настройки не изменились, этап QMake пропускается.&lt;/font&gt;</translation>
     </message>
 </context>
+<context>
+    <name>Qt4ProjectManager::QMakeStepConfigWidget</name>
+    <message>
+        <location line="+78"/>
+        <source>&lt;b&gt;QMake:&lt;/b&gt; No Qt version set. QMake can not be run.</source>
+        <translation>&lt;b&gt;QMake:&lt;/b&gt; Нельзя запустить QMake, так как версия Qt не установлена.</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>No valid Qt version set.</source>
+        <translation>Не выбрана корректная версия Qt.</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>&lt;b&gt;QMake:&lt;/b&gt; %1 %2</source>
+        <translation>&lt;b&gt;QMake:&lt;/b&gt; %1 %2</translation>
+    </message>
+</context>
+<context>
+    <name>Qt4ProjectManager::Qt4BuildConfigurationFactory</name>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+252"/>
+        <source>Using Default Qt Version</source>
+        <translation>Используется версия Qt по умолчанию</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Using Qt Version &quot;%1&quot;</source>
+        <translation>Используется Qt версии &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>New configuration</source>
+        <translation>Новая конфигурация</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New Configuration Name:</source>
+        <translation>Название новой конфигурации:</translation>
+    </message>
+</context>
 <context>
     <name>Qt4ProjectManager::Qt4Manager</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+191"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+192"/>
         <source>Loading project %1 ...</source>
         <translation>Загрузка проекта %1 ...</translation>
     </message>
@@ -11534,12 +12858,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::QtVersionManager</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+308"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+325"/>
         <source>&lt;not found&gt;</source>
         <translation>&lt;не найдена&gt;</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+6"/>
         <location line="+6"/>
         <source>Qt in PATH</source>
         <translation>Qt в PATH</translation>
@@ -11548,14 +12872,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QtDumperHelper</name>
     <message>
-        <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+266"/>
+        <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+103"/>
         <source>Found a too-old version of the debugging helper library (%1); version %2 is required.</source>
         <translation>Обнаружена слишком старая библиотека помощника отладчика (%1). Необходима версия %2.</translation>
     </message>
     <message numerus="yes">
-        <location line="+33"/>
+        <location line="+37"/>
         <source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
-        <translation type="unfinished">
+        <translation>
             <numerusform>%n известный тип, Qt версии: %1, пространство имен Qt: %2, Версия дампера: %3</numerusform>
             <numerusform>%n известных типа, Qt версии: %1, пространство имен Qt: %2, Версия дампера: %3</numerusform>
             <numerusform>%n известных типов, Qt версии: %1, пространство имен Qt: %2, Версия дампера: %3</numerusform>
@@ -11629,6 +12953,16 @@ p, li { white-space: pre-wrap; }
         <source>Classes for evaluating Qt Scripts</source>
         <translation>Классы для обработки сценариев Qt</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>QtScriptTools Module</source>
+        <translation>Модуль QtScriptTools</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Additional Qt Script components</source>
+        <translation>Дополнительные компоненты Qt Script</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>QtSvg Module</source>
@@ -11679,6 +13013,16 @@ p, li { white-space: pre-wrap; }
         <source>Multimedia framework classes</source>
         <translation>Мультимедийные классы</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>QtMultimedia Module</source>
+        <translation>Модуль QtMultimedia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Classes for low-level multimedia functionality</source>
+        <translation>Классы для низкоуровневой работы с мультимедией</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Qt3Support Module</source>
@@ -11723,7 +13067,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qtscripteditor/qtscripteditorplugin.cpp" line="+97"/>
         <source>Creates a Qt Script file.</source>
-        <translation>Создает файл сценария Qt.</translation>
+        <translation>Создание файла сценария Qt.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11777,18 +13121,18 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
-        <translation type="unfinished">Универсальный фильтр каталогов</translation>
+        <translation>Базовый фильтр каталогов</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Filter Configuration</source>
-        <translation type="unfinished">Настройка фильтра</translation>
+        <translation>Настройка фильтра</translation>
     </message>
     <message>
         <location line="+45"/>
         <location line="+11"/>
         <source>Choose a directory to add</source>
-        <translation type="unfinished">Выбор каталога для добавления</translation>
+        <translation>Выбор каталога для добавления</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -12102,7 +13446,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+4"/>
         <source>Match:</source>
-        <translation type="unfinished">Совпадение:</translation>
+        <translation type="unfinished">Соответствие:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -12140,7 +13484,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/resourceeditor/resourceeditorplugin.cpp" line="+77"/>
         <source>Creates a Qt Resource file (.qrc).</source>
-        <translation>Создаёт файл ресурсов Qt (.qrc).</translation>
+        <translation>Создание файла ресурсов Qt (.qrc).</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12360,7 +13704,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Label</source>
-        <translation>Метка</translation>
+        <translation>Название</translation>
     </message>
     <message>
         <location/>
@@ -12385,7 +13729,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Key Sequence</source>
-        <translation>Последовательность клавиш</translation>
+        <translation>Комбинация клавиш</translation>
     </message>
     <message>
         <location/>
@@ -12482,46 +13826,21 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <name>Subversion::Internal::CheckoutWizard</name>
     <message>
         <location filename="../../../src/plugins/subversion/checkoutwizard.cpp" line="+54"/>
-        <source>Check-out a project from a Subversion repository.</source>
-        <translation>Получить проект из репозитория Subversion.</translation>
+        <source>Checks out a project from a Subversion repository.</source>
+        <translation>Извлечение проекта из репозитория Subversion.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Subversion Checkout</source>
-        <translation>Получение из Subversion</translation>
+        <translation>Извлечь из Subversion</translation>
     </message>
 </context>
 <context>
     <name>Subversion::Internal::CheckoutWizardPage</name>
-    <message>
-        <location filename="../../../src/plugins/subversion/checkoutwizardpage.ui"/>
-        <source>WizardPage</source>
-        <translation>WizardPage</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Specify path and repository URL.</source>
-        <translation>Укажите путь и URL репозитория.</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Clone URL:</source>
-        <translation>Адрес репозитория:</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Checkout Directory:</source>
-        <translation>Каталог выгрузки:</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Path:</source>
-        <translation>Путь:</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/subversion/checkoutwizardpage.cpp" line="+38"/>
         <source>Specify repository, checkout directory and path.</source>
-        <translation>Выбор репозитория, каталога выгрузки и пути.</translation>
+        <translation>Выбор репозитория, каталога извлечения и пути.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12570,19 +13889,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>Команда Subversion</translation>
     </message>
 </context>
-<context>
-    <name>Subversion::Internal::SubversionOutputWindow</name>
-    <message>
-        <location filename="../../../src/plugins/subversion/subversionoutputwindow.cpp" line="+43"/>
-        <source>Subversion Output</source>
-        <translation>Вывод Subversion</translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Subversion</source>
-        <translation>Subversion</translation>
-    </message>
-</context>
 <context>
     <name>Subversion::Internal::SubversionPlugin</name>
     <message>
@@ -12733,7 +14039,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+1"/>
         <source>The commit message check failed. Do you want to commit the change?</source>
-        <translation>Сообщение о фиксации содержит ошибки. Вы все равно желаете фиксировать изменение?</translation>
+        <translation type="unfinished">Сообщение о фиксации содержит ошибки. Вы все-равно желаете фиксировать изменение?</translation>
     </message>
     <message>
         <location line="+124"/>
@@ -12753,7 +14059,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+15"/>
         <source>There are no modified files.</source>
-        <translation>Нет измененных файлов.</translation>
+        <translation>Нет изменённых файлов.</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -12761,7 +14067,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>Не удаётся создать временный файл: %1</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+186"/>
         <source>Describe</source>
         <translation>Описание</translation>
     </message>
@@ -12777,10 +14083,10 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
     <message>
         <location line="+8"/>
-        <source>%1 Executing: %2 %3
+        <source>Executing: %1 %2
 </source>
-        <extracomment>&lt;timestamp&gt; Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation>%1 Выполняется: %2 %3
+        <extracomment>Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
+        <translation>Выполняется: %1 %2
 </translation>
     </message>
     <message>
@@ -12823,7 +14129,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
 <context>
     <name>TextEditor::BaseFileFind</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+116"/>
+        <location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+121"/>
         <location line="+20"/>
         <source>%1 found</source>
         <translation>%1 найдено</translation>
@@ -12842,12 +14148,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
 <context>
     <name>TextEditor::BaseTextDocument</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+160"/>
+        <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+159"/>
         <source>untitled</source>
         <translation>неозаглавленный</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+67"/>
         <source>&lt;em&gt;Binary data&lt;/em&gt;</source>
         <translation>&lt;em&gt;Бинарные данные&lt;/em&gt;</translation>
     </message>
@@ -12855,7 +14161,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
 <context>
     <name>TextEditor::BaseTextEditor</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+228"/>
+        <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+252"/>
         <source>Print Document</source>
         <translation>Печать документа</translation>
     </message>
@@ -12873,7 +14179,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
 <context>
     <name>TextEditor::BaseTextEditorEditable</name>
     <message>
-        <location line="+3867"/>
+        <location line="+4249"/>
         <source>Line: %1, Col: %2</source>
         <translation>Строка: %1, Столбец: %2</translation>
     </message>
@@ -12908,7 +14214,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Storage</source>
-        <translation>Хранилище</translation>
+        <translation>Сохранение</translation>
     </message>
     <message>
         <location/>
@@ -12923,12 +14229,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Clean whitespace in entire document instead of only for changed parts.</source>
-        <translation>Очищать пробелы во всем документе, а не только в изменившихся частях.</translation>
+        <translation>Очищать пробелы во всём документе, а не только в изменившихся частях.</translation>
     </message>
     <message>
         <location/>
         <source>In entire &amp;document</source>
-        <translation>&amp;Во всем документе</translation>
+        <translation>&amp;Во всём документе</translation>
     </message>
     <message>
         <location/>
@@ -12986,7 +14292,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/texteditor/displaysettingspage.ui"/>
         <source>Display</source>
-        <translation type="unfinished">Отображать</translation>
+        <translation>Отображать</translation>
     </message>
     <message>
         <location/>
@@ -13057,7 +14363,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
 <context>
     <name>TextEditor::FontSettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+310"/>
+        <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+312"/>
         <source>Font &amp; Colors</source>
         <translation>Шрифт и цвета</translation>
     </message>
@@ -13137,6 +14443,14 @@ The following encodings are likely to fit:</source>
         <translation>Сохранить в кодировке</translation>
     </message>
 </context>
+<context>
+    <name>TextEditor::Internal::ColorScheme</name>
+    <message>
+        <location filename="../../../src/plugins/texteditor/colorscheme.cpp" line="+210"/>
+        <source>Not a color scheme file.</source>
+        <translation>Это не файл цветовой схемы.</translation>
+    </message>
+</context>
 <context>
     <name>TextEditor::Internal::ColorSchemeEdit</name>
     <message>
@@ -13173,7 +14487,7 @@ The following encodings are likely to fit:</source>
 <context>
     <name>TextEditor::Internal::FindInCurrentFile</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/findincurrentfile.cpp" line="+57"/>
+        <location filename="../../../src/plugins/texteditor/findincurrentfile.cpp" line="+62"/>
         <source>Current File</source>
         <translation>Текущий файл</translation>
     </message>
@@ -13181,7 +14495,7 @@ The following encodings are likely to fit:</source>
 <context>
     <name>TextEditor::Internal::FindInFiles</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/findinfiles.cpp" line="+55"/>
+        <location filename="../../../src/plugins/texteditor/findinfiles.cpp" line="+56"/>
         <source>Files on Disk</source>
         <translation>Файлы на диске</translation>
     </message>
@@ -13206,6 +14520,14 @@ The following encodings are likely to fit:</source>
         <translation>Каталог поиска</translation>
     </message>
 </context>
+<context>
+    <name>TextEditor::Internal::FontSettings</name>
+    <message>
+        <location filename="../../../src/plugins/texteditor/fontsettings.cpp" line="+136"/>
+        <source>Customized</source>
+        <translation>Настроенная</translation>
+    </message>
+</context>
 <context>
     <name>TextEditor::Internal::FontSettingsPage</name>
     <message>
@@ -13321,7 +14643,7 @@ The following encodings are likely to fit:</source>
         <location line="+6"/>
         <source>Auto-&amp;indent Selection</source>
         <translatorcomment>буквальный перевод &quot;автоотступить выделенное&quot;</translatorcomment>
-        <translation type="unfinished">Сделать &amp;автоотступ</translation>
+        <translation>Сделать &amp;автоотступ</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -13444,7 +14766,7 @@ The following encodings are likely to fit:</source>
         <translation>Ctrl+[</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Goto Block End</source>
         <translation>Перейти в конец блока</translation>
     </message>
@@ -13454,7 +14776,7 @@ The following encodings are likely to fit:</source>
         <translation>Ctrl+]</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Goto Block Start With Selection</source>
         <translation>Перейти в начало блока с выделением</translation>
     </message>
@@ -13484,7 +14806,7 @@ The following encodings are likely to fit:</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Select Block Down</source>
         <translation>Выделить блок вниз</translation>
     </message>
@@ -13494,7 +14816,7 @@ The following encodings are likely to fit:</source>
         <translation>Ctrl+Shift+U</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Move Line Up</source>
         <translation type="unfinished">Переместить строку выше</translation>
     </message>
@@ -13534,7 +14856,7 @@ The following encodings are likely to fit:</source>
         <translation>Ctrl+Alt+Down</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+92"/>
         <source> &lt;line number&gt;</source>
         <translation> &lt;номер строки&gt;</translation>
     </message>
@@ -13589,17 +14911,22 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+4"/>
         <source>Occurrences</source>
-        <translation type="unfinished">Местонахождения</translation>
+        <translation>Совпадения</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unused Occurrence</source>
+        <translation type="unfinished">Неиспользуемое</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Renaming Occurrence</source>
-        <translation type="unfinished">Место переименования</translation>
+        <translation type="unfinished">Переименуемое</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Number</source>
-        <translation>Номер</translation>
+        <translation>Число</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -13646,6 +14973,11 @@ The following encodings are likely to fit:</source>
         <source>Doxygen Tag</source>
         <translation>Тэг Doxygen</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Visual Whitespace</source>
+        <translation>Обозначать пробельные символы</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Disabled Code</source>
@@ -13664,12 +14996,12 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+1"/>
         <source>Diff File</source>
-        <translation type="unfinished">Файл сравнения</translation>
+        <translation>Сравнение: изменённые файлы</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Diff Location</source>
-        <translation type="unfinished">Сравнить пути</translation>
+        <translation>Сравнение: размещение</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -13686,13 +15018,58 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+8"/>
         <source>Display</source>
-        <translation type="unfinished">Вид</translation>
+        <translation>Вид</translation>
     </message>
 </context>
 <context>
     <name>ToolChain</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/toolchain.cpp" line="+122"/>
+        <location filename="../../../src/plugins/projectexplorer/toolchain.cpp" line="+113"/>
+        <source>GCC</source>
+        <translation>GCC</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Intel C++ Compiler (Linux)</source>
+        <translation>Intel C++ Compiler (Linux)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MinGW</source>
+        <translation>MinGW</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Microsoft Visual C++</source>
+        <translation>Microsoft Visual C++</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Windows CE</source>
+        <translation>Windows CE</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>WINSCW</source>
+        <translation>WINSCW</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GCCE</source>
+        <translation>GCCE</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>RVCT (ARMV5)</source>
+        <translation>RVCT (ARMV5)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>RVCT (ARMV6)</source>
+        <translation>RVCT (ARMV6)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Other</source>
         <translation>Другой</translation>
     </message>
@@ -13702,7 +15079,7 @@ The following encodings are likely to fit:</source>
         <translation>&lt;Неверный&gt;</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Неизвестный&gt;</translation>
     </message>
@@ -13735,6 +15112,14 @@ The following encodings are likely to fit:</source>
         <translation>&amp;Закрыть</translation>
     </message>
 </context>
+<context>
+    <name>Utils::DetailsButton</name>
+    <message>
+        <location filename="../../../src/libs/utils/detailsbutton.cpp" line="+19"/>
+        <source>Show Details</source>
+        <translation>Показать подробности</translation>
+    </message>
+</context>
 <context>
     <name>VCSBase</name>
     <message>
@@ -13758,8 +15143,8 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Failed to open project in &apos;%1&apos;</source>
-        <translation>Не удалось открыть проект в &apos;%1&apos;</translation>
+        <source>Failed to open project in &apos;%1&apos;.</source>
+        <translation>Не удалось открыть проект в &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -13792,7 +15177,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location/>
         <source>Checkout Directory:</source>
-        <translation>Каталог выгрузки:</translation>
+        <translation>Каталог извлечения:</translation>
     </message>
     <message>
         <location/>
@@ -13805,7 +15190,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/checkoutprogresswizardpage.cpp" line="+66"/>
         <source>Checkout started...</source>
-        <translation>Выгрузка запущена...</translation>
+        <translation>Извлечение запущено...</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -13856,7 +15241,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+4"/>
         <source>The process returned exit code %1.</source>
-        <translation type="unfinished">Процесс вернул код %1.</translation>
+        <translation>Процесс вернул код %1.</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -13885,15 +15270,28 @@ The following encodings are likely to fit:</source>
 <context>
     <name>VCSBase::VCSBaseEditor</name>
     <message>
-        <location filename="../../../src/plugins/vcsbase/vcsbaseeditor.cpp" line="+325"/>
+        <location filename="../../../src/plugins/vcsbase/vcsbaseeditor.cpp" line="+327"/>
         <source>Describe change %1</source>
         <translation>Описать изменение %1</translation>
     </message>
 </context>
+<context>
+    <name>VCSBase::VCSBaseOutputWindow</name>
+    <message>
+        <location filename="../../../src/plugins/vcsbase/vcsbaseoutputwindow.cpp" line="+90"/>
+        <source>Clear</source>
+        <translation>Очистить</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Version Control</source>
+        <translation>Контроль версий</translation>
+    </message>
+</context>
 <context>
     <name>VCSBase::VCSBaseSubmitEditor</name>
     <message>
-        <location filename="../../../src/plugins/vcsbase/vcsbasesubmiteditor.cpp" line="+136"/>
+        <location filename="../../../src/plugins/vcsbase/vcsbasesubmiteditor.cpp" line="+138"/>
         <source>Check message</source>
         <translation>Проверие сообщение</translation>
     </message>
@@ -13975,7 +15373,7 @@ name &lt;email&gt; alias &lt;email&gt;</source>
     <message>
         <location/>
         <source>User fields configuration file:</source>
-        <translation type="unfinished">Файл настройки полей:</translation>
+        <translation>Файл настройки полей:</translation>
     </message>
 </context>
 <context>
@@ -14055,34 +15453,22 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Welcome::WelcomeMode</name>
-    <message>
-        <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+130"/>
-        <source>Open Recent Project</source>
-        <translation>Недавние проекты</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Resume Session</source>
-        <translation>Продолжение сессии</translation>
-    </message>
+    <name>Welcome::Internal::CommunityWelcomePage</name>
     <message>
-        <location line="+1"/>
-        <source>Tutorials</source>
-        <translation>Учебники</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Explore Qt Examples</source>
-        <translation>Обзор примеров Qt</translation>
+        <location filename="../../../src/plugins/welcome/communitywelcomepage.h" line="+49"/>
+        <source>Community</source>
+        <translation>Сообщество</translation>
     </message>
+</context>
+<context>
+    <name>Welcome::Internal::CommunityWelcomePageWidget</name>
     <message>
-        <location line="+1"/>
-        <source>Did You Know?</source>
-        <translation>Знаете ли вы?</translation>
+        <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.ui"/>
+        <source>Form</source>
+        <translation>Форма</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+46"/>
         <source>News From the Qt Labs</source>
         <translation>Новости от Qt Labs</translation>
     </message>
@@ -14092,7 +15478,7 @@ p, li { white-space: pre-wrap; }
         <translation>Вэбсайты Qt</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+8"/>
         <source>http://labs.trolltech.com/blogs/feed</source>
         <extracomment>Add localized feed here only if one exists</extracomment>
         <translation>http://labs.trolltech.com/blogs/feed</translation>
@@ -14100,7 +15486,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>Qt Home</source>
-        <translation type="unfinished">Домашняя страница Qt</translation>
+        <translation>Домашняя страница Qt</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -14110,160 +15496,26 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Qt Git Hosting</source>
-        <translation type="unfinished">Размещение репозиториев Qt</translation>
+        <translation>Размещение репозиториев Qt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Centre</source>
-        <translation type="unfinished">Центр Qt</translation>
+        <translation>Центр Qt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt for S60 at Forum Nokia</source>
         <translation>Qt для S60 на форуме Nokia</translation>
     </message>
+</context>
+<context>
+    <name>Welcome::WelcomeMode</name>
     <message>
-        <location line="+2"/>
-        <source>&lt;b&gt;Qt Creator - A quick tour&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Краткий курс по Qt Creator&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Creating an address book</source>
-        <translation>Создание адресной книги</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Understanding widgets</source>
-        <translation>Что такое виджет</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Building with qmake</source>
-        <translation>Сборка с помощью qmake</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Writing test cases</source>
-        <translation>Создание тестов</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+115"/>
         <source>Welcome</source>
         <translation>Начало</translation>
     </message>
-    <message>
-        <location line="+45"/>
-        <source>%1 (last session)</source>
-        <translation>%1 (последняя сессия)</translation>
-    </message>
-    <message>
-        <location line="+63"/>
-        <source>Choose an example...</source>
-        <translation>Выберите пример...</translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>New Project...</source>
-        <translation>Новый проект...</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <source>Cmd</source>
-        <comment>Shortcut key</comment>
-        <translation>Cmd</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Alt</source>
-        <comment>Shortcut key</comment>
-        <translation>Alt</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>You can switch between Qt Creator&apos;s modes using &lt;tt&gt;Ctrl+number&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Welcome&lt;/li&gt;&lt;li&gt;2 - Edit&lt;/li&gt;&lt;li&gt;3 - Debug&lt;/li&gt;&lt;li&gt;4 - Projects&lt;/li&gt;&lt;li&gt;5 - Help&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Output&lt;/li&gt;&lt;/ul&gt;</source>
-        <translation>Вы можете переключать режим Qt Creator используя &lt;tt&gt;Ctrl+число&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Приветствие&lt;/li&gt;&lt;li&gt;2 - Правка&lt;/li&gt;&lt;li&gt;3 - Отладка&lt;/li&gt;&lt;li&gt;4 - Проекты&lt;/li&gt;&lt;li&gt;5 - Справка&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Вывод&lt;/li&gt;&lt;/ul&gt;</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>You can show and hide the side bar using &lt;tt&gt;%1+0&lt;tt&gt;.</source>
-        <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
-        <translation>Вы можете включать и прятать боковую панель используя &lt;tt&gt;%1+0&lt;tt&gt;.</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>You can fine tune the &lt;tt&gt;Find&lt;/tt&gt; function by selecting &amp;quot;Whole Words&amp;quot; or &amp;quot;Case Sensitive&amp;quot;. Simply click on the icons on the right end of the line edit.</source>
-        <translation>Вы можете тонко настроить функцию &lt;tt&gt;Поиск&lt;/tt&gt;, выбирая &amp;quot;Слово целиком&amp;quot; или &amp;quot;Учитывать регистр&amp;quot;. Просто кликните на иконку справа от конца редактируемой строки.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation>Если вы добавите &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;внешние библиотеки&lt;/a&gt;, то Qt Creator автоматически предложит подсветку синтаксиса и дополнение кода.</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation>Автодополнение кода ориентировано на ВерблюжийРегистр. Например, чтобы получить &lt;tt&gt;namespaceUri&lt;/tt&gt; вы можете просто ввести &lt;tt&gt;nU&lt;/tt&gt; и нажать &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>You can force code completion at any time using &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation>Вы можете в любой момент вызвать дополнение кода нажатием &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>You can start Qt Creator with a session by calling &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</source>
-        <translation>Qt Creator может открывать сессию при запуске, для этого нужно выполнить команду &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>You can return to edit mode from any other mode at any time by hitting &lt;tt&gt;Escape&lt;/tt&gt;.</source>
-        <translation>Вы можете вернуться в режим редактирования из любого другого нажатием на &lt;tt&gt;Escape&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>You can switch between the output pane by hitting &lt;tt&gt;%1+n&lt;/tt&gt; where n is the number denoted on the buttons at the window bottom:&lt;ul&gt;&lt;li&gt;1 - Build Issues&lt;/li&gt;&lt;li&gt;2 - Search Results&lt;/li&gt;&lt;li&gt;3 - Application Output&lt;/li&gt;&lt;li&gt;4 - Compile Output&lt;/li&gt;&lt;/ul&gt;</source>
-        <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
-        <translation>Вы можете переключать окно вывода используя &lt;tt&gt;%1+n&lt;/tt&gt;, где n - это число указанное на кнопку внизу окна:&lt;ul&gt;&lt;li&gt;1 - Вывод сборки&lt;/li&gt;&lt;li&gt;2 - Результаты поиска&lt;/li&gt;&lt;li&gt;3 - Вывод программы&lt;/li&gt;&lt;li&gt;4 - Вывод компилятора&lt;/li&gt;&lt;/ul&gt;</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
-        <translation>Вы можете осуществлять быстрый поиск методов, классов, справки и прочего используя &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Панель поисковика&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation>Вы можете добавить собственные этапы сборки в &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;настройках сборки&lt;/a&gt;.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation>Внутри одной сессии вы можете добавлять &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;зависимости&lt;/a&gt; проектов друг от друга.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
-        <translation>Вы можете устанавливать предпочитаемую кодировку редактора для каждого проекта в &lt;tt&gt;Проекты -&gt; Настройки редактора -&gt; Кодировка по умолчанию&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>You can modify the binary that is being executed when you press the &lt;tt&gt;Run&lt;/tt&gt; button: Add a &lt;tt&gt;Custom Executable&lt;/tt&gt; by clicking the &lt;tt&gt;+&lt;/tt&gt; button in &lt;tt&gt;Projects -&gt; Run Settings -&gt; Run Configuration&lt;/tt&gt; and then select the new target in the combo box.</source>
-        <translation>Вы можете сменить программу, которая запускается при нажатии на кнопку &lt;tt&gt;Run&lt;/tt&gt;: Добавьте &lt;tt&gt;Другую программу&lt;/tt&gt; нажатием на кнопку &lt;tt&gt;+&lt;/tt&gt; в &lt;tt&gt;Проекты - Настройки запуска - Конфигурация запуска&lt;/tt&gt; и выберите новую цель в выпадающем списке.</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce and Git.</source>
-        <translation>Вы можете использовать Qt Creator с &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;системами контроля версий&lt;/a&gt;, такими как Subversion, Perforce и Git.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
-        <translation>В редакторе клавиша &lt;tt&gt;F2&lt;/tt&gt; переключает объявление и определение, а &lt;tt&gt;F4&lt;/tt&gt; - заголовочный и исходный файл.</translation>
-    </message>
-</context>
-<context>
-    <name>Welcome::WelcomePage</name>
     <message>
         <location filename="../../../src/plugins/welcome/welcomemode.ui"/>
         <source>#gradientWidget {
@@ -14286,41 +15538,6 @@ p, li { white-space: pre-wrap; }
 }
 </translation>
     </message>
-    <message>
-        <location/>
-        <source>Getting Started</source>
-        <translation>Начало работы</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Develop</source>
-        <translation>Разработка</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Community</source>
-        <translation>Сообщество</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Examples not installed</source>
-        <translation>Примеры не установлены</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Open</source>
-        <translation>Открыть</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Manage Sessions...</source>
-        <translation>Управление сессиями...</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Create New Project...</source>
-        <translation> Создать проект... </translation>
-    </message>
     <message>
         <location/>
         <source>Help us make Qt Creator even better</source>
diff --git a/src/app/Info.plist b/src/app/Info.plist
index 6633f429d69245845bb6bda00d59c92746f3a467..fd75eadded1b0a7f9137208e8ffa73ea45ed57c0 100644
--- a/src/app/Info.plist
+++ b/src/app/Info.plist
@@ -184,8 +184,8 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.nokia.qtcreator</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.91</string>
+	<string>1.2.93</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.91</string>
+	<string>1.2.93</string>
 </dict>
 </plist>
diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp
index c69a3bd2f91b315ae88c283e251e5cbd964e4d66..1641d09995fb6baaccc6536d3c70dea36cf05776 100644
--- a/src/libs/utils/detailswidget.cpp
+++ b/src/libs/utils/detailswidget.cpp
@@ -3,21 +3,23 @@
 
 #include <QtGui/QGridLayout>
 #include <QtCore/QStack>
+#include <QtGui/QLabel>
+#include <QtGui/QGridLayout>
 #include <QtGui/QPainter>
 
 using namespace Utils;
 
 DetailsWidget::DetailsWidget(QWidget *parent)
     : QWidget(parent),
+      m_summaryLabel(new QLabel(this)),
+      m_detailsButton(new DetailsButton(this)),
       m_widget(0),
-      m_toolWidget(0)
+      m_toolWidget(0),
+      m_grid(new QGridLayout(this))
+
 {
-    m_grid = new QGridLayout(this);
-    //m_grid->setMargin(0);
-    m_summaryLabel = new QLabel(this);
     m_summaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
     m_summaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    m_detailsButton = new DetailsButton(this);
 
     m_grid->addWidget(m_summaryLabel, 0, 0, 2, 0);
     m_grid->addWidget(m_detailsButton, 1, 2);
@@ -45,8 +47,8 @@ void DetailsWidget::paintEvent(QPaintEvent *paintEvent)
     if (!m_detailsButton->isToggled())
         return;
 
-    QRect detailsGeometry = m_detailsButton->geometry();
-    QRect widgetGeometry = m_widget->geometry();
+    const QRect detailsGeometry = m_detailsButton->geometry();
+    const QRect widgetGeometry = m_widget ? m_widget->geometry() : QRect(x(), y() + height(), width(), 0);
 
     QPoint tl(detailsGeometry.topLeft());
     tl += QPoint(-3, -3);
@@ -85,29 +87,65 @@ void DetailsWidget::setSummaryText(const QString &text)
     m_summaryLabel->setText(text);
 }
 
+QString DetailsWidget::summaryText() const
+{
+    return m_summaryLabel->text();
+}
+
+bool DetailsWidget::expanded() const
+{
+    return m_detailsButton->isToggled();
+}
+
+void DetailsWidget::setExpanded(bool v)
+{
+    if (expanded() != v)
+        m_detailsButton->animateClick();
+}
+
+QWidget *DetailsWidget::widget() const
+{
+    return m_widget;
+}
+
 void DetailsWidget::setWidget(QWidget *widget)
 {
     if (m_widget == widget)
         return;
-    if (m_widget)
+    if (m_widget) {
         m_grid->removeWidget(m_widget);
-    m_grid->addWidget(widget, 2, 0, 1, 3);
-    m_widget = widget;
-    m_widget->setVisible(m_detailsButton->isToggled());
+        m_widget = 0;
+    }
+    if (widget) {
+        m_grid->addWidget(widget, 2, 0, 1, 3);
+        m_widget = widget;
+        m_widget->setVisible(m_detailsButton->isToggled());
+    }
 }
 
 void DetailsWidget::setToolWidget(QWidget *widget)
 {
     if (m_toolWidget == widget)
         return;
-    if (m_toolWidget)
+    if (m_toolWidget) {
         m_grid->removeWidget(m_toolWidget);
-    m_grid->addWidget(widget, 1, 1);
-    m_toolWidget = widget;
+        m_toolWidget = 0;
+    }
+    if (widget) {
+        m_grid->addWidget(widget, 1, 1);
+        m_toolWidget = widget;
+    }
+}
+
+QWidget *DetailsWidget::toolWidget() const
+{
+    return m_toolWidget;
 }
 
 void DetailsWidget::fixUpLayout()
 {
+    if (!m_widget)
+        return;
     QWidget *parent = m_widget;
     QStack<QWidget *> widgets;
     while((parent = parent->parentWidget()) && parent && parent->layout()) {
diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h
index 004cecd93b4366c06e98dc31380a35f7e9774c6e..eee0444cb991302bed6edb1860a215535b5afb50 100644
--- a/src/libs/utils/detailswidget.h
+++ b/src/libs/utils/detailswidget.h
@@ -4,8 +4,11 @@
 #include "utils_global.h"
 
 #include <QtGui/QWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QGridLayout>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QGridLayout;
+QT_END_NAMESPACE
 
 namespace Utils {
 class DetailsButton;
@@ -13,16 +16,30 @@ class DetailsButton;
 class QTCREATOR_UTILS_EXPORT DetailsWidget : public QWidget
 {
     Q_OBJECT
+    Q_PROPERTY(QString summaryText READ summaryText WRITE setSummaryText DESIGNABLE true)
+    Q_PROPERTY(bool expanded READ expanded WRITE setExpanded DESIGNABLE true)
 public:
     DetailsWidget(QWidget *parent = 0);
     ~DetailsWidget();
 
     void setSummaryText(const QString &text);
+    QString summaryText() const;
+
+    bool expanded() const;
+    void setExpanded(bool);
+
     void setWidget(QWidget *widget);
+    QWidget *widget() const;
+
     void setToolWidget(QWidget *widget);
+    QWidget *toolWidget() const;
+
+protected:
     void paintEvent(QPaintEvent *paintEvent);
+
 private slots:
     void detailsButtonClicked();
+
 private:
     void fixUpLayout();
     QLabel *m_summaryLabel;
diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec
index 7a78f5dcb49ffc8c8638378b299fdc0a3bdd9151..7eee3b85b2f4e532075741933c92f44d6f84f9fb 100644
--- a/src/plugins/bineditor/BinEditor.pluginspec
+++ b/src/plugins/bineditor/BinEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="BinEditor" version="1.2.91" compatVersion="1.2.91">
+<plugin name="BinEditor" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Binary editor component.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="TextEditor" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="TextEditor" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec
index 7e74335bd0bb48cbf9a369cb1597b540c94e5b49..b23d0f68aef5f8b76ca788c7c461abe6ea5f4919 100644
--- a/src/plugins/bookmarks/Bookmarks.pluginspec
+++ b/src/plugins/bookmarks/Bookmarks.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Bookmarks" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Bookmarks" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Bookmarks in text editors.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
index b2274b4cc8beb444a6efa8971181c4bacd3b0571..361fd9ab43779415eeeaa720897240ea37cb5aca 100644
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CMakeProjectManager" version="1.2.91" compatVersion="1.2.91">
+<plugin name="CMakeProjectManager" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>CMake support</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="CppTools" version="1.2.91"/>
-        <dependency name="CppEditor" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="CppTools" version="1.2.93"/>
+        <dependency name="CppEditor" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index b3ea45a742fc160b32ad9f72a662b3d63b7eecf1..8e25314ba88c609325f764a74bc1bee96c9220e6 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -35,7 +35,6 @@
 #include <projectexplorer/environment.h>
 #include <projectexplorer/debugginghelper.h>
 #include <utils/qtcassert.h>
-#include <utils/detailsbutton.h>
 #include <QtGui/QFormLayout>
 #include <QtGui/QLineEdit>
 #include <QtGui/QGroupBox>
@@ -262,21 +261,15 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
 
     fl->addRow(tr("Working Directory:"), boxlayout);
 
-    m_detailsWidget = new QWidget(this);
-    m_detailsWidget->setLayout(fl);
-    m_detailsWidget->setVisible(false);
+    m_detailsContainer = new Utils::DetailsWidget(this);
 
-    m_summaryLabel = new QLabel(this);
-    m_detailsButton = new Utils::DetailsButton(this);
-
-    QHBoxLayout *hbox = new QHBoxLayout();
-    hbox->addWidget(m_summaryLabel);
-    hbox->addWidget(m_detailsButton);
+    QWidget *m_details = new QWidget(m_detailsContainer);
+    m_detailsContainer->setWidget(m_details);
+    m_details->setLayout(fl);
 
     QVBoxLayout *vbx = new QVBoxLayout(this);
-    vbx->setContentsMargins(0, -1, 0, -1);
-    vbx->addLayout(hbox);
-    vbx->addWidget(m_detailsWidget);
+    vbx->setMargin(0);;
+    vbx->addWidget(m_detailsContainer);
 
     QLabel *environmentLabel = new QLabel(this);
     environmentLabel->setText(tr("Run Environment"));
@@ -316,9 +309,6 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
     connect(resetButton, SIGNAL(clicked()),
             this, SLOT(resetWorkingDirectory()));
 
-    connect(m_detailsButton, SIGNAL(clicked()),
-            this, SLOT(toggleDetails()));
-
     connect(m_environmentWidget, SIGNAL(userChangesUpdated()),
             this, SLOT(userChangesUpdated()));
 
@@ -331,11 +321,6 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
 
 }
 
-void CMakeRunConfigurationWidget::toggleDetails()
-{
-    m_detailsWidget->setVisible(!m_detailsWidget->isVisible());
-}
-
 void CMakeRunConfigurationWidget::setWorkingDirectory()
 {
     if (m_ignoreChange)
@@ -397,7 +382,7 @@ void CMakeRunConfigurationWidget::updateSummary()
     QString text = tr("Running executable: <b>%1</b> %2")
                    .arg(QFileInfo(m_cmakeRunConfiguration->executable()).fileName(),
                         ProjectExplorer::Environment::joinArgumentList(m_cmakeRunConfiguration->commandLineArguments()));
-    m_summaryLabel->setText(text);
+    m_detailsContainer->setSummaryText(text);
 }
 
 
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
index ce542f1be8ddfa0c6b0c6fada15b1034d95eafc4..197d0b2a8d4750e65755ddd431c87a910ee8ad8b 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
@@ -35,6 +35,7 @@
 #include <projectexplorer/persistentsettings.h>
 #include <projectexplorer/environmenteditmodel.h>
 #include <utils/pathchooser.h>
+#include <utils/detailswidget.h>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
@@ -115,7 +116,6 @@ private slots:
 private slots:
     void baseEnvironmentComboBoxChanged(int index);
     void workingDirectoryChanged(const QString &workingDirectory);
-    void toggleDetails();
 private:
     void updateSummary();
     bool m_ignoreChange;
@@ -123,9 +123,7 @@ private:
     Core::Utils::PathChooser *m_workingDirectoryEdit;
     QComboBox *m_baseEnvironmentComboBox;
     ProjectExplorer::EnvironmentWidget *m_environmentWidget;
-    QWidget *m_detailsWidget;
-    QLabel *m_summaryLabel;
-    QAbstractButton *m_detailsButton;
+    Utils::DetailsWidget *m_detailsContainer;
 };
 
 class CMakeRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory
diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec
index 88232587e1a98adb416a54e394055fd37db68f33..c6dc9366cea31c2125448b6eab2f0ca40c77b1ce 100644
--- a/src/plugins/coreplugin/Core.pluginspec
+++ b/src/plugins/coreplugin/Core.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Core" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Core" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 5e059aff768292316a12422d83dbb6082c9b9568..4061298298f58b7887d73dcf580c67e256f2f201 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -35,7 +35,7 @@ namespace Constants {
 
 #define IDE_VERSION_MAJOR 1
 #define IDE_VERSION_MINOR 2
-#define IDE_VERSION_RELEASE 91
+#define IDE_VERSION_RELEASE 93
 
 #define STRINGIFY_INTERNAL(x) #x
 #define STRINGIFY(x) STRINGIFY_INTERNAL(x)
diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec
index b5c583b2702f9bbe008a7cde1b5e63c382cfff7d..d354eeb51645a5f13aa37acff696499bf0632acf 100644
--- a/src/plugins/cpaster/CodePaster.pluginspec
+++ b/src/plugins/cpaster/CodePaster.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CodePaster" version="1.2.91" compatVersion="1.2.91">
+<plugin name="CodePaster" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Codepaster plugin for pushing/fetching diff from server</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec
index 8eee10b864c637a2c22870c59a59bab03781a275..e60915af3c562bcc545a8f104942e76c4f566ad8 100644
--- a/src/plugins/cppeditor/CppEditor.pluginspec
+++ b/src/plugins/cppeditor/CppEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CppEditor" version="1.2.91" compatVersion="1.2.91">
+<plugin name="CppEditor" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>C/C++ editor component.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="CppTools" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="CppTools" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec
index 9c97cd3dadb3056c01d3d58da3aef11ccd4fba48..2ea5671746aecd2a2e0dd3cecc0b2b1139a1f085 100644
--- a/src/plugins/cpptools/CppTools.pluginspec
+++ b/src/plugins/cpptools/CppTools.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CppTools" version="1.2.91" compatVersion="1.2.91">
+<plugin name="CppTools" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Tools for analyzing C/C++ code.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="QuickOpen" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="QuickOpen" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cvs/CVS.pluginspec b/src/plugins/cvs/CVS.pluginspec
index 1af1e886c4444f8b688ecab4e853ef5513389c25..27cbbc1c30ef71bfd4fbe944c8b192d9f7123893 100644
--- a/src/plugins/cvs/CVS.pluginspec
+++ b/src/plugins/cvs/CVS.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CVS" version="1.2.91" compatVersion="1.2.91">
+<plugin name="CVS" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>CVS integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="Core" version="1.2.91"/>
-	<dependency name="VCSBase" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="Core" version="1.2.93"/>
+	<dependency name="VCSBase" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec
index a1f207a13dd590b48d16bee043928fb9d11062d6..d69817f42dbcb60c551ce6ab38aa01ce5b2e69b1 100644
--- a/src/plugins/debugger/Debugger.pluginspec
+++ b/src/plugins/debugger/Debugger.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Debugger" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Debugger" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Debugger integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="CppEditor" version="1.2.91"/><!-- Debugger plugin adds items to the editor's context menu -->
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="Find" version="1.2.91"/>
+        <dependency name="CppEditor" version="1.2.93"/><!-- Debugger plugin adds items to the editor's context menu -->
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="Find" version="1.2.93"/>
     </dependencyList>
     <argumentList>
         <argument name="-disable-cdb">Disable Cdb debugger engine</argument>
diff --git a/src/plugins/debugger/cdb/cdbstackframecontext.cpp b/src/plugins/debugger/cdb/cdbstackframecontext.cpp
index 76d5e00cf8897130f9691bb37c8ab84a5ba19f5a..93ab11d75efb31956cad1e7bbaa844aaa51090f5 100644
--- a/src/plugins/debugger/cdb/cdbstackframecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstackframecontext.cpp
@@ -128,21 +128,29 @@ WatchHandleDumperInserter::WatchHandleDumperInserter(WatchHandler *wh,
     Q_ASSERT(m_hexNullPattern.isValid());
 }
 
-
 // Prevent recursion of the model by setting value and type
-static inline void fixDumperValueAndType(WatchData *wd, const WatchData *source = 0)
-{
-    static const QString unknown = QCoreApplication::translate("CdbStackFrameContext", "<Unknown>");
-    if (wd->isTypeNeeded() || wd->type.isEmpty()) {
-        wd->setType(source ? source->type : unknown);
+static inline bool fixDumperType(WatchData *wd, const WatchData *source = 0)
+{    
+    const bool missing = wd->isTypeNeeded() || wd->type.isEmpty();
+    if (missing) {
+        static const QString unknownType = QCoreApplication::translate("CdbStackFrameContext", "<Unknown Type>");
+        wd->setType(source ? source->type : unknownType);
     }
-    if (wd->isValueNeeded()) {
+    return missing;
+}
+
+static inline bool fixDumperValue(WatchData *wd, const WatchData *source = 0)
+{
+    const bool missing = wd->isValueNeeded();
+    if (missing) {
         if (source && source->isValueKnown()) {
             wd->setValue(source->value);
         } else {
-            wd->setValue(unknown);
+            static const QString unknownValue = QCoreApplication::translate("CdbStackFrameContext", "<Unknown Value>");
+            wd->setValue(unknownValue);
         }
     }
+    return missing;
 }
 
 // When querying an item, the queried item is sometimes returned in incomplete form.
@@ -160,7 +168,8 @@ static inline void fixDumperResult(const WatchData &source,
     WatchData &returned = result->front();
     if (returned.iname != source.iname)
         return;
-    fixDumperValueAndType(&returned, &source);
+    fixDumperType(&returned, &source);
+    fixDumperValue(&returned, &source);
     // Indicate owner and known children
     returned.source = OwnerDumper;
     if (returned.isChildrenKnown() && returned.isHasChildrenKnown() && returned.hasChildren)
@@ -179,7 +188,9 @@ static inline void fixDumperResult(const WatchData &source,
         it->source = OwnerDumper;
         if (it->isChildrenKnown() && it->isHasChildrenKnown() && it->hasChildren)
             it->source |= CdbStackFrameContext::ChildrenKnownBit;
-        if (wd.addr.isEmpty() && wd.isSomethingNeeded()) {
+        // Cannot dump items with missing addresses or missing types
+        const bool typeFixed = fixDumperType(&wd); // Order of evaluation!
+        if ((wd.addr.isEmpty() && wd.isSomethingNeeded()) || typeFixed) {
             wd.setHasChildren(false);
             wd.setAllUnneeded();
         } else {
@@ -188,8 +199,6 @@ static inline void fixDumperResult(const WatchData &source,
             if (suppressGrandChildren && (wd.isChildrenNeeded() || wd.isHasChildrenNeeded()))
                 wd.setHasChildren(false);
         }
-        //   <Out of scope value> have sometimes missing types. Kill recursion
-        fixDumperValueAndType(&wd);
     }
     if (debugCDBWatchHandling)
         debugWatchDataList(*result, "<fixDumperResult");
@@ -226,7 +235,7 @@ bool WatchHandleDumperInserter::expandPointerToDumpable(const WatchData &wd, QSt
         const CdbDumperHelper::DumpResult dr = m_dumper->dumpType(derefedWd, true, &m_dumperResult, errorMessage);
         if (dr != CdbDumperHelper::DumpOk)
             break;
-        fixDumperResult(derefedWd, &m_dumperResult, true);
+        fixDumperResult(derefedWd, &m_dumperResult, false);
         // Insert the pointer item with 1 additional child + its dumper results
         // Note: formal arguments might already be expanded in the symbol group.
         WatchData ptrWd = wd;
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
index 6cdaf627092fe82ebe211e2abe84a9a41ba1dff2..40cd9776bcb94a3880a19241ab44683d36438d0b 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
@@ -86,7 +86,8 @@ bool CdbStackTraceContext::init(unsigned long frameCount, QString * /*errorMessa
     // Convert the DEBUG_STACK_FRAMEs to our StackFrame structure and populate the frames
     WCHAR wszBuf[MAX_PATH];
     for (ULONG i=0; i < frameCount; ++i) {
-        StackFrame frame(i);
+        StackFrame frame;
+        frame.level = i;
         const ULONG64 instructionOffset = m_cdbFrames[i].InstructionOffset;
         if (i == 0)
             m_instructionOffset = instructionOffset;
diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp
index fbdf2180020fc1375408450097c252aa2d573be1..de8a553180d16af53956049df03d40bc1ab5e1e9 100644
--- a/src/plugins/debugger/debuggeragents.cpp
+++ b/src/plugins/debugger/debuggeragents.cpp
@@ -43,6 +43,7 @@
 
 #include <utils/qtcassert.h>
 
+#include <QtCore/QDebug>
 #include <QtGui/QPlainTextEdit>
 #include <QtGui/QTextCursor>
 #include <QtGui/QSyntaxHighlighter>
@@ -182,7 +183,7 @@ private:
 */
 
 DisassemblerViewAgent::DisassemblerViewAgent(DebuggerManager *manager)
-    : QObject(manager), d(new DisassemblerViewAgentPrivate)
+    : QObject(0), d(new DisassemblerViewAgentPrivate), m_manager(manager)
 {
     d->editor = 0;
     d->locationMark = new LocationMark2();
@@ -212,13 +213,20 @@ void DisassemblerViewAgent::resetLocation()
         d->editor->markableInterface()->removeMark(d->locationMark);
 }
 
+QString frameKey(const StackFrame &frame)
+{
+    return _("%1:%2:%3").arg(frame.function).arg(frame.file).arg(frame.from);
+}
+
 void DisassemblerViewAgent::setFrame(const StackFrame &frame)
 {
     d->frame = frame;
-    if (!frame.function.isEmpty()) {
-        QHash<QString, QString>::ConstIterator it =
-            d->cache.find(frame.function + frame.file);
+    if (!frame.function.isEmpty() && frame.function != _("??")) {
+        QHash<QString, QString>::ConstIterator it = d->cache.find(frameKey(frame));
         if (it != d->cache.end()) {
+            QString msg = _("Use cache dissassembler for '%1' in '%2'")
+                .arg(frame.function).arg(frame.file);
+            m_manager->showDebuggerOutput(msg);
             setContents(*it);
             return;
         }
@@ -234,7 +242,7 @@ void DisassemblerViewAgent::setContents(const QString &contents)
     using namespace Core;
     using namespace TextEditor;
 
-    d->cache.insert(d->frame.function + d->frame.file, contents);
+    d->cache.insert(frameKey(d->frame), contents);
     QPlainTextEdit *plainTextEdit = 0;
     EditorManager *editorManager = EditorManager::instance();
     if (!d->editor) {
@@ -273,6 +281,19 @@ void DisassemblerViewAgent::setContents(const QString &contents)
     }
 }
 
+bool DisassemblerViewAgent::contentsCoversAddress(const QString &contents) const
+{
+    QTC_ASSERT(d, return false);
+    for (int pos = 0, line = 0; ; ++line, ++pos) { 
+        if (contents.midRef(pos, d->frame.address.size()) == d->frame.address)
+            return true;
+        pos = contents.indexOf('\n', pos + 1);
+        if (pos == -1)
+            break;
+    }
+    return false;
+}
+
 QString DisassemblerViewAgent::address() const
 {
     return d->frame.address;
diff --git a/src/plugins/debugger/debuggeragents.h b/src/plugins/debugger/debuggeragents.h
index 0fbe380e9fb5e88e52b279c97cd53dca149ad5d6..ed3daef9a49bf65b4cef713183922f99c4e4547c 100644
--- a/src/plugins/debugger/debuggeragents.h
+++ b/src/plugins/debugger/debuggeragents.h
@@ -86,10 +86,12 @@ public:
     void resetLocation();
     Q_SLOT void setContents(const QString &contents);
     QString address() const;
+    bool contentsCoversAddress(const QString &contents) const;
     void cleanup();
 
 private:
     DisassemblerViewAgentPrivate *d;
+    DebuggerManager *m_manager;
 };
 
 
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index f635bcf71e65842677b9b674b4d1577b27188c27..7250cdded28babd1951b5337eea97c775d533c42 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -378,8 +378,6 @@ void DebuggerManager::init()
     QAbstractItemView *stackView =
         qobject_cast<QAbstractItemView *>(d->m_stackWindow);
     stackView->setModel(d->m_stackHandler->stackModel());
-    connect(stackView, SIGNAL(frameActivated(int)),
-        this, SLOT(activateFrame(int)));
     connect(theDebuggerAction(ExpandStack), SIGNAL(triggered()),
         this, SLOT(reloadFullStack()));
     connect(theDebuggerAction(MaximalStackDepth), SIGNAL(triggered()),
@@ -1634,14 +1632,14 @@ void DebuggerManager::setState(DebuggerState state)
 
     showDebuggerOutput(LogDebug, msg);
 
-    resetLocation();
+    //resetLocation();
     if (state == d->m_state)
         return;
 
     d->m_state = state;
 
-    if (d->m_state == InferiorStopped)
-        resetLocation();
+    //if (d->m_state == InferiorStopped)
+    //    resetLocation();
 
     if (d->m_state == DebuggerNotReady) {
         setBusyCursor(false);
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index e6dde17f5ed0a009fbb277844d29318a459c663d..0cd0ca2aeb0398bf5ea9a22a5154931981b07ba0 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -228,9 +228,10 @@ public slots:
 
     void showStatusMessage(const QString &msg, int timeout = -1); // -1 forever
 
-private slots:
+public slots: // FIXME
     void showDebuggerOutput(const QString &msg)
         { showDebuggerOutput(LogDebug, msg); }
+private slots:
     void showDebuggerOutput(int channel, const QString &msg);
     void showDebuggerInput(int channel, const QString &msg);
     void showApplicationOutput(const QString &data);
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 6aa664c6811a5741b38a1bb5f7aa954bfb1d4c11..74c9b61ef68e5da783cd0aeb38cbd96c37f2d062 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -967,10 +967,7 @@ void GdbEngine::handleExecRunToFunction(const GdbResponse &response)
     setState(InferiorStopped);
     showStatusMessage(tr("Function reached. Stopped."));
     GdbMi frame = response.data.findChild("frame");
-    StackFrame f;
-    f.file = QString::fromLocal8Bit(frame.findChild("fullname").data());
-    f.line = frame.findChild("line").data().toInt();
-    f.address = _(frame.findChild("addr").data());
+    StackFrame f = parseStackFrame(frame, 0);
     gotoLocation(f, true);
 }
 
@@ -1166,11 +1163,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
     // system="0.00136",start="1218810678.805432",end="1218810678.812011"}
     setState(InferiorStopped);
     showStatusMessage(tr("Run to Function finished. Stopped."));
-    GdbMi frame = data.findChild("frame");
-    StackFrame f;
-    f.file = QString::fromLocal8Bit(frame.findChild("fullname").data());
-    f.line = frame.findChild("line").data().toInt();
-    f.address = _(frame.findChild("addr").data());
+    StackFrame f = parseStackFrame(data.findChild("frame"), 0);
     gotoLocation(f, true);
 #endif
 }
@@ -1192,7 +1185,7 @@ void GdbEngine::reloadStack()
     // returns with "^error,msg="Previous frame identical to this frame
     // (corrupt stack?)". Might be related to the fact that we can't
     // access the memory belonging to the lower frames. But as we know
-    // this always happens, ask the second time immediately instead
+    // this sometimes happens, ask the second time immediately instead
     // of waiting for the first request to fail.
     if (m_gdbAdapter->isTrkAdapter())
         postCommand(cmd, WatchUpdate, CB(handleStackListFrames), false);
@@ -1288,13 +1281,11 @@ void GdbEngine::handleStop2(const GdbMi &data)
         }
     }
 
-    // Quick shot
-    StackFrame f;
-    f.file = QFile::decodeName(fullName.data());
-    f.line = frame.findChild("line").data().toInt();
-    f.address = _(frame.findChild("addr").data());
-    f.function = _(frame.findChild("func").data());
-    gotoLocation(f, true);
+    // Quick shot: Jump to stack frame #0.
+    if (frame.isValid()) {
+        const StackFrame f = parseStackFrame(frame, 0);
+        gotoLocation(f, true);
+    }
 
     //
     // Stack
@@ -1852,11 +1843,7 @@ void GdbEngine::handleBreakList(const GdbResponse &response)
 
 void GdbEngine::handleBreakList(const GdbMi &table)
 {
-    //qDebug() << "GdbEngine::handleOutput: table:"
-    //  << table.toString();
     GdbMi body = table.findChild("body");
-    //qDebug() << "GdbEngine::handleOutput: body:"
-    //  << body.toString();
     QList<GdbMi> bkpts;
     if (body.isValid()) {
         // Non-Mac
@@ -1864,14 +1851,11 @@ void GdbEngine::handleBreakList(const GdbMi &table)
     } else {
         // Mac
         bkpts = table.children();
-        // remove the 'hdr' and artificial items
-        //qDebug() << "FOUND" << bkpts.size() << "BREAKPOINTS";
+        // Remove the 'hdr' and artificial items.
         for (int i = bkpts.size(); --i >= 0; ) {
             int num = bkpts.at(i).findChild("number").data().toInt();
-            if (num <= 0) {
-                //qDebug() << "REMOVING" << i << bkpts.at(i).toString();
+            if (num <= 0)
                 bkpts.removeAt(i);
-            }
         }
         //qDebug() << "LEFT" << bkpts.size() << "BREAKPOINTS";
     }
@@ -1924,8 +1908,8 @@ void GdbEngine::handleBreakCondition(const GdbResponse &response)
     int index = response.cookie.toInt();
     BreakHandler *handler = manager()->breakHandler();
     if (response.resultClass == GdbResultDone) {
-        // we just assume it was successful. otherwise we had to parse
-        // the output stream data
+        // We just assume it was successful. Otherwise we had to parse
+        // the output stream data.
         BreakpointData *data = handler->at(index);
         //qDebug() << "HANDLE BREAK CONDITION" << index << data->condition;
         data->bpCondition = data->condition;
@@ -1947,12 +1931,10 @@ void GdbEngine::handleBreakInsert(const GdbResponse &response)
     int index = response.cookie.toInt();
     BreakHandler *handler = manager()->breakHandler();
     if (response.resultClass == GdbResultDone) {
-        //qDebug() << "HANDLE BREAK INSERT" << index;
 //#if defined(Q_OS_MAC)
-        // interesting only on Mac?
+        // Interesting only on Mac?
         BreakpointData *data = handler->at(index);
         GdbMi bkpt = response.data.findChild("bkpt");
-        //qDebug() << "BKPT:" << bkpt.toString() << " DATA:" << data->toToolTip();
         breakpointDataFromOutput(data, bkpt);
 //#endif
         attemptBreakpointSynchronization();
@@ -1965,14 +1947,11 @@ void GdbEngine::handleBreakInsert(const GdbResponse &response)
         QFileInfo fi(data->fileName);
         QString where = _c('"') + fi.fileName() + _("\":")
             + data->lineNumber;
-        //QString where = m_data->fileName + _c(':') + data->lineNumber;
 #elif defined(Q_OS_MAC)
         QFileInfo fi(data->fileName);
         QString where = _c('"') + fi.fileName() + _("\":")
             + data->lineNumber;
 #else
-        //QString where = "\"\\\"" + data->fileName + "\\\":"
-        //    + data->lineNumber + "\"";
         QString where = _c('"') + data->fileName + _("\":")
             + data->lineNumber;
         // Should not happen with -break-insert -f. gdb older than 6.8?
@@ -2018,9 +1997,6 @@ void GdbEngine::extractDataFromInfoBreak(const QString &output, BreakpointData *
         data->markerLineNumber = data->bpLineNumber.toInt();
         data->markerFileName = full;
         data->bpFileName = full;
-        //qDebug() << "FOUND BREAKPOINT\n" << output
-        //    << re.cap(1) << "\n" << re.cap(2) << "\n"
-        //    << re.cap(3) << "\n" << re.cap(4) << "\n";
     } else {
         qDebug() << "COULD NOT MATCH " << re.pattern() << " AND " << output;
         data->bpNumber = _("<unavailable>");
@@ -2190,8 +2166,8 @@ void GdbEngine::handleModulesList(const GdbResponse &response)
 {
     QList<Module> modules;
     if (response.resultClass == GdbResultDone) {
-        // that's console-based output, likely Linux or Windows,
-        // but we can avoid the #ifdef here
+        // That's console-based output, likely Linux or Windows,
+        // but we can avoid the #ifdef here.
         QString data = QString::fromLocal8Bit(response.data.findChild("consolestreamoutput").data());
         QTextStream ts(&data, QIODevice::ReadOnly);
         while (!ts.atEnd()) {
@@ -2253,6 +2229,22 @@ void GdbEngine::handleStackSelectThread(const GdbResponse &)
 }
 
 
+StackFrame GdbEngine::parseStackFrame(const GdbMi &frameMi, int level)
+{
+    //qDebug() << "HANDLING FRAME:" << frameMi.toString();
+    QStringList files;
+    files.append(QFile::decodeName(frameMi.findChild("fullname").data()));
+    files.append(QFile::decodeName(frameMi.findChild("file").data()));
+    StackFrame frame;
+    frame.level = level;
+    frame.file = fullName(files);
+    frame.function = _(frameMi.findChild("func").data());
+    frame.from = _(frameMi.findChild("from").data());
+    frame.line = frameMi.findChild("line").data().toInt();
+    frame.address = _(frameMi.findChild("addr").data());
+    return frame;
+}
+
 void GdbEngine::handleStackListFrames(const GdbResponse &response)
 {
     #if defined(Q_OS_MAC)
@@ -2274,19 +2266,8 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
 
         int n = stack.childCount();
         for (int i = 0; i != n; ++i) {
-            //qDebug() << "HANDLING FRAME:" << stack.childAt(i).toString();
-            const GdbMi frameMi = stack.childAt(i);
-            StackFrame frame(i);
-            QStringList files;
-            files.append(QFile::decodeName(frameMi.findChild("fullname").data()));
-            files.append(QFile::decodeName(frameMi.findChild("file").data()));
-            frame.file = fullName(files);
-            frame.function = _(frameMi.findChild("func").data());
-            frame.from = _(frameMi.findChild("from").data());
-            frame.line = frameMi.findChild("line").data().toInt();
-            frame.address = _(frameMi.findChild("addr").data());
-
-            stackFrames.append(frame);
+            stackFrames.append(parseStackFrame(stack.childAt(i), i));
+            const StackFrame &frame = stackFrames.back();
 
             #if defined(Q_OS_WIN)
             const bool isBogus =
@@ -2296,14 +2277,15 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
                 // Also wrong. Happens on Vista with Gdb 5.50
                    || (frame.function == __("operator new") && frame.line == 151);
 
-            // immediately leave bogus frames
+            // Immediately leave bogus frames.
             if (topFrame == -1 && isBogus) {
                 postCommand(_("-exec-finish"));
                 return;
             }
             #endif
 
-            // Initialize top frame to the first valid frame
+            // Initialize top frame to the first valid frame.
+            // FIXME: Check for QFile(frame.fullname).isReadable()?
             const bool isValid = !frame.file.isEmpty() && !frame.function.isEmpty();
             if (isValid && topFrame == -1)
                 topFrame = i;
@@ -2314,12 +2296,23 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
         theDebuggerAction(ExpandStack)->setEnabled(canExpand);
         manager()->stackHandler()->setFrames(stackFrames, canExpand);
 
-        if (topFrame != -1 && topFrame != 0) {
-            // For topFrame == -1 there is no frame at all, for topFrame == 0
-            // we already issued a 'gotoLocation' when reading the *stopped
-            // message.
+        #ifdef Q_OS_MAC
+        // Mac gdb does not add the location to the "stopped" message,
+        // so the early gotoLocation() was not triggered. Force it here.
+        bool jump = topFrame != -1
+            && !theDebuggerBoolSetting(OperateByInstruction);
+        #else
+        // For topFrame == -1 there is no frame at all, for topFrame == 0
+        // we already issued a 'gotoLocation' when reading the *stopped
+        // message. Also, when OperateByInstruction we always want to
+        // use frame #0.
+        bool jump = topFrame != -1 && topFrame != 0
+            && !theDebuggerBoolSetting(OperateByInstruction);
+        #endif
+        
+        if (jump) {
             const StackFrame &frame = manager()->stackHandler()->currentFrame();
-            qDebug() << "GOTO, 2nd try" << frame.toString();
+            qDebug() << "GOTO, 2nd try" << frame.toString() << topFrame;
             gotoLocation(frame, true);
         }
     } else {
@@ -2352,19 +2345,18 @@ void GdbEngine::activateFrame(int frameIndex)
 
     StackHandler *stackHandler = manager()->stackHandler();
     int oldIndex = stackHandler->currentIndex();
-    qDebug() << "ACTIVATE FRAME:" << frameIndex << oldIndex
-        << stackHandler->currentIndex();
 
     if (frameIndex == stackHandler->stackSize()) {
         reloadFullStack();
         return;
     }
+
     QTC_ASSERT(frameIndex < stackHandler->stackSize(), return);
 
     if (oldIndex != frameIndex) {
         setTokenBarrier();
 
-        // Assuming this always succeeds saves a roundtrip.
+        // Assuming the command always succeeds this saves a roundtrip.
         // Otherwise the lines below would need to get triggered
         // after a response to this -stack-select-frame here.
         postCommand(_("-stack-select-frame ") + QString::number(frameIndex));
@@ -2373,12 +2365,7 @@ void GdbEngine::activateFrame(int frameIndex)
         updateLocals();
     }
 
-    const StackFrame &frame = stackHandler->currentFrame();
-
-    if (frame.isUsable())
-        gotoLocation(frame, true);
-    else
-        qDebug() << "FULL NAME NOT USABLE:" << frame.file;
+    gotoLocation(stackHandler->currentFrame(), true);
 }
 
 void GdbEngine::handleStackListThreads(const GdbResponse &response)
@@ -3875,18 +3862,18 @@ void GdbEngine::fetchDisassemblerByAddress(DisassemblerViewAgent *agent,
     QTC_ASSERT(agent, return);
     bool ok = true;
     quint64 address = agent->address().toULongLong(&ok, 0);
-    qDebug() << "ADDRESS: " << agent->address() << address;
+    //qDebug() << "ADDRESS: " << agent->address() << address;
     QTC_ASSERT(ok, return);
-    quint64 start = address - 20;
-    quint64 end = address + 100;
+    QString start = QString::number(address - 20, 16);
+    QString end = QString::number(address + 100, 16);
     // -data-disassemble [ -s start-addr -e end-addr ]
     //  | [ -f filename -l linenum [ -n lines ] ] -- mode
     if (useMixedMode) 
-        postCommand(_("-data-disassemble -s %1 -e %2 -- 1").arg(start).arg(end),
+        postCommand(_("-data-disassemble -s 0x%1 -e 0x%2 -- 1").arg(start).arg(end),
             Discardable, CB(handleFetchDisassemblerByAddress1),
             QVariant::fromValue(DisassemblerAgentCookie(agent)));
     else
-        postCommand(_("-data-disassemble -s %1 -e %2 -- 0").arg(start).arg(end),
+        postCommand(_("-data-disassemble -s 0x%1 -e 0x%2 -- 0").arg(start).arg(end),
             Discardable, CB(handleFetchDisassemblerByAddress0),
             QVariant::fromValue(DisassemblerAgentCookie(agent)));
 }
@@ -3959,6 +3946,9 @@ void GdbEngine::handleFetchDisassemblerByLine(const GdbResponse &response)
         GdbMi lines = response.data.findChild("asm_insns");
         if (lines.children().isEmpty())
             fetchDisassemblerByAddress(ac.agent, true);
+        else if (lines.children().size() == 1
+                    && lines.childAt(0).findChild("line").data() == "0")
+            fetchDisassemblerByAddress(ac.agent, true);
         else
             ac.agent->setContents(parseDisassembler(lines));
     } else if (response.resultClass == GdbResultError) {
@@ -3980,8 +3970,15 @@ void GdbEngine::handleFetchDisassemblerByAddress1(const GdbResponse &response)
         GdbMi lines = response.data.findChild("asm_insns");
         if (lines.children().isEmpty())
             fetchDisassemblerByAddress(ac.agent, false);
-        else
-            ac.agent->setContents(parseDisassembler(lines));
+        else {
+            QString contents = parseDisassembler(lines);
+            if (ac.agent->contentsCoversAddress(contents)) {
+                ac.agent->setContents(parseDisassembler(lines));
+            } else {
+                debugMessage(_("FALL BACK TO NON-MIXED"));
+                fetchDisassemblerByAddress(ac.agent, false);
+            }
+        }
     } else {
         // 26^error,msg="Cannot access memory at address 0x801ca308"
         QByteArray msg = response.data.findChild("msg").data();
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index e6775a4d4060141e0b1fa7062f99446047a168d0..58352b4ab34e961be32ca81571ceb738689c6279 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -156,6 +156,7 @@ private:
 
     bool supportsThreads() const;
     void gotoLocation(const StackFrame &frame, bool setLocationMarker);
+    StackFrame parseStackFrame(const GdbMi &mi, int level);
 
     void connectAdapter();
     void disconnectAdapter();
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 912086ad3395af9052d0f846faf61a12b3830ba1..bba434b618448a4139a0648590fd35583397b3fd 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -724,6 +724,17 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
         sendGdbServerMessage("l<target><architecture>symbianelf</architecture></target>");
     }
 
+    else if (cmd.startsWith("qXfer:libraries:read")) {
+        sendGdbServerAck();
+        /*
+            <library-list>
+              <library name="/lib/libc.so.6">
+                <segment address="0x10000000"/>
+              </library>
+            </library-list>
+i        */
+    }
+
     else if (cmd == "QStartNoAckMode") {
         //$qSupported#37
         //logMessage("Handling 'QStartNoAckMode'");
@@ -952,9 +963,16 @@ void TrkGdbAdapter::handleTrkResult(const TrkResult &result)
             str << " CODE: " << hexxNumber(codeseg);
             str << " DATA: " << hexxNumber(dataseg);
             str << " NAME: '" << name << '\'';
+            Library lib;
+            lib.name = name;
+            lib.codeseg = codeseg;
+            lib.dataseg = dataseg;
+            m_session.libraries.append(lib);
             logMessage(logMsg);
-            // This lets gdb trigger a register update etc
-            //sendGdbServerMessage("T05library:r;");
+            // This lets gdb trigger a register update etc.
+            // With CS gdb 6.4 we get a non-standard $qfDllInfo#7f+ request
+            // afterwards, so don't use it for now.
+            //sendGdbServerMessage("T05library:;");
             sendTrkMessage(0x18, TrkCallback(), trkContinueMessage(), "CONTINUE");
             break;
         }
@@ -1442,6 +1460,8 @@ void TrkGdbAdapter::startAdapter()
         m_remoteExecutable = parameters.processArgs.at(1);
         m_symbolFile = parameters.processArgs.at(2);
     }
+    // Unixish gdbs accept only forward slashes
+    m_symbolFile.replace(QLatin1Char('\\'), QLatin1Char('/'));
     // Start
     QTC_ASSERT(state() == EngineStarting, qDebug() << state());
     setState(AdapterStarting);
diff --git a/src/plugins/debugger/stackframe.h b/src/plugins/debugger/stackframe.h
index 8a9f1c2a41667f3e09852d76439b1a5acbee6b20..3a0e415e1f21f9b1cd88eb1f32b65c3e428e8f50 100644
--- a/src/plugins/debugger/stackframe.h
+++ b/src/plugins/debugger/stackframe.h
@@ -38,16 +38,16 @@ namespace Internal {
 
 struct StackFrame
 {
-    StackFrame(int level = 0);    
+    StackFrame();
     bool isUsable() const;
     QString toToolTip() const;
     QString toString() const;
 
     int level;
     QString function;
-    QString file;  // we try to put an absolute file name in there
-    QString from;
-    QString to;
+    QString file;  // We try to put an absolute file name in there.
+    QString from;  // Sometimes something like "/usr/lib/libstdc++.so.6"
+    QString to;    // Used in ScriptEngine only.
     int line;
     QString address;
 };
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index a28fa04399c3dff61186c68368ff4d0117bdf18a..e3b25b24334f82f8406a828ae8c252c38a655f1d 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -39,8 +39,8 @@
 
 using namespace Debugger::Internal;
 
-StackFrame::StackFrame(int l)
-  : level(l), line(0)
+StackFrame::StackFrame()
+  : level(0), line(0)
 {}
 
 bool StackFrame::isUsable() const
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 9b94856deac9fc891db35967002f008d6ad42de2..d854a5edaf6067d26700764e804a3c2882e9102b 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -80,8 +80,7 @@ void StackWindow::showAddressColumn(bool on)
 
 void StackWindow::rowActivated(const QModelIndex &index)
 {
-    //qDebug() << "ACTIVATED: " << index.row() << index.column();
-    emit frameActivated(index.row());
+    m_manager->activateFrame(index.row());
 }
 
 void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
@@ -115,7 +114,7 @@ void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
 
     menu.addSeparator();
 
-    //menu.addAction(theDebuggerAction(UseTooltipsInStackView));
+    menu.addAction(theDebuggerAction(UseToolTipsInStackView));
     menu.addAction(theDebuggerAction(UseAddressInStackView));
 
     QAction *actAdjust = menu.addAction(tr("Adjust column widths to contents"));
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 8208cb4fcf125f4006deea9e2216bde5e7cd73a6..a494c0d7000b2d07ab7254090753acbcbeef5890 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -560,7 +560,7 @@ QString QtDumperHelper::toString(bool debug) const
         str << "\nSize cache: ";
         const SizeCache::const_iterator scend = m_sizeCache.constEnd();
         for (SizeCache::const_iterator it = m_sizeCache.constBegin(); it != scend; ++it) {
-            str << ' ' << it.key() << '=' << it.value();
+            str << ' ' << it.key() << '=' << it.value() << '\n';
         }
         str << "\nExpression cache: (" << m_expressionCache.size() << ")\n";
         const QMap<QString, QString>::const_iterator excend = m_expressionCache.constEnd();
@@ -888,6 +888,7 @@ void QtDumperHelper::setQClassPrefixes(const QString &qNamespace)
     m_qListPrefix = qClassName(qNamespace, "QList");
     m_qLinkedListPrefix = qClassName(qNamespace, "QLinkedList");
     m_qVectorPrefix = qClassName(qNamespace, "QVector");
+    m_qQueuePrefix = qClassName(qNamespace, "QQueue");
 }
 
 static inline double getDumperVersion(const GdbMi &contents)
diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec
index 02cb944268c8b2f4071df52f4cabd41e6bb26341..584beaa9d15b820045fdd48c2d2aea8f5701fbc6 100644
--- a/src/plugins/designer/Designer.pluginspec
+++ b/src/plugins/designer/Designer.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Designer" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Designer" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Qt Designer integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
 <!-- For compiling with CPP support enabled -->
-        <dependency name="CppEditor" version="1.2.91"/>
+        <dependency name="CppEditor" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/fakevim/FakeVim.pluginspec b/src/plugins/fakevim/FakeVim.pluginspec
index b494ce3435e39bf4c0fe4f5f0e292bc075956141..5d55a62cbf31fa02852155409fa4c5a7cf4284e8 100644
--- a/src/plugins/fakevim/FakeVim.pluginspec
+++ b/src/plugins/fakevim/FakeVim.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="FakeVim" version="1.2.91" compatVersion="1.2.91">
+<plugin name="FakeVim" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>VI-style keyboard navigation.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="CppEditor" version="1.2.91"/><!-- Plugin adds items to the editor's context menu -->
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="CppEditor" version="1.2.93"/><!-- Plugin adds items to the editor's context menu -->
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec
index 9fa0b7e7ef7a5c80cb62f9a75ed022113f05473f..7c5d5a793dc9e2a505a9cf641c1edb0cc5454c1b 100644
--- a/src/plugins/find/Find.pluginspec
+++ b/src/plugins/find/Find.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Find" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Find" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides the find widget and the hooks for find implementations.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
index 2176c47e1a9e1d9e80db5042dff43b682f35b58a..32252e098d9e6591750a5eb1daf6677924e76a6e 100644
--- a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
+++ b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="GenericProjectManager" version="1.2.91" compatVersion="1.2.91">
+<plugin name="GenericProjectManager" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Generic support</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="CppTools" version="1.2.91"/>
-        <dependency name="CppEditor" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="CppTools" version="1.2.93"/>
+        <dependency name="CppEditor" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec
index 0bcbdcc24c48c33065b229383c8287fa2e7c6d38..7e245857312ac2c2e7b09667a4e632c056671b36 100644
--- a/src/plugins/git/ScmGit.pluginspec
+++ b/src/plugins/git/ScmGit.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="ScmGit" version="1.2.91" compatVersion="1.2.91">
+<plugin name="ScmGit" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Git integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="Core" version="1.2.91"/>
-	<dependency name="VCSBase" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="Core" version="1.2.93"/>
+	<dependency name="VCSBase" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec
index 4ed6d96636bbbba67f7c7340cc270a912d701fe2..1b733a1f6cb58a3e81266bdee19f08551d1c9dd2 100644
--- a/src/plugins/helloworld/HelloWorld.pluginspec
+++ b/src/plugins/helloworld/HelloWorld.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="HelloWorld" version="1.2.91" compatVersion="1.2.91">
+<plugin name="HelloWorld" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Hello World sample plugin.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec
index 0009411597e7efd67ab9a5d8b1b132aec0927779..872523db80327bac0360875e1bfd880f2eef5c99 100644
--- a/src/plugins/help/Help.pluginspec
+++ b/src/plugins/help/Help.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Help" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Help" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Help system.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="Find" version="1.2.91"/>
-        <dependency name="QuickOpen" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="Find" version="1.2.93"/>
+        <dependency name="QuickOpen" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec
index cc77648b9d2b298ed83df29fd53c387e059ec00f..760672ab28a2bb0f15f6de4e77bac3309122f6a0 100644
--- a/src/plugins/perforce/Perforce.pluginspec
+++ b/src/plugins/perforce/Perforce.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Perforce" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Perforce" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Perforce integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="Core" version="1.2.91"/>
-	<dependency name="VCSBase" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="Core" version="1.2.93"/>
+	<dependency name="VCSBase" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
index 70d49c83511487f97100a73ffd2dad4baca74fdc..145fec73c1a23117e63a4664aa0fece883ab3ba4 100644
--- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec
+++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="ProjectExplorer" version="1.2.91" compatVersion="1.2.91">
+<plugin name="ProjectExplorer" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="Find" version="1.2.91"/>
-        <dependency name="QuickOpen" version="1.2.91"/>
-        <dependency name="TextEditor" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="Find" version="1.2.93"/>
+        <dependency name="QuickOpen" version="1.2.93"/>
+        <dependency name="TextEditor" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index b2a8bfbb625b2be93e073795b81bc0d437759a84..6755ccc835040c822d848fa22b06259e6dc4ef90 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -35,7 +35,6 @@
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/debugginghelper.h>
-#include <utils/detailsbutton.h>
 #include <utils/detailswidget.h>
 #include <utils/pathchooser.h>
 
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index 32c5fe85329ba4a73c41e2f70ea3c35081603741..3d4fc5519ea52084236608b8647e8ee3f3bb0e6e 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -31,8 +31,6 @@
 #include "project.h"
 #include "session.h"
 
-#include <utils/detailsbutton.h>
-
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/ifile.h>
 
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index 5b89aa371bf03a5509c6cd1ac37e7bcb8310fb1f..422c8328c267658cd99a4429a4757eb4b37e4c09 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -29,7 +29,6 @@
 
 #include "environmenteditmodel.h"
 
-#include <utils/detailsbutton.h>
 #include <utils/detailswidget.h>
 
 #include <QtGui/QVBoxLayout>
diff --git a/src/plugins/qmleditor/QmlEditor.pluginspec b/src/plugins/qmleditor/QmlEditor.pluginspec
index 6ede2aa85b3462b0a2b36bac7b5b7163dd9ce8c3..4571ae218a796f151c57f7ce4fe7e1dbb9db8447 100644
--- a/src/plugins/qmleditor/QmlEditor.pluginspec
+++ b/src/plugins/qmleditor/QmlEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="QmlEditor" version="1.2.91" compatVersion="1.2.91">
+<plugin name="QmlEditor" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Editor for QML.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="TextEditor" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="TextEditor" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qmleditor/qmleditor.cpp b/src/plugins/qmleditor/qmleditor.cpp
index 48e3b7c8ce3b30eb95ee2ef03befd9dfbd6c3049..1b1fb71311e6018077bccc39cb55c746fa24e5dc 100644
--- a/src/plugins/qmleditor/qmleditor.cpp
+++ b/src/plugins/qmleditor/qmleditor.cpp
@@ -628,7 +628,8 @@ QString ScriptEditor::wordUnderCursor() const
 
 bool ScriptEditor::isElectricCharacter(const QChar &ch) const
 {
-    if (ch == QLatin1Char('}'))
+    if (ch == QLatin1Char('}')
+        || ch == QLatin1Char(']'))
         return true;
     return false;
 }
@@ -637,12 +638,13 @@ void ScriptEditor::indentBlock(QTextDocument *, QTextBlock block, QChar typedCha
 {
     TextEditor::TabSettings ts = tabSettings();
 
-    if (typedChar == QLatin1Char('}')
-        || ((typedChar == QChar::Null) && block.text().trimmed() == "}")) {
+    if (typedChar == QLatin1Char('}') || typedChar == QLatin1Char(']')
+        || (typedChar == QChar::Null
+            && (block.text().trimmed() == "}" || block.text().trimmed() == "]"))) {
 
         QTextCursor tc(block);
 
-        if (typedChar == QLatin1Char('}'))
+        if (typedChar == QLatin1Char('}') || typedChar == QLatin1Char(']'))
             tc = textCursor();
 
         if (TextEditor::TextBlockUserData::findPreviousBlockOpenParenthesis(&tc)) {
diff --git a/src/plugins/qmleditor/qmlhighlighter.cpp b/src/plugins/qmleditor/qmlhighlighter.cpp
index fa9bb7ace1213546c325d0a3d42798cc8d442011..521ad689af0b6f64ac3efb9161bdce51a8d86ce4 100644
--- a/src/plugins/qmleditor/qmlhighlighter.cpp
+++ b/src/plugins/qmleditor/qmlhighlighter.cpp
@@ -63,14 +63,16 @@ int QmlHighlighter::onBlockStart()
 
 void QmlHighlighter::onOpeningParenthesis(QChar parenthesis, int pos)
 {
-    if (parenthesis == QLatin1Char('{'))
+    if (parenthesis == QLatin1Char('{')
+        || parenthesis == QLatin1Char('['))
         ++m_braceDepth;
      m_currentBlockParentheses.push_back(Parenthesis(Parenthesis::Opened, parenthesis, pos));
 }
 
 void QmlHighlighter::onClosingParenthesis(QChar parenthesis, int pos)
 {
-    if (parenthesis == QLatin1Char('}'))
+    if (parenthesis == QLatin1Char('}')
+        || parenthesis == QLatin1Char(']'))
         --m_braceDepth;
     m_currentBlockParentheses.push_back(Parenthesis(Parenthesis::Closed, parenthesis, pos));
 }
diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
index fde164aa8d68972211d3a2f371e7fda1d396bba3..828bdad5511a1630b3bd2ab1bb934e38895c2c43 100644
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="QmlProjectManager" version="1.2.91" compatVersion="1.2.91">
+<plugin name="QmlProjectManager" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Qml support</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="CppTools" version="1.2.91"/>
-        <dependency name="CppEditor" version="1.2.91"/>
-        <dependency name="Help" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="CppTools" version="1.2.93"/>
+        <dependency name="CppEditor" version="1.2.93"/>
+        <dependency name="Help" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
index e9a39950cb551a5dffca1e476d9c404d84a396be..a72b0af4828c5c0e8c348e4f2db8fab105bdb64b 100644
--- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
+++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Qt4ProjectManager" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Qt4ProjectManager" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,11 +19,11 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides project type for Qt 4 pro files and tools.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="CppTools" version="1.2.91"/>
-        <dependency name="CppEditor" version="1.2.91"/>
-        <dependency name="Help" version="1.2.91"/>
-        <dependency name="Designer" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="CppTools" version="1.2.93"/>
+        <dependency name="CppEditor" version="1.2.93"/>
+        <dependency name="Help" version="1.2.93"/>
+        <dependency name="Designer" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index a4b6838a3d7752de9ec4f0ed2bbf8f9dcd4a0152..7631c17ad01b2655064700f7dccb52e5602b1eca 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -90,8 +90,8 @@ QtVersionManager::QtVersionManager()
         int id = s->value("Id", -1).toInt();
         if (id == -1)
             id = getUniqueId();
-        else if (id > m_idcount)
-            m_idcount = id;
+        else if (m_idcount < id)
+            m_idcount = id + 1;
         bool isAutodetected;
         QString autodetectionSource;
         if (s->contains("isAutodetected")) {
@@ -749,7 +749,6 @@ void QtVersionManager::parseParts(const QStringList &parts, QList<QMakeAssignmen
             after = true;
         } else if(part.contains('=')) {
             if (regExp.exactMatch(part)) {
-                qDebug()<<regExp.cap(1)<<"|"<<regExp.cap(2)<<"|"<<regExp.cap(3);
                 QMakeAssignment qa;
                 qa.variable = regExp.cap(1);
                 qa.op = regExp.cap(2);
diff --git a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
index 2c8b772f06f030845685023704a0371bb65d4632..2883b78a02929bb73ae9369e5aa271e9cb16f75b 100644
--- a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
+++ b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="QtScriptEditor" version="1.2.91" compatVersion="1.2.91">
+<plugin name="QtScriptEditor" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Editor for QtScript.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="TextEditor" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="TextEditor" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/quickopen/QuickOpen.pluginspec
index db95f0097cc6a29a69f761c4b955149a1562d6d8..d9a45e89ba7f11bd19b9a600e4c60adda6e5a8b8 100644
--- a/src/plugins/quickopen/QuickOpen.pluginspec
+++ b/src/plugins/quickopen/QuickOpen.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="QuickOpen" version="1.2.91" compatVersion="1.2.91">
+<plugin name="QuickOpen" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides the Locator widget and the hooks for QuickOpen filter implementations.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec
index 08081797edd8c449e33f2533147d02e4782a1722..dc6d880279b929e814deb69ab1874c844a43e60e 100644
--- a/src/plugins/regexp/RegExp.pluginspec
+++ b/src/plugins/regexp/RegExp.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="RegExp" version="1.2.91" compatVersion="1.2.91">
+<plugin name="RegExp" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Regular Expression test widget.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec
index 697f61c67415171691e0e1bc8e671302171d7c06..b013822f71e972736147a719fd11e908f4dd521c 100644
--- a/src/plugins/resourceeditor/ResourceEditor.pluginspec
+++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="ResourceEditor" version="1.2.91" compatVersion="1.2.91">
+<plugin name="ResourceEditor" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Editor for qrc files.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/snippets/Snippets.pluginspec b/src/plugins/snippets/Snippets.pluginspec
index fd4881ac94b9e6d8fb006d8d2a72b0aa78d8e52d..f507a4d182fbd83561350b3d7bcf867d5cb9e7c6 100644
--- a/src/plugins/snippets/Snippets.pluginspec
+++ b/src/plugins/snippets/Snippets.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Snippets" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Snippets" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Code snippet plugin.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec
index f8bd40f1b9218fc26fa66ca9d5aaafed6b97f2b8..620deb1778422c32aa48c618a6f6a078a85054a3 100644
--- a/src/plugins/subversion/Subversion.pluginspec
+++ b/src/plugins/subversion/Subversion.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Subversion" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Subversion" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Subversion integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
-        <dependency name="Core" version="1.2.91"/>
-	<dependency name="VCSBase" version="1.2.91"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
+        <dependency name="Core" version="1.2.93"/>
+	<dependency name="VCSBase" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec
index 691dd6edfa11899174955057de3989ae292b1bfc..22e1a928efd3f3758dde6e90430ea94a9cadc383 100644
--- a/src/plugins/texteditor/TextEditor.pluginspec
+++ b/src/plugins/texteditor/TextEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="TextEditor" version="1.2.91" compatVersion="1.2.91">
+<plugin name="TextEditor" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Text editor framework and the implementation of the basic text editor.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="Find" version="1.2.91"/>
-        <dependency name="QuickOpen" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="Find" version="1.2.93"/>
+        <dependency name="QuickOpen" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 90ce04e5d7cf91e3b857bec0670c25d8e7392f63..0386cec46313ab268ac9ce24217e7b9cbb94820b 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -1511,9 +1511,13 @@ int Parenthesis::closeCollapseAtPos(const Parentheses &parentheses)
     int depth = 0;
     for (int i = 0; i < parentheses.size(); ++i) {
         const Parenthesis &p = parentheses.at(i);
-        if (p.chr == QLatin1Char('{') || p.chr == QLatin1Char('+')) {
+        if (p.chr == QLatin1Char('{')
+            || p.chr == QLatin1Char('+')
+            || p.chr == QLatin1Char('[')) {
             ++depth;
-        } else if (p.chr == QLatin1Char('}') || p.chr == QLatin1Char('-')) {
+        } else if (p.chr == QLatin1Char('}')
+            || p.chr == QLatin1Char('-')
+            || p.chr == QLatin1Char(']')) {
             if (--depth < 0)
                 return p.pos;
         }
@@ -1529,13 +1533,17 @@ int Parenthesis::collapseAtPos(const Parentheses &parentheses, QChar *character)
     int depth = 0;
     for (int i = 0; i < parentheses.size(); ++i) {
         const Parenthesis &p = parentheses.at(i);
-        if (p.chr == QLatin1Char('{') || p.chr == QLatin1Char('+')) {
+        if (p.chr == QLatin1Char('{')
+            || p.chr == QLatin1Char('+')
+            || p.chr == QLatin1Char('[')) {
             if (depth == 0) {
                 result = p.pos;
                 c = p.chr;
             }
             ++depth;
-        } else if (p.chr == QLatin1Char('}') || p.chr == QLatin1Char('-')) {
+        } else if (p.chr == QLatin1Char('}')
+            || p.chr == QLatin1Char('-')
+            || p.chr == QLatin1Char(']')) {
             if (--depth < 0)
                 depth = 0;
             result = -1;
@@ -1557,8 +1565,8 @@ int TextBlockUserData::braceDepthDelta() const
     int delta = 0;
     for (int i = 0; i < m_parentheses.size(); ++i) {
         switch (m_parentheses.at(i).chr.unicode()) {
-        case '{': case '+': ++delta; break;
-        case '}': case '-': --delta; break;
+        case '{': case '+': case '[': ++delta; break;
+        case '}': case '-': case ']': --delta; break;
         default: break;
         }
     }
@@ -2293,13 +2301,13 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
         qreal blockHeight = 0;
         QTextBlock b = visibleCollapsedBlock;
 
-        while (!b.isVisible() && visibleCollapsedBlockOffset.y() + blockHeight <= e->rect().bottom()) {
+        while (!b.isVisible()) {
             b.setVisible(true); // make sure block bounding rect works
             QRectF r = blockBoundingRect(b).translated(visibleCollapsedBlockOffset);
 
             QTextLayout *layout = b.layout();
             for (int i = layout->lineCount()-1; i >= 0; --i)
-                maxWidth = qMax(maxWidth, layout->lineAt(i).naturalTextWidth() + margin);
+                maxWidth = qMax(maxWidth, layout->lineAt(i).naturalTextWidth() + 2*margin);
 
             blockHeight += r.height();
 
@@ -3676,7 +3684,8 @@ bool TextBlockUserData::findPreviousBlockOpenParenthesis(QTextCursor *cursor, bo
             for (int i = parenList.count()-1; i >= 0; --i) {
                 Parenthesis paren = parenList.at(i);
                 if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}')
-                    && paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-'))
+                    && paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-')
+                    && paren.chr != QLatin1Char('[') && paren.chr != QLatin1Char(']'))
                     continue;
                 if (block == cursor->block()) {
                     if (position - block.position() <= paren.pos + (paren.type == Parenthesis::Closed ? 1 : 0))
@@ -3739,7 +3748,8 @@ bool TextBlockUserData::findNextBlockClosingParenthesis(QTextCursor *cursor)
             for (int i = 0; i < parenList.count(); ++i) {
                 Parenthesis paren = parenList.at(i);
                 if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}')
-                    && paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-'))
+                    && paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-')
+                    && paren.chr != QLatin1Char('[') && paren.chr != QLatin1Char(']'))
                     continue;
                 if (block == cursor->block() &&
                     (position - block.position() > paren.pos - (paren.type == Parenthesis::Opened ? 1 : 0)))
diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec
index 670df6002b99b8c0cb86ff61b681e9e77412aa11..9a1fdf583a72e8b96a7da8a99997c72d6b5e0af8 100644
--- a/src/plugins/vcsbase/VCSBase.pluginspec
+++ b/src/plugins/vcsbase/VCSBase.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="VCSBase" version="1.2.91" compatVersion="1.2.91">
+<plugin name="VCSBase" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Version Control System Base Plugin</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
-        <dependency name="TextEditor" version="1.2.91"/>
-        <dependency name="ProjectExplorer" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
+        <dependency name="TextEditor" version="1.2.93"/>
+        <dependency name="ProjectExplorer" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/welcome/Welcome.pluginspec b/src/plugins/welcome/Welcome.pluginspec
index 396d0d573240720f1f3628a52c69ec1f9930b5ae..ca92c284224ae18388faeaf39157476998a87935 100644
--- a/src/plugins/welcome/Welcome.pluginspec
+++ b/src/plugins/welcome/Welcome.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Welcome" version="1.2.91" compatVersion="1.2.91">
+<plugin name="Welcome" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Default Welcome Screen Plugin</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.91"/>
+        <dependency name="Core" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/shared/trk/trkutils.h b/src/shared/trk/trkutils.h
index 3bc2ed8de73def510fbf84279c1f344d65f9dfe0..36bff80c4db3f0324b92eed8ab5321f2fb2fcf3f 100644
--- a/src/shared/trk/trkutils.h
+++ b/src/shared/trk/trkutils.h
@@ -114,9 +114,20 @@ enum TargetConstants
     MemoryChunkSize = 256
 };
 
+struct Library
+{
+    Library() {}
+
+    QString name;
+    uint codeseg;
+    uint dataseg;
+};
+
 struct Session
 {
-    Session() {
+    Session() { reset(); }
+
+    void reset() {
         cpuMajor = 0;
         cpuMinor = 0;
         bigEndian = 0;
@@ -130,6 +141,7 @@ struct Session
         dataseg = 0;
 
         currentThread = 0;
+        libraries.clear();
     }
 
     // Trk feedback
@@ -146,6 +158,9 @@ struct Session
     uint dataseg;
     QHash<uint, uint> addressToBP;
 
+    typedef QList<Library> Libraries;
+    Libraries libraries;
+
     // Gdb request
     uint currentThread;
     QStringList modules;
@@ -160,6 +175,7 @@ struct Snapshot
     Memory memory;
 };
 
+
 struct Breakpoint
 {
     Breakpoint(uint offset_ = 0)
diff --git a/src/tools/qtcreatorwidgets/customwidget.h b/src/tools/qtcreatorwidgets/customwidget.h
index efa3037eff354b0973f5cbf9a6845bb2e37e3030..745205e6dac50c60c51447d1e635e298572c1e03 100644
--- a/src/tools/qtcreatorwidgets/customwidget.h
+++ b/src/tools/qtcreatorwidgets/customwidget.h
@@ -63,6 +63,9 @@ public:
     QWidget *createWidget(QWidget *parent);
     void initialize(QDesignerFormEditorInterface *core);
 
+protected:
+    bool initialized() const        { return m_initialized; }
+
 private:
     QString displayName() const;
     QString geometryProperty() const;
diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp
index 3fba12ef18fa9473303e1571fa76cd5e3bc4318e..e8867a59fab2f736577d34fd71cd55475ba9d1ba 100644
--- a/src/tools/qtcreatorwidgets/customwidgets.cpp
+++ b/src/tools/qtcreatorwidgets/customwidgets.cpp
@@ -31,6 +31,8 @@
 
 #include <QtGui/QMenu>
 #include <QtGui/QAction>
+#include <QtDesigner/QExtensionManager>
+#include <QtDesigner/QDesignerFormEditorInterface>
 
 static const char *groupC = "QtCreator";
 
@@ -165,11 +167,125 @@ PathListEditor_CW::PathListEditor_CW(QObject *parent) :
 {
 }
 
+DetailsButton_CW::DetailsButton_CW(QObject *parent) :
+    QObject(parent),
+    CustomWidget<Utils::DetailsButton>
+    (QLatin1String("<utils/detailsbutton.h>"),
+    false,
+    QLatin1String(groupC),
+    QIcon(),
+    QLatin1String("Expandable button for 'Details'"))
+{
+}
+
+DetailsWidget_CW::DetailsWidget_CW(QObject *parent) :
+    QObject(parent),
+    CustomWidget<Utils::DetailsWidget>
+    (QLatin1String("<utils/detailswidget.h>"),
+    true,
+    QLatin1String(groupC),
+    QIcon(),
+    QLatin1String("Expandable widget for 'Details'. You might need an expandable spacer below."))
+{
+}
+
+QString DetailsWidget_CW::domXml() const
+{
+    // Expanded from start, else child visibility is wrong
+    const char *xmlC ="\
+<ui language=\"c++\" displayname=\"DetailsWidget\">\
+    <widget class=\"Utils::DetailsWidget\" name=\"detailsWidget\">\
+        <property name=\"geometry\">\
+            <rect><x>0</x><y>0</y><width>160</width><height>80</height></rect>\
+        </property>\
+        <property name=\"summaryText\">\
+            <string>Summary</string>\
+        </property>\
+        <property name=\"expanded\">\
+            <bool>true</bool>\
+        </property>\
+        <widget class=\"QWidget\" name=\"detailsContainer\" />\
+    </widget>\
+    <customwidgets>\
+        <customwidget>\
+            <class>Utils::DetailsWidget</class>\
+            <addpagemethod>setWidget</addpagemethod>\
+        </customwidget>\
+    </customwidgets>\
+</ui>";
+    return QLatin1String(xmlC);
+}
+
+void DetailsWidget_CW::initialize(QDesignerFormEditorInterface *core)
+{
+    const bool firstTime = !initialized();
+    CustomWidget<Utils::DetailsWidget>::initialize(core);    
+    if (firstTime)
+        if (QExtensionManager *manager = core->extensionManager())
+            manager->registerExtensions(new DetailsWidgetExtensionFactory(manager), Q_TYPEID(QDesignerContainerExtension));
+}
+
+DetailsWidgetContainerExtension::DetailsWidgetContainerExtension(Utils::DetailsWidget *widget, QObject *parent) :
+    QObject(parent),
+    m_detailsWidget(widget)
+{
+}
+
+void DetailsWidgetContainerExtension::addWidget(QWidget *widget)
+{
+    if (m_detailsWidget->widget()) {
+        qWarning("Cannot add 2nd child to DetailsWidget");
+    } else {
+        m_detailsWidget->setWidget(widget);
+    }
+}
+
+int DetailsWidgetContainerExtension::count() const
+{
+    return m_detailsWidget->widget() ? 1 : 0;
+}
+
+int DetailsWidgetContainerExtension::currentIndex() const
+{
+    return 0;
+}
+
+void DetailsWidgetContainerExtension::insertWidget(int /* index */, QWidget *widget)
+{
+    addWidget(widget);
+}
+
+void DetailsWidgetContainerExtension::remove(int /* index */)
+{
+    m_detailsWidget->setWidget(0);
+}
+
+void DetailsWidgetContainerExtension::setCurrentIndex(int /* index */)
+{
+}
+
+QWidget *DetailsWidgetContainerExtension::widget(int  /* index */) const
+{
+    return m_detailsWidget->widget();
+}
+
+DetailsWidgetExtensionFactory::DetailsWidgetExtensionFactory(QExtensionManager *parent) :
+    QExtensionFactory(parent)
+{
+}
+
+QObject *DetailsWidgetExtensionFactory::createExtension(QObject *object, const QString &iid, QObject *parent) const
+{
+    if (Utils::DetailsWidget *dw = qobject_cast<Utils::DetailsWidget*>(object))
+        if (iid == Q_TYPEID(QDesignerContainerExtension))
+            return new DetailsWidgetContainerExtension(dw, parent);
+    return 0;
+}
+
 // -------------- WidgetCollection
 WidgetCollection::WidgetCollection(QObject *parent) :
     QObject(parent)
 {
-
     m_plugins.push_back(new NewClassCustomWidget(this));
     m_plugins.push_back(new ClassNameValidatingLineEdit_CW(this));
     m_plugins.push_back(new FileNameValidatingLineEdit_CW(this));
@@ -181,6 +297,8 @@ WidgetCollection::WidgetCollection(QObject *parent) :
     m_plugins.push_back(new SubmitEditorWidget_CW(this));
     m_plugins.push_back(new SubmitFieldWidget_CW(this));
     m_plugins.push_back(new PathListEditor_CW(this));
+    m_plugins.push_back(new DetailsButton_CW(this));
+    m_plugins.push_back(new DetailsWidget_CW(this));
 }
 
 QList<QDesignerCustomWidgetInterface*> WidgetCollection::customWidgets() const
diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h
index f4f648d0fb802726cce5b4c4f2cbd383edad7fe5..f9999d203072a2ad179728b721a81d25aff9c024 100644
--- a/src/tools/qtcreatorwidgets/customwidgets.h
+++ b/src/tools/qtcreatorwidgets/customwidgets.h
@@ -43,12 +43,20 @@
 #include <utils/submiteditorwidget.h>
 #include <utils/submitfieldwidget.h>
 #include <utils/pathlisteditor.h>
+#include <utils/detailsbutton.h>
+#include <utils/detailswidget.h>
 
 #include <QtDesigner/QDesignerCustomWidgetCollectionInterface>
+#include <QtDesigner/QDesignerContainerExtension>
+#include <QtDesigner/QExtensionFactory>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/QList>
 
+QT_BEGIN_NAMESPACE
+class QExtensionManager;
+QT_END_NAMESPACE
+
 // Custom Widgets
 
 class NewClassCustomWidget :
@@ -163,7 +171,62 @@ public:
     explicit PathListEditor_CW(QObject *parent = 0);
 };
 
-// Collection
+class DetailsButton_CW :
+    public QObject,
+    public CustomWidget<Utils::DetailsButton>
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+public:
+    explicit DetailsButton_CW(QObject *parent = 0);
+};
+
+// Details Widget: plugin + simple, hacky container extension that
+// accepts only one page.
+
+class DetailsWidget_CW :
+    public QObject,
+    public CustomWidget<Utils::DetailsWidget>
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+public:
+    explicit DetailsWidget_CW(QObject *parent = 0);
+    QString domXml() const;
+    void initialize(QDesignerFormEditorInterface *core);
+};
+
+class DetailsWidgetContainerExtension: public QObject,
+                                         public QDesignerContainerExtension
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerContainerExtension)
+public:
+    explicit DetailsWidgetContainerExtension(Utils::DetailsWidget *widget, QObject *parent);
+
+    void addWidget(QWidget *widget);
+    int count() const;
+    int currentIndex() const;
+    void insertWidget(int index, QWidget *widget);
+    void remove(int index);
+    void setCurrentIndex(int index);
+    QWidget *widget(int index) const;
+
+private:
+    Utils::DetailsWidget *m_detailsWidget;
+};
+
+class DetailsWidgetExtensionFactory: public QExtensionFactory
+{
+    Q_OBJECT
+public:
+    explicit DetailsWidgetExtensionFactory(QExtensionManager *parent = 0);
+
+protected:
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const;
+};
+
+// ------------ Collection
 
 class WidgetCollection : public QObject, public QDesignerCustomWidgetCollectionInterface
 {
@@ -175,7 +238,7 @@ public:
     virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;
 
 private:
-    QList<QDesignerCustomWidgetInterface*> m_plugins;
+    QList<QDesignerCustomWidgetInterface*> m_plugins;    
 };
 
 #endif // CUSTOMWIDGETS_H
diff --git a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
index 1668c4aaad1ea40bf36aa7de310ffc1a77efd6fc..6dd4d90958af8a36e89d327921c484946232440b 100644
--- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
@@ -19,7 +19,6 @@ linux-* {
   QTC_LIBS=$$dirname(QTC_LIBS)
   QTC_LIBS=$$dirname(QTC_LIBS)
   QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
-  QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
   QMAKE_RPATHDIR *= $$QTC_LIBS
 }
 
@@ -29,6 +28,7 @@ macx {
     CONFIG(debug, debug|release):LIBS += -lUtils_debug
     else:LIBS += -lUtils
 } else {
+    message($$QTC_LIBS)
     LIBS += -L$$QTC_LIBS -lUtils
 }