diff --git a/doc/examples/batteryindicator/BatteryIndicator.pro b/doc/examples/batteryindicator/BatteryIndicator.pro
new file mode 100644
index 0000000000000000000000000000000000000000..da30a71a4b610c7bd23c699f837b8e80aac244b8
--- /dev/null
+++ b/doc/examples/batteryindicator/BatteryIndicator.pro
@@ -0,0 +1,28 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2010-05-26T16:46:58
+#
+#-------------------------------------------------
+
+QT += core gui
+
+TARGET = BatteryIndicator
+TEMPLATE = app
+
+
+SOURCES += main.cpp\
+ batteryindicator.cpp
+
+HEADERS += batteryindicator.h
+
+FORMS += batteryindicator.ui
+
+CONFIG += mobility
+MOBILITY = systeminfo
+
+symbian {
+ TARGET.UID3 = 0xecbd72d7
+ # TARGET.CAPABILITY +=
+ TARGET.EPOCSTACKSIZE = 0x14000
+ TARGET.EPOCHEAPSIZE = 0x020000 0x800000
+}
diff --git a/doc/examples/batteryindicator/batteryindicator.cpp b/doc/examples/batteryindicator/batteryindicator.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..8ddb69590a6f95503abceaf9e7e9276b958ed96b
--- /dev/null
+++ b/doc/examples/batteryindicator/batteryindicator.cpp
@@ -0,0 +1,30 @@
+#include "batteryindicator.h"
+#include "ui_batteryindicator.h"
+
+//! [2]
+BatteryIndicator::BatteryIndicator(QWidget *parent) :
+ QDialog(parent),
+ ui(new Ui::BatteryIndicator),
+ deviceInfo(NULL)
+{
+ ui->setupUi(this);
+ setupGeneral();
+}
+//! [2]
+
+BatteryIndicator::~BatteryIndicator()
+{
+ delete ui;
+}
+
+//! [1]
+void BatteryIndicator::setupGeneral()
+{
+ deviceInfo = new QSystemDeviceInfo(this);
+
+ ui->batteryLevelBar->setValue(deviceInfo->batteryLevel());
+
+ connect(deviceInfo, SIGNAL(batteryLevelChanged(int)),
+ ui->batteryLevelBar, SLOT(setValue(int)));
+}
+//! [1]
diff --git a/doc/examples/batteryindicator/batteryindicator.h b/doc/examples/batteryindicator/batteryindicator.h
new file mode 100644
index 0000000000000000000000000000000000000000..50a1b93bd6280e6c1d6c76fd1281eb371396a92e
--- /dev/null
+++ b/doc/examples/batteryindicator/batteryindicator.h
@@ -0,0 +1,35 @@
+#ifndef BATTERYINDICATOR_H
+#define BATTERYINDICATOR_H
+
+#include <QDialog>
+
+//! [1]
+#include <QSystemInfo>
+//! [1]
+
+//! [2]
+QTM_USE_NAMESPACE
+//! [2]
+
+namespace Ui {
+ class BatteryIndicator;
+}
+
+class BatteryIndicator : public QDialog
+{
+ Q_OBJECT
+
+public:
+ explicit BatteryIndicator(QWidget *parent = 0);
+ ~BatteryIndicator();
+
+//! [3]
+private:
+ Ui::BatteryIndicator *ui;
+ void setupGeneral();
+
+ QSystemDeviceInfo *deviceInfo;
+//! [3]
+};
+
+#endif // BATTERYINDICATOR_H
diff --git a/doc/examples/batteryindicator/batteryindicator.ui b/doc/examples/batteryindicator/batteryindicator.ui
new file mode 100644
index 0000000000000000000000000000000000000000..3e62af26ae11dab3b13d742a09ff81b3c56b1f6a
--- /dev/null
+++ b/doc/examples/batteryindicator/batteryindicator.ui
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BatteryIndicator</class>
+ <widget class="QDialog" name="BatteryIndicator">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>480</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>BatteryIndicator</string>
+ </property>
+ <widget class="QProgressBar" name="batteryLevelBar">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>118</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="value">
+ <number>24</number>
+ </property>
+ </widget>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/examples/batteryindicator/main.cpp b/doc/examples/batteryindicator/main.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2674f5de173dc49f6dc06ae648b60bc04ba64a71
--- /dev/null
+++ b/doc/examples/batteryindicator/main.cpp
@@ -0,0 +1,15 @@
+#include <QtGui/QApplication>
+#include "batteryindicator.h"
+
+int main(int argc, char *argv[])
+{
+ QApplication a(argc, argv);
+ BatteryIndicator w;
+#if defined(Q_WS_S60)
+ w.showMaximized();
+#else
+ w.show();
+#endif
+
+ return a.exec();
+}
diff --git a/doc/images/qmldesigner-run-custom-exe.png b/doc/images/qmldesigner-run-custom-exe.png
index a053ec8702b6a6b9c037944aa22ebfeb48c286f6..52bd2e83dedbca8b778d10a4b5491a5c50fb3711 100644
Binary files a/doc/images/qmldesigner-run-custom-exe.png and b/doc/images/qmldesigner-run-custom-exe.png differ
diff --git a/doc/images/qmldesigner-run-settings.png b/doc/images/qmldesigner-run-settings.png
index f95d7689bfd5ada0e887d4c964d3f3b4ed9063df..20601095931986e463fc609a4f6e77267b75de18 100644
Binary files a/doc/images/qmldesigner-run-settings.png and b/doc/images/qmldesigner-run-settings.png differ
diff --git a/doc/images/qmldesigner-visual-editor.png b/doc/images/qmldesigner-visual-editor.png
index ee60aa353410ce3a6e84d4dc6692c22b447fb01d..0620b51c69c177360b26f6c120e4299b62cabce5 100644
Binary files a/doc/images/qmldesigner-visual-editor.png and b/doc/images/qmldesigner-visual-editor.png differ
diff --git a/doc/images/qt-simulator.png b/doc/images/qt-simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..94f2906481e334204de9984e09b82b55661e8cbd
Binary files /dev/null and b/doc/images/qt-simulator.png differ
diff --git a/doc/images/qtcreator-add-resource-wizard.png b/doc/images/qtcreator-add-resource-wizard.png
index 551a2e5858a0c4733ea48068c914b316617dd933..688f1efae83bf108817a7a0b6bd5ea1ba4f40f10 100644
Binary files a/doc/images/qtcreator-add-resource-wizard.png and b/doc/images/qtcreator-add-resource-wizard.png differ
diff --git a/doc/images/qtcreator-add-resource-wizard2.png b/doc/images/qtcreator-add-resource-wizard2.png
index a4c78756c1c6c2a8d55e5b4751e6f66522cb713c..cef9d6231a7c6bbbaf4c6f05e3d5e30354905f78 100644
Binary files a/doc/images/qtcreator-add-resource-wizard2.png and b/doc/images/qtcreator-add-resource-wizard2.png differ
diff --git a/doc/images/qtcreator-add-resource-wizard3.png b/doc/images/qtcreator-add-resource-wizard3.png
index 4c84bb43b9be3dbf7a3f8ad2b1c07b5fdc01ada0..8f4208b708cb9cbda7fafd929e5caa5e54e4a793 100644
Binary files a/doc/images/qtcreator-add-resource-wizard3.png and b/doc/images/qtcreator-add-resource-wizard3.png differ
diff --git a/doc/images/qtcreator-add-resource.png b/doc/images/qtcreator-add-resource.png
index 728e7eeef59b7d9f6a1b22f23153c034eba41ffb..d0942a3ecf16314e7a59c45b943f3dcd8a137415 100644
Binary files a/doc/images/qtcreator-add-resource.png and b/doc/images/qtcreator-add-resource.png differ
diff --git a/doc/images/qtcreator-application-output.png b/doc/images/qtcreator-application-output.png
index f980c44b63f02a970179e616213a5666e2bd9d77..77e79007faeacd7140161525a679bd9b32b3c3f6 100644
Binary files a/doc/images/qtcreator-application-output.png and b/doc/images/qtcreator-application-output.png differ
diff --git a/doc/images/qtcreator-batteryindicator-screenshot.png b/doc/images/qtcreator-batteryindicator-screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..8447e2be7dbce0563d46b0ee647de07479191041
Binary files /dev/null and b/doc/images/qtcreator-batteryindicator-screenshot.png differ
diff --git a/doc/images/qtcreator-breakdown.png b/doc/images/qtcreator-breakdown.png
index 61ac4100d7103364e3814e4705d2b2c99e52036f..d813528269c1ba76e70cf88d75f76c8c1004c878 100644
Binary files a/doc/images/qtcreator-breakdown.png and b/doc/images/qtcreator-breakdown.png differ
diff --git a/doc/images/qtcreator-class-info.png b/doc/images/qtcreator-class-info.png
index 9791e6c0414482147b97724f41e313711d1bf127..addc5743fd0ccf99bd0a1dca2a47b267b7428c33 100644
Binary files a/doc/images/qtcreator-class-info.png and b/doc/images/qtcreator-class-info.png differ
diff --git a/doc/images/qtcreator-compile-pane.png b/doc/images/qtcreator-compile-pane.png
index 13e15aa909e0f52de954a9c48b8bdafb03f29dc0..18fb8c509d3f864c3b396d422eafd2972797a57c 100644
Binary files a/doc/images/qtcreator-compile-pane.png and b/doc/images/qtcreator-compile-pane.png differ
diff --git a/doc/images/qtcreator-formedit.png b/doc/images/qtcreator-formedit.png
index f1293a5bc3d291d3e51c490e91d5c231fbf3ae68..f42c3656d6f5f78224042985fde988f1f575f741 100644
Binary files a/doc/images/qtcreator-formedit.png and b/doc/images/qtcreator-formedit.png differ
diff --git a/doc/images/qtcreator-gs-build-example-open.png b/doc/images/qtcreator-gs-build-example-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ebdc4d6c7f69367c92f29e24681fafaf81270b4
Binary files /dev/null and b/doc/images/qtcreator-gs-build-example-open.png differ
diff --git a/doc/images/qtcreator-gs-build-example-select-qs.png b/doc/images/qtcreator-gs-build-example-select-qs.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3d7fb5e747e8af2e6a2c1a570fad10b80e1fb65
Binary files /dev/null and b/doc/images/qtcreator-gs-build-example-select-qs.png differ
diff --git a/doc/images/qtcreator-gs-build-example-targets.png b/doc/images/qtcreator-gs-build-example-targets.png
new file mode 100644
index 0000000000000000000000000000000000000000..c039bd03cc11f892c0000e5ed832a7c78bad99b0
Binary files /dev/null and b/doc/images/qtcreator-gs-build-example-targets.png differ
diff --git a/doc/images/qtcreator-help-filters.png b/doc/images/qtcreator-help-filters.png
index 69326b424b79483a7cde715df79eb3bbae0c56eb..1f843bf0252f428a4e87971df8954cb7ca638c9f 100644
Binary files a/doc/images/qtcreator-help-filters.png and b/doc/images/qtcreator-help-filters.png differ
diff --git a/doc/images/qtcreator-intro-and-location.png b/doc/images/qtcreator-intro-and-location.png
index e5118f7a830d8f48f5442389acd17c9d4c06da00..014bba770834359af81abd25d8c358d605f2a6c7 100644
Binary files a/doc/images/qtcreator-intro-and-location.png and b/doc/images/qtcreator-intro-and-location.png differ
diff --git a/doc/images/qtcreator-maemo-deb-package.png b/doc/images/qtcreator-maemo-deb-package.png
new file mode 100644
index 0000000000000000000000000000000000000000..11beaa83687a7faf5f3e9155ab9ccf1cacd519f9
Binary files /dev/null and b/doc/images/qtcreator-maemo-deb-package.png differ
diff --git a/doc/images/qtcreator-maemo-emulator-connection-key.png b/doc/images/qtcreator-maemo-emulator-connection-key.png
index 93f40c51e4e87937122ae24355b021c85aaff2b3..78b96052afa9f3e27bc3a6c0bd8e5705c122ea81 100644
Binary files a/doc/images/qtcreator-maemo-emulator-connection-key.png and b/doc/images/qtcreator-maemo-emulator-connection-key.png differ
diff --git a/doc/images/qtcreator-maemo-emulator-connection.png b/doc/images/qtcreator-maemo-emulator-connection.png
index efb998e10f553e80a84719ac4df62292e7b8e9b6..b441023b5590589af32541d160998968c6b5eebd 100644
Binary files a/doc/images/qtcreator-maemo-emulator-connection.png and b/doc/images/qtcreator-maemo-emulator-connection.png differ
diff --git a/doc/images/qtcreator-mobile-class-info.png b/doc/images/qtcreator-mobile-class-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..25b2b8259f14849724cfcdbd77204f7f88dfc81c
Binary files /dev/null and b/doc/images/qtcreator-mobile-class-info.png differ
diff --git a/doc/images/qtcreator-mobile-intro-and-location.png b/doc/images/qtcreator-mobile-intro-and-location.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ca057b2e1c9def98e2b638f799d834e009077e2
Binary files /dev/null and b/doc/images/qtcreator-mobile-intro-and-location.png differ
diff --git a/doc/images/qtcreator-mobile-project-contents.png b/doc/images/qtcreator-mobile-project-contents.png
new file mode 100644
index 0000000000000000000000000000000000000000..a41ef63dc3710370ee17f70cbdb70d6760bd6ce6
Binary files /dev/null and b/doc/images/qtcreator-mobile-project-contents.png differ
diff --git a/doc/images/qtcreator-mobile-project-qt-versions.png b/doc/images/qtcreator-mobile-project-qt-versions.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7593b2f2a992291aa20411b49a438506743363c
Binary files /dev/null and b/doc/images/qtcreator-mobile-project-qt-versions.png differ
diff --git a/doc/images/qtcreator-mobile-project-summary.png b/doc/images/qtcreator-mobile-project-summary.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f2a1b5a89a75548f1a2594afb92272eb37ff3d
Binary files /dev/null and b/doc/images/qtcreator-mobile-project-summary.png differ
diff --git a/doc/images/qtcreator-mobile-project-widgets.png b/doc/images/qtcreator-mobile-project-widgets.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdd61eb0f04bf64d7a5a6edeb5da522b7b9a8a2a
Binary files /dev/null and b/doc/images/qtcreator-mobile-project-widgets.png differ
diff --git a/doc/images/qtcreator-mobile-simulated.png b/doc/images/qtcreator-mobile-simulated.png
new file mode 100644
index 0000000000000000000000000000000000000000..a498fdc937557cbafdad3449b665f447324dface
Binary files /dev/null and b/doc/images/qtcreator-mobile-simulated.png differ
diff --git a/doc/images/qtcreator-new-mobile-project.png b/doc/images/qtcreator-new-mobile-project.png
new file mode 100644
index 0000000000000000000000000000000000000000..adc657cd9e706f1ae49c3351af9e3e1f0151bb70
Binary files /dev/null and b/doc/images/qtcreator-new-mobile-project.png differ
diff --git a/doc/images/qtcreator-new-project-qt-versions.png b/doc/images/qtcreator-new-project-qt-versions.png
index d6007f74fd7b002b74fe43b01cdb616820ee5bf7..48ef70b91d2733e64023ed8790b70fc94744272a 100644
Binary files a/doc/images/qtcreator-new-project-qt-versions.png and b/doc/images/qtcreator-new-project-qt-versions.png differ
diff --git a/doc/images/qtcreator-new-project-summary.png b/doc/images/qtcreator-new-project-summary.png
index d8ace9f3c1cab28370ace3fe9bda6dd64c410ecb..2b99727ebb88093ed39de57b7739b60999b77672 100644
Binary files a/doc/images/qtcreator-new-project-summary.png and b/doc/images/qtcreator-new-project-summary.png differ
diff --git a/doc/images/qtcreator-new-project.png b/doc/images/qtcreator-new-project.png
index ca465974bd2186613851228b5ada79c01e8b02cc..54c74efac0e920016552aa17c0bd8c538e9e8262 100644
Binary files a/doc/images/qtcreator-new-project.png and b/doc/images/qtcreator-new-project.png differ
diff --git a/doc/images/qtcreator-pprunsettings.png b/doc/images/qtcreator-pprunsettings.png
index b68b45656a2b2a96e8350bf0a1aee525e0e8af09..9e09b0e4438c3342a6d4c7a14e235615bcc35765 100644
Binary files a/doc/images/qtcreator-pprunsettings.png and b/doc/images/qtcreator-pprunsettings.png differ
diff --git a/doc/images/qtcreator-run.png b/doc/images/qtcreator-run.png
index ff8ff15b90351d1f3578dd0be07766863fabcd8c..a4c24365dea57eacabad10d17c489800082b9b18 100644
Binary files a/doc/images/qtcreator-run.png and b/doc/images/qtcreator-run.png differ
diff --git a/doc/images/qtcreator-screenshot-build-settings.png b/doc/images/qtcreator-screenshot-build-settings.png
index fbabf6c0b09a965518c1c75298b5ab92573ce3c6..16fa3bfba4bef2727e0cf18032861e1b37c8f28c 100644
Binary files a/doc/images/qtcreator-screenshot-build-settings.png and b/doc/images/qtcreator-screenshot-build-settings.png differ
diff --git a/doc/images/qtcreator-screenshot-devconf.png b/doc/images/qtcreator-screenshot-devconf.png
index 768438b535216b880bfc9d22ee088314a56fe726..4410e3f51c43bc4eb806212f9b3d6e4fd0aedf91 100644
Binary files a/doc/images/qtcreator-screenshot-devconf.png and b/doc/images/qtcreator-screenshot-devconf.png differ
diff --git a/doc/images/qtcreator-screenshot-run-settings.png b/doc/images/qtcreator-screenshot-run-settings.png
index eb42afed05fcc025da3c09a58bdf563bfe1b6494..d398f274a2833085ed6782bc181cbfccf2bc4d62 100644
Binary files a/doc/images/qtcreator-screenshot-run-settings.png and b/doc/images/qtcreator-screenshot-run-settings.png differ
diff --git a/doc/images/qtcreator-screenshot-toolchain.png b/doc/images/qtcreator-screenshot-toolchain.png
index 29ccac0e356462b5dd6bc10d5feb337efab2ecb1..58a481b5bc93f5fe7ba1c1479e42a0853481e688 100644
Binary files a/doc/images/qtcreator-screenshot-toolchain.png and b/doc/images/qtcreator-screenshot-toolchain.png differ
diff --git a/doc/images/qtcreator-symbian-run-settings.png b/doc/images/qtcreator-symbian-run-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..49ecdb821f8a98e0daa74cbd75eb122e6ead48e8
Binary files /dev/null and b/doc/images/qtcreator-symbian-run-settings.png differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 694d55f277684fe2de73c69ddb79ee794c5f2f2f..5c7f9b41e0eed924313b71f8830456de2fa89dce 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -46,7 +46,9 @@
\o \l{Quick Tour}
\o \l{Getting Started}
\list
+ \o \l{Building and Running an Example Application}
\o \l{Creating a Qt C++ Application}
+ \o \l{Creating a Mobile Application with Nokia Qt SDK}
\o \l{Creating a Qt Quick Application}
\endlist
\o \l{Using the Editor}
@@ -138,7 +140,7 @@
phones, media players, set-top boxes, and netbooks.
\QMLD allows you to easily develop animations by using a declarative programming
- language called \l {http://qt.nokia.com/doc/4.7-snapshot/declarativeui.html}{QML}.
+ language called \l {http://doc.qt.nokia.com/4.7-snapshot/declarativeui.html}{QML}.
In QML, a user interface is specified as a tree of objects with properties.
You use a visual editor to create items, screens, and applications, as well as define changes
@@ -573,7 +575,7 @@
\endlist
For more information on \QD, see
- \l{http://doc.trolltech.com/designer-manual.html}{Qt Designer Manual}.
+ \l{http://doc.qt.nokia.com/4.7-snapshot/designer-manual.html}{Qt Designer Manual}.
\section1 Using Qt Quick Designer
@@ -1846,7 +1848,7 @@
To add an external library:
\list 1
\o Open your project file (.pro) using the \gui Projects pane.
- \o Follow the instructions at \l{http://doc.trolltech.com/latest/qmake-project-files.html#declaring-other-libraries}
+ \o Follow the instructions at \l{http://doc.qt.nokia.com/4.7-snapshot/qmake-project-files.html#declaring-other-libraries}
{Declaring other Libraries}.
\endlist
@@ -1875,7 +1877,7 @@
\section1 Setting Up a Project
To view and modify the settings for currently open projects, switch to the
- \gui Projects mode by pressing \key Ctrl+4.
+ \gui Projects mode by pressing \key Ctrl+5.
\image qtcreator-projectpane.png
@@ -1944,9 +1946,7 @@
\o Build and run the application for \l{Using the Maemo Emulator}{Maemo Emulator}.
- \note The Maemo emulator support requires the Nokia Nokia N900 PR1.2 update.
-
- \o If no problems are found, build and run the application for a device:
+ \o Alternatively, you can build and run the application for a device:
\list 1
@@ -1972,6 +1972,22 @@
Debugging also works transparently.
+ \section2 Creating Installation Packages
+
+ When you build the application for the \gui{Maemo} target, Qt
+ Creator automatically generates a debian installation package
+ in the project folder. You can deliver the installation package to
+ users for installation on Maemo devices.
+
+ You can add other files to the installation package in the
+ \gui {Create package} step in the build configuration. Add files
+ to the \gui {Package contents} field. In \gui {Local File Path},
+ specify the location of the file on the development PC. In
+ \gui {Remote File Path}, specify the folder to install the file on
+ the device.
+
+ \image qtcreator-maemo-deb-package.png "Create installation package"
+
\section1 Building for Symbian
@@ -1999,14 +2015,12 @@
\l{Setting Up Development Environment for Symbian}.
\o Connect the device to the development PC through a USB cable.
- Qt Creator shows the current connection state
- of a device in its main toolbar, showing a red cross when no device is
- connected, or a green check mark when a device is connected.
+ The target selector displays a green check mark when a
+ device is connected.
- \image qtcreator-qt4-symbian-device-notconnected.png
\image qtcreator-qt4-symbian-device-connected.png
- The tool tip of the target button shows more details about the actual
+ The tool tip of the target selector shows more details about the actual
device that will be used when you run your application.
\o Start the \gui{App TRK} application on your device.
@@ -2262,11 +2276,58 @@
\section1 Specifying Run Settings for qmake Projects
The run configurations for qmake projects derive their executable from the parsed .pro
- files. You can also create custom executable run configurations where you
- can set the executable to be run.
+ files.
+
+ \section2 Specifying Run Settings for Desktop Targets
+
+ You can specify command line arguments to be passed to the executable
+ and the working directory to use. The working directory defaults to
+ the directory of the build result.
+
+ For console applications, check the \gui{Run in Terminal} check box.
+ If you need to run with special environment variables set up, you
+ also do it in the run configuration settings.
\image qtcreator-pprunsettings.png
+ You can also create custom executable run configurations where you
+ can set the executable to be run. For more information, see
+ \l{Specifying a Custom Executable to Run}.
+
+ \section2 Specifying Run Settings for Symbian Devices
+
+ Qt Creator automatically detects Symbian devices that are connected to
+ the development PC with an USB cable.
+ If only one device is detected, the application is deployed
+ and run on it. If multiple devices are connected to the PC,
+ make sure that the correct device is selected in the
+ \gui {Symbian Device} run settings for your project.
+
+ You can also pass command line arguments to your application on the device.
+ Press the \gui{Device info button} to get more information about the selected
+ device, such as the CPU type and the running TRK version.
+
+ \image qtcreator-symbian-run-settings.png "Run settings for Symbian devices"
+
+ \section2 Specifying Run Settings for Maemo Devices
+
+ To run an application on a Maemo device, create and select
+ a device configuration in the Maemo run settings for your project.
+ You can also pass command line arguments to your application.
+
+ \image qtcreator-screenshot-run-settings.png "Run settings for Maemo devices"
+
+ \section1 Specifying a Custom Executable to Run
+
+ If you use cmake or the generic project type in Qt Creator, or want
+ to run a custom desktop executable, create a \gui {Custom Executable}
+ run configuration for your project.
+
+ Specify the executable to run, command line arguments, working directory,
+ and environment variables to use.
+
+ \image qmldesigner-run-custom-exe.png "Run settings for custom executables"
+
\section1 Specifying Run Settings for Qt Quick Projects
Select run settings in the \gui {Run configuration} field. The settings
@@ -2292,11 +2353,6 @@
\image qmldesigner-run-settings.png "Run settings for Qt Quick projects"
- To set the executable to run, select \gui {Custom Executable} in the
- \gui {Run configuration} field.
-
- \image qmldesigner-run-custom-exe.png "Run settings for custom executables"
-
*/
@@ -2348,15 +2404,18 @@
\contentspage index.html
\previouspage creator-quick-tour.html
\page creator-getting-started.html
- \nextpage creator-writing-program.html
+ \nextpage creator-build-example-application.html
\title Getting Started
This section contains examples that illustrate how to use Qt Creator and the
- integrated design tools, \QD and \QMLD, to create simple applications:
+ integrated design tools, \QD and \QMLD, to create, build, and run simple
+ applications:
\list
+ \o \l{Building and Running an Example Application}
\o \l{Creating a Qt C++ Application}
+ \o \l{Creating a Mobile Application with Nokia Qt SDK}
\o \l{Creating a Qt Quick Application}
\endlist
@@ -2366,14 +2425,322 @@
/*!
\contentspage index.html
\previouspage creator-writing-program.html
+ \page creator-mobile-example.html
+ \nextpage creator-qml-application.html
+
+ \title Creating a Mobile Application with Nokia Qt SDK
+
+ \note To complete this tutorial, you must install Nokia Qt SDK.
+ The installation program installs and configures the necessary tool chains
+ for mobile application development.
+
+ This tutorial describes how to use Qt Creator to create a small Qt
+ application, Battery Indicator, that uses the System Information
+ Mobility API to fetch battery information from the device.
+
+ \image qtcreator-batteryindicator-screenshot.png
+
+ \section1 Creating the Battery Indicator Project
+
+ \note Create the project with the \gui{Help} mode active so that you can follow
+ these instructions while you work.
+
+ \list 1
+
+ \o Select \gui{File > New File or Project > Qt Application Project > Mobile Qt
+ Application > Choose}.
+
+ \image qtcreator-new-mobile-project.png "New File or Project dialog"
+
+ The \gui{Introduction and Project Location} dialog opens.
+
+ \image qtcreator-mobile-intro-and-location.png "Introduction and Project Location dialog"
+
+ \o In the \gui{Name} field, type \bold {BatteryIndicator}.
+
+ \o In the \gui {Create in} field, enter the path for the project files. For example,
+ \c {C:\Qt\examples}, and then click \gui{Next}.
+
+ The \gui{Select Required Qt Versions} dialog opens.
+
+ \image qtcreator-mobile-project-qt-versions.png "Select Required Qt Versions dialog"
+
+ \o Select \gui Maemo, \gui {Qt Simulator}, and \gui {Symbian Device} targets,
+ and click \gui{Next}.
+
+ \note Targets are listed if you installed the appropriate development
+ environment, for example, as part of the Nokia Qt SDK.
+
+ The \gui{Class Information} dialog opens.
+
+ \image qtcreator-mobile-class-info.png "Class Information dialog"
+
+ \o In the \gui{Class Name} field, type \bold {BatteryIndicator} as the class name.
+
+ \o In the \gui{Base Class} list, select \bold {QDialog} as the base class type.
+
+ \note The \gui{Header File}, \gui{Source File} and \gui{Form File} fields are
+ automatically updated to match the name of the class.
+
+ \o Click \gui{Next}.
+
+ The \gui{Project Management} dialog opens.
+
+ \image qtcreator-mobile-project-summary.png "Project Management dialog"
+
+ \o Review the project settings, and click \gui{Finish} to create the project.
+
+ \endlist
+
+ The BatteryIndicator project now contains the following files:
+
+ \list
+
+ \o batteryindicator.h
+ \o batteryindicator.cpp
+ \o main.cpp
+ \o batteryindicator.ui
+ \o BatteryIndicator.pro
+
+ \endlist
+
+ \image qtcreator-mobile-project-contents.png "Project contents"
+
+ The files come with the necessary boiler plate code that you must
+ modify, as described in the following sections. You do not need
+ to change the main.cpp file.
+
+ \section1 Declaring the Qt Mobility API
+
+ The \gui New wizard automatically adds information to the .pro file
+ that you need when you use the Qt Mobility APIs or develop applications
+ for Symbian devices. You must modify the information to declare the
+ Qt Mobility APIs that you use.
+
+ This example uses the System Info API, so you must declare it, as
+ illustrated by the following code snippet:
+
+ \code
+
+ CONFIG += mobility
+ MOBILITY = systeminfo
+
+ \endcode
+
+ Each Mobility API has its corresponding value that you have to add
+ as a value of MOBILITY to use the API. For a list of the APIs and the
+ corresponding values that you can assign to MOBILITY, see the
+ \l {http://doc.qt.nokia.com/qtmobility-1.0/quickstart.html}{Quickstart Example}.
+
+ The following code snippet shows information that is needed for
+ applications developed for Symbian device. Qt Creator generated
+ the UID for testing the application on a device. You only need
+ to change the UID and capabilities if you deliver the application
+ for public use and need to have it Symbian Signed.
+
+ \code
+
+ symbian {
+ TARGET.UID3 = 0xecbd72d7
+ # TARGET.CAPABILITY +=
+ TARGET.EPOCSTACKSIZE = 0x14000
+ TARGET.EPOCHEAPSIZE = 0x020000 0x800000
+ }
+
+ \endcode
+
+ \section1 Designing the User Interface
+
+ \list 1
+
+ \o In the \gui{Editor} mode, double-click the batteryindicator.ui
+ file in the \gui{Projects} view to launch the integrated \QD.
+
+ \o Drag and drop a \gui{Progress Bar} (\l{http://doc.qt.nokia.com/4.7-snapshot/qprogressbar.html}{QProgressBar})
+ widget to the form.
+
+ \image qtcreator-mobile-project-widgets.png "Adding widgets to the UI"
+
+ \o In the \gui Properties pane, change the \gui objectName to
+ \bold batteryLevelBar.
+
+ \endlist
+
+ \section1 Completing the Header File
+
+ The batteryindicator.h file contains some of the necessary #includes, a
+ constructor, a destructor, and the \c{Ui} object. You must include
+ the System Info header file, add a shortcut to the mobility name
+ space, and add a private function to update the battery level value in
+ the indicator when the battery power level changes.
+
+ \list 1
+
+ \o In the \gui{Projects} view, double-click the \c{batteryindicator.h} file
+ to open it for editing.
+
+ \o Include the System Info header file, as illustrated by the following
+ code snippet:
+
+ \snippet examples/batteryindicator/batteryindicator.h 1
+
+ \o Add a shortcut to the mobility name space, as illustrated by the
+ following code snippet:
+
+ \snippet examples/batteryindicator/batteryindicator.h 2
+
+ \o Declare a private function in the \c{private} section, after the
+ \c{Ui::BatteryIndicator} function, as illustrated by the following code
+ snippet:
+
+ \snippet examples/batteryindicator/batteryindicator.h 3
+
+ \endlist
+
+ \section1 Completing the Source File
+
+ Now that the header file is complete, move on to the source file,
+ batteryindicator.cpp.
+
+ \list 1
+
+ \o In the \gui{Projects} view, double-click the batteryindicator.cpp file
+ to open it for editing.
+
+ \o Create a QSystemDeviceInfo object and set its value. Then connect the signal
+ that indicates that battery level changed to the \c setValue
+ slot of the progress bar. This is illustrated by the following code snippet:
+
+ \snippet examples/batteryindicator/batteryindicator.cpp 1
+
+ \o Use the constructor to set initial values and make sure that the
+ created object is in a defined state, as illustrated by the following
+ code snippet:
+
+ \snippet examples/batteryindicator/batteryindicator.cpp 2
+
+ \endlist
+
+ \section1 Compiling and Running Your Program
+
+ Now that you have all the necessary code, select \gui {Qt Simulator}
+ as the target and click the
+ \inlineimage qtcreator-run.png
+ button to build your program and run it in the Qt Simulator.
+
+ In Qt Simulator, run the runOutOfBattery.qs example script
+ to see the value change in the Battery Indicator application.
+ Select \gui {Scripting > examples > runOutOfBattery.qs > Run}.
+
+ \image qtcreator-mobile-simulated.png "Mobile example in Qt Simulator"
+
+ \section1 Testing on a Symbian Device
+
+ You also need to test the application on real devices. Before you can
+ start testing on Symbian devices, you must connect them to the development
+ PC by using an USB cable and install the necessary software on them.
+
+ \list 1
+
+ \o Install Qt 4.6.2 libraries, the Qt mobile libraries, and the TRK
+ debugging application on the device. For more information,
+ see \l{Setting Up Development Environment for Symbian}.
+
+ \o Start TRK on the device.
+
+ \o Click the \gui {Target Selector} and select \gui {Symbian Device}.
+
+ \o Click \gui Run to build the application for the Symbian device.
+
+ \endlist
+
+ \section1 Testing on the Maemo Emulator
+
+ The Maemo emulator emulates the Nokia N900 device environment. You can test
+ applications in conditions practically identical to running the application
+ on a Nokia N900 device with the software update release 1.2 (V10.2010.19-1).
+
+ For more information, see \l{Using the Maemo Emulator}.
+
+*/
+
+/*!
+ \contentspage index.html
+ \previouspage creator-getting-started.html
+ \page creator-build-example-application.html
+ \nextpage creator-writing-program.html
+
+ \title Building and Running an Example Application
+
+ You can test that your installation is successful by opening an existing
+ example application project.
+
+ \list 1
+
+ \o On the \gui Welcome page, select \gui {Choose an example... >
+ Animation Framework > Animated Tiles}.
+
+ \image qtcreator-gs-build-example-open.png "Selecting an example"
+
+ \o Select targets for the project. Select at least Qt Simulator
+ and one of the mobile targets, Maemo or Symbian Device, depending on
+ the device you develop for.
+
+ \image qtcreator-gs-build-example-targets.png "Selecting targets"
+
+ \note You can add targets later in the \gui Projects mode.
+
+ \o To test the application in Qt Simulator, click the \gui {Target
+ Selector} and select \gui {Qt Simulator}.
+
+ \image {qtcreator-gs-build-example-select-qs.png} "Selecting Qt Simulator as target"
+
+ \o Click
+ \inlineimage{qtcreator-run.png}
+ to build the application for Qt Simulator.
+
+ \o To see the compilation progress, press \key{Alt+4} to open the
+ \gui Compile Output pane.
+
+ The gui Build progress bar on the toolbar turns green when the project
+ is successfully built. The application opens in Qt Simulator.
+
+ \image {qt-simulator.png} "Qt Simulator"
+
+ \o Change the settings in the
+ \gui View pane, for example, to toggle the orientation by clicking
+ \gui {Rotate Device}, or choose from the various Symbian and Maemo
+ configurations by clicking \gui {Device}. You can also simulate various
+ mobile functions and create your own scripts.
+
+ \o To test the application on a Symbian device install Qt 4.6.2
+ and the TRK debugging application on the device. For more information,
+ see \l{Setting Up Development Environment for Symbian}.
+
+ \o Click the \gui {Target Selector} and select \gui {Symbian Device}.
+
+ \o Click \gui Run to build the application for the Symbian device.
+
+ \endlist
+
+*/
+
+
+/*!
+ \contentspage index.html
+ \previouspage creator-mobile-example.html
\page creator-qml-application.html
\nextpage creator-editor-using.html
\title Creating a Qt Quick Application
- \note This tutorial assumes that you are familiar with the \l {http://qt.nokia.com/doc/4.7-snapshot/declarativeui.html}
+ \note This tutorial assumes that you are familiar with the \l {http://doc.qt.nokia.com/4.7-snapshot/declarativeui.html}
{QML declarative language}.
+ \note The Qt Quick specific features and the QDeclarative help are based on a
+ preview version of the QtDeclarative package. Update Qt Creator when Qt 4.7 is
+ released.
+
This tutorial describes how to use Qt Creator to create a small animated
Qt Quick application, Hello World.
@@ -2386,7 +2753,7 @@
\list 1
- \o Select \gui{File > New File or Project > Qt Quick Project > Qt QML Application > OK}.
+ \o Select \gui{File > New File or Project > Qt Quick Project > Qt QML Application > Choose}.
\image qmldesigner-new-project.png "New File or Project dialog"
@@ -2553,9 +2920,9 @@
/*!
\contentspage index.html
- \previouspage creator-getting-started.html
+ \previouspage creator-build-example-application.html
\page creator-writing-program.html
- \nextpage creator-qml-application.html
+ \nextpage creator-mobile-example.html
\title Creating a Qt C++ Application
@@ -2565,7 +2932,7 @@
This tutorial describes how to use Qt Creator
to create a small Qt application, Text Finder. It is a simplified version of the
- QtUiTools \l{http://doc.trolltech.com/uitools-textfinder.html}{Text Finder}
+ QtUiTools \l{http://doc.qt.nokia.com/4.7-snapshot/uitools-textfinder.html}{Text Finder}
example.
\image qtcreator-textfinder-screenshot.png
@@ -2584,7 +2951,7 @@
\list 1
\o Select \gui{File > New File or Project > Qt Application Project > Qt Gui
- Application > OK}.
+ Application > Choose}.
\image qtcreator-new-project.png "New File or Project dialog"
@@ -2661,9 +3028,9 @@
\o Drag and drop the following widgets to the form:
\list
- \o \gui{Label} (\l{http://doc.trolltech.com/qlabel.html}{QLabel})
- \o \gui{Line Edit} (\l{http://doc.trolltech.com/qlineedit.html}{QLineEdit})
- \o \gui{Push Button} (\l{http://doc.trolltech.com/qpushbutton.html}{QPushButton})
+ \o \gui{Label} (\l{http://doc.qt.nokia.com/4.7-snapshot/qlabel.html}{QLabel})
+ \o \gui{Line Edit} (\l{http://doc.qt.nokia.com/4.7-snapshot/qlineedit.html}{QLineEdit})
+ \o \gui{Push Button} (\l{http://doc.qt.nokia.com/4.7-snapshot/qpushbutton.html}{QPushButton})
\endlist
@@ -2679,15 +3046,15 @@
\o Press \key {Ctrl+A} to select the widgets and click \gui{Lay out Horizontally}
(or press \gui{Ctrl+H}) to apply a horizontal layout
- (\l{http://doc.trolltech.com/qhboxlayout.html}{QHBoxLayout}).
+ (\l{http://doc.qt.nokia.com/4.7-snapshot/qhboxlayout.html}{QHBoxLayout}).
\image qtcreator-texfinder-ui-horizontal-layout.png "Applying horizontal layout"
- \o Drag and drop a \gui{Text Edit} widget (\l{http://doc.trolltech.com/qtextedit.html}{QTextEdit})
+ \o Drag and drop a \gui{Text Edit} widget (\l{http://doc.qt.nokia.com/4.7-snapshot/qtextedit.html}{QTextEdit})
to the form.
\o Select the screen area and click \gui{Lay out Vertically} (or press \gui{Ctr+V})
- to apply a vertical layout (\l{http://doc.trolltech.com/qvboxlayout.html}{QVBoxLayout}).
+ to apply a vertical layout (\l{http://doc.qt.nokia.com/4.7-snapshot/qvboxlayout.html}{QVBoxLayout}).
\image qtcreator-textfinder-ui.png "Text Finder UI"
@@ -2715,7 +3082,7 @@
\endlist
For more information about designing forms with \QD, see the
- \l{http://doc.trolltech.com/designer-manual.html}{Qt Designer Manual}.
+ \l{http://doc.qt.nokia.com/4.7-snapshot/designer-manual.html}{Qt Designer Manual}.
\section2 Completing the Header File
@@ -2723,7 +3090,7 @@
constructor, a destructor, and the \c{Ui} object. You need to add a private
function, \c{loadTextFile()}, to read and display the
contents of the input text file in the
- \l{http://doc.trolltech.com/qtextedit.html}{QTextEdit}.
+ \l{http://doc.qt.nokia.com/4.7-snapshot/qtextedit.html}{QTextEdit}.
\list 1
@@ -2749,22 +3116,22 @@
to open it for editing.
\o Add code to load a text file using
- \l{http://doc.trolltech.com/qfile.html}{QFile}, read it with
- \l{http://doc.trolltech.com/qtextstream.html}{QTextStream}, and
+ \l{http://doc.qt.nokia.com/4.7-snapshot/qfile.html}{QFile}, read it with
+ \l{http://doc.qt.nokia.com/4.7-snapshot/qtextstream.html}{QTextStream}, and
then display it on \c{textEdit} with
- \l{http://doc.trolltech.com/qtextedit.html#plainText-prop}{setPlainText()}.
+ \l{http://doc.qt.nokia.com/4.7-snapshot/qtextedit.html#plainText-prop}{setPlainText()}.
This is illustrated by the following code snippet:
\snippet examples/textfinder/textfinder.cpp 0
- \o To use \l{http://doc.trolltech.com/qfile.html}{QFile} and
- \l{http://doc.trolltech.com/qtextstream.html}{QTextStream}, add the
+ \o To use \l{http://doc.qt.nokia.com/4.7-snapshot/qfile.html}{QFile} and
+ \l{http://doc.qt.nokia.com/4.7-snapshot/qtextstream.html}{QTextStream}, add the
following #includes to textfinder.cpp:
\snippet examples/textfinder/textfinder.cpp 1
\o For the \c{on_findButton_clicked()} slot, add code to extract the search string and
- use the \l{http://doc.trolltech.com/qtextedit.html#find}{find()} function
+ use the \l{http://doc.qt.nokia.com/4.7-snapshot/qtextedit.html#find}{find()} function
to look for the search string within the text file. This is illustrated by
the following code snippet:
@@ -2793,7 +3160,7 @@
To add a resource file:
\list 1
- \o Select \gui{File > New File or Project > Qt > Qt Resource File > OK}.
+ \o Select \gui{File > New File or Project > Qt > Qt Resource File > Choose}.
\image qtcreator-add-resource-wizard.png "New File or Project dialog"
The \gui {Choose the Location} dialog opens.
@@ -3220,7 +3587,7 @@
\key Space. The prefix is usually a single character.
For example, to locate symbols matching
- \l{http://doc.trolltech.com/qdatastream.html}{QDataStream:}
+ \l{http://doc.qt.nokia.com/4.7-snapshot/qdatastream.html}{QDataStream:}
\list 1
\o Activate the locator.
\o Enter \tt{\bold{: QDataStream}} (: (colon) followed by a
@@ -4223,7 +4590,7 @@
\list 1
\o Click in between the line number and the window border on the line
- where we invoke \l{http://doc.trolltech.com/qtextedit.html#plainText-prop}{setPlainText()}
+ where we invoke \l{http://doc.qt.nokia.com/4.7-snapshot/qtextedit.html#plainText-prop}{setPlainText()}
to set a breakpoint.
\image qtcreator-setting-breakpoint1.png
@@ -4797,9 +5164,13 @@
You can either create Qt Quick projects from scratch or import them to
Qt Creator. For example, you can import and run the
- \l {http://qt.nokia.com/doc/4.7-snapshot/qdeclarativeexamples.html} {QML examples and demos}
+ \l {http://doc.qt.nokia.com/4.7-snapshot/qdeclarativeexamples.html} {QML examples and demos}
to learn how to use various aspects of QML.
+ \note The Qt Quick specific features and the QDeclarative help are based on a
+ preview version of the QtDeclarative package. Update Qt Creator when Qt 4.7 is
+ released.
+
You can use the code editor (\gui Edit mode) or the visual editor
(\gui Design mode) to develop Qt Quick applications.
@@ -4829,7 +5200,7 @@
\endlist
The \c import statement in the beginning of the .qml file specifies the
- \l {http://qt.nokia.com/doc/4.7-snapshot/qdeclarativemodules.html} {Qt modules}
+ \l {http://doc.qt.nokia.com/4.7-snapshot/qdeclarativemodules.html} {Qt modules}
to import to \QMLD. Each Qt module contains a set of default elements.
Specify a version to get the features you want.
@@ -4855,22 +5226,22 @@
\list
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-borderimage.html}{Border Image}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-borderimage.html}{Border Image}
uses an image as a border or background.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-image.html}{Image}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-image.html}{Image}
adds a bitmap to the scene. You can stretch and tile images.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-item.html}{Item}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-item.html}{Item}
is the most basic of all visual items in QML. Even though it has no visual appearance,
it defines all the properties that are common across visual items, such as the x and
y position, width and height, anchoring, and key handling.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-rectangle.html}{Rectangle}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-rectangle.html}{Rectangle}
adds a rectangle that is painted with a solid fill color and an optional border.
You can also use the radius property to create rounded rectangles.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-text.html}{Text}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-text.html}{Text}
adds formatted read-only text.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-textedit.html}{Text Edit}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-textedit.html}{Text Edit}
adds a single line of editable formatted text that can be validated.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-textinput.html}{Text Input}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-textinput.html}{Text Input}
adds a single line of editable plain text that can be validated.
\endlist
@@ -4941,12 +5312,12 @@
\endlist
To create a graphical button that scales beautifully without using vector graphics,
- use the \l{http://qt.nokia.com/doc/4.7-snapshot/qml-borderimage.html}{Border Image}
+ use the \l{http://doc.qt.nokia.com/4.7-snapshot/qml-borderimage.html}{Border Image}
element.
\section3 Creating Scalable Buttons and Borders
- You can use the \l{http://qt.nokia.com/doc/4.7-snapshot/qml-borderimage.html}{Border Image}
+ You can use the \l{http://doc.qt.nokia.com/4.7-snapshot/qml-borderimage.html}{Border Image}
element to display an image, such as a PNG file, as a border and a background.
Use two Border Image elements and suitable graphics to make it look like the button
@@ -5100,13 +5471,13 @@
You can use the \gui Library items and your own components to create screens.
You can create the following types of views to organize items provided by
- \l{http://qt.nokia.com/doc/4.7-snapshot/qdeclarativemodels.html}{data models}:
+ \l{http://doc.qt.nokia.com/4.7-snapshot/qdeclarativemodels.html}{data models}:
\list
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-gridview.html}{Grid View}
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-listview.html}{List View}
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-pathview.html}{Path View}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-gridview.html}{Grid View}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-listview.html}{List View}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-pathview.html}{Path View}
\endlist
@@ -5247,7 +5618,7 @@
You can use different types of animated transitions. For example, you can animate changes
to property values and colors. You can use rotation animation to control the direction of
rotation. For more information, see
- \l{http://doc.trolltech.com/4.7-snapshot/qdeclarativeanimation.html}{QML Animation}.
+ \l{http://doc.qt.nokia.com/4.7-snapshot/qdeclarativeanimation.html}{QML Animation}.
You can use the \c ParallelAnimation element to start several animations at the same time.
Or use the \c SequentialAnimation element to run them one after another.
@@ -5260,14 +5631,14 @@
\list
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-flickable.html}{Flickable}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-flickable.html}{Flickable}
items can be flicked horizontally or vertically.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-flipable.html}{Flipable}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-flipable.html}{Flipable}
items can be flipped between their front and back sides by using rotation,
state, and transition.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-focusscope.html}{Focus Scope}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-focusscope.html}{Focus Scope}
assists in keyboard focus handling when building reusable QML components.
- \o \l{http://qt.nokia.com/doc/4.7-snapshot/qml-mousearea.html}{Mouse Area}
+ \o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-mousearea.html}{Mouse Area}
enables simple mouse handling.
\endlist
@@ -5283,10 +5654,10 @@
A user interface is only a part of an application, and not really useful by itself.
You can use Qt or JavaScript to implement the application logic. For more information on
using JavaScript, see
- \l {http://qt.nokia.com/doc/4.7-snapshot/qdeclarativejavascript.html} {Integrating JavaScript}.
+ \l {http://doc.qt.nokia.com/4.7-snapshot/qdeclarativejavascript.html} {Integrating JavaScript}.
For an example of how to use JavaScript to develop a game, see the
- \l {http://qt.nokia.com/doc/4.7-snapshot/qml-advtutorial.html} {QML Advanced Tutorial}.
+ \l {http://doc.qt.nokia.com/4.7-snapshot/qml-advtutorial.html} {QML Advanced Tutorial}.
*/
@@ -5317,7 +5688,8 @@
To build and run Qt applications for Maemo, you need the following:
\list
- \o Nokia N900 device with PR1.2 or later installed.
+ \o Nokia N900 device with software update release 1.2 (V10.2010.19-1)
+ or later installed.
\o MADDE cross-platform Maemo development
tool (installed as part of the Nokia Qt SDK).
@@ -5335,7 +5707,6 @@
PC_Connectivity_<version>.exe (at the time of writing,
PC_Connectivity_0.9.4.exe).
- \o Qt installed on the device. Recent images should have Qt pre-installed.
\endlist
The Qt Creator/MADDE integration is supported on the following platforms:
@@ -5370,38 +5741,13 @@
\section2 Installing and Configuring Mad Developer
- To install Mad Developer on your device, you need to add an application
- catalogue to the list of catalogues your device checks for
- installable software, and install the actual Mad Developer software
- package. After the installation, you must start Mad Developer and configure
+ Install Mad Developer on a device and configure
a connection between the development PC and the device.
To install and configure Mad Developer:
\list 1
- \o On the Nokia N900, select \gui {Application manager > Application catalogs
- > New}.
-
- \o Specify the following settings:
-
- \image qtcreator-app-manager-extras-devel-screenshot.png
-
- \list a
-
- \o \gui {Catalogue name}: \bold devel
-
- \o \gui {Web address}:
- \l http://repository.maemo.org/extras-devel
-
- \o \gui Distribution: \bold fremantle
-
- \o \gui Components: \bold {free non-free}
-
- \endlist
-
- \o Click \gui Save to add the catalogue.
-
- \o Select \gui{Download} > \gui{Development} > \gui{mad-developer}
+ \o On the Nokia N900, select \gui{Download} > \gui{Development} > \gui{mad-developer}
to install the Mad Developer software package.
\o Click \gui {Mad Developer} to start the Mad Developer application.
@@ -5537,7 +5883,8 @@
must generate it in Mad Developer and enter it in Qt Creator every time
you connect to the Maemo emulator or to a device.
- If you do not have an SSH key, you can create it in Qt Creator. For more
+ If you do not have an SSH key, you can create it in Qt Creator.
+ Encrypted keys are not supported. For more
information, see \l{Generating SSH Keys}.
To configure connections between Qt Creator and the Maemo emulator or
@@ -5689,11 +6036,10 @@
The Maemo emulator emulates the Nokia N900 device environment. You can test
applications in conditions practically identical to running the application
- on a Nokia N900 device. You can test user interaction by using the keypad and
+ on a Nokia N900 device with software update release 1.2 (V10.2010.19-1).
+ You can test user interaction by using the keypad and
touch emulation.
- \note The Maemo emulator support requires the Nokia N900 PR1.2 update.
-
To test the application UI, user interaction with the application, and
functionality that uses the mobility APIs, use the Qt Simulator,
instead. For more information, see the
@@ -5707,7 +6053,9 @@
\section1 Starting the Maemo Emulator
The \gui {Start Maemo Emulator} button is visible if you have a project
- open in Qt Creator for which you have added the Maemo build target.
+ open in Qt Creator for which you have added the Maemo build target
+ and if you have configured a connection between Qt Creator and the Maemo
+ Emulator.
To start the Maemo emulator:
@@ -5835,12 +6183,41 @@
\o The \l{http://tools.ext.nokia.com/trk/}{App TRK} application for
your device
\o The \e{qt_installer.sis} package installed on the device, that is
- bundled with the binary Qt distribution
+ delivered with the Qt SDK.
\endlist
To run your applications in the Symbian emulator, you also need
to install Carbide.c++ v2.0.0 or higher.
+ \section1 Installing Required Applications on Devices
+
+ The Nokia Qt SDK installation program creates shortcuts for installing
+ the required applications on Symbian devices (you can also use any of
+ the standard methods for installing applications on devices):
+
+ \list 1
+
+ \o Connect the device to the development PC with an USB cable in
+ PC Suite Mode. If you have not previously used the device with Ovi Suite
+ or PC Suite, all the necessary drivers are installed automatically.
+ This takes approximately one minute.
+
+ \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install Qt to Symbian
+ device} and follow the instructions on the screen to install Qt 4.6.2
+ libraries on the device.
+
+ \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install QtMobility to Symbian
+ device} and follow the instructions on the screen to install Qt
+ mobility libraries on the device.
+
+ \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install TRK to Symbian
+ device} and follow the instructions on the screen to install the TRK
+ debugging application for S60 5th Edition devices on the device.
+
+ \o Start TRK on the device.
+
+ \endlist
+
\section1 Adding Symbian Platform SDKs
Nokia Qt SDK contains all the tools you need for developing Qt applications for
@@ -5904,7 +6281,7 @@
change the default plugin path, see \l{How to Create Qt Plugins}.
For more information about how to create plugins for \QD, see
- \l{http://doc.trolltech.com/4.6/designer-using-custom-widgets.html}{Creating and Using Components for Qt Designer}.
+ \l{http://doc.qt.nokia.com/4.7-snapshot/designer-using-custom-widgets.html}{Creating and Using Components for Qt Designer}.
\section1 Locating Qt Designer Plugins
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index d35235368f7ab306033916a3b1ed1926da85cbdf..fae39edb0dfa07b6fc06f24cef83bd5735e0a2a8 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -1214,8 +1214,15 @@ class Dumper:
type = value.type
if type.code == gdb.TYPE_CODE_REF:
- type = type.target()
- value = value.cast(type)
+ try:
+ # This throws "RuntimeError: Attempt to dereference a
+ # generic pointer." with MinGW's gcc 4.5 when it "identifies"
+ # a "QWidget &" as "void &".
+ type = type.target()
+ value = value.cast(type)
+ except RuntimeError:
+ value = item.value
+ type = value.type
if type.code == gdb.TYPE_CODE_TYPEDEF:
type = type.target()
diff --git a/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml b/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
index 6f2f3eea5d122ee70fe9c5dc6a53d125d7e1c88e..3f917c54797861eb0d63098e84e8caf4cc07ae1f 100644
--- a/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
+++ b/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
@@ -1,5 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<module>
+ <type name="QAbstractItemModel" extends="Qt.QtObject">
+ <signal name="dataChanged">
+ <param name="topLeft" type="QModelIndex"/>
+ <param name="bottomRight" type="QModelIndex"/>
+ </signal>
+ <signal name="headerDataChanged">
+ <param name="orientation" type="Qt.Orientation"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="layoutChanged"/>
+ <signal name="layoutAboutToBeChanged"/>
+ <signal name="rowsAboutToBeInserted">
+ <param name="parent" type="QModelIndex"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="rowsInserted">
+ <param name="parent" type="QModelIndex"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="rowsAboutToBeRemoved">
+ <param name="parent" type="QModelIndex"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="rowsRemoved">
+ <param name="parent" type="QModelIndex"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="columnsAboutToBeInserted">
+ <param name="parent" type="QModelIndex"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="columnsInserted">
+ <param name="parent" type="QModelIndex"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="columnsAboutToBeRemoved">
+ <param name="parent" type="QModelIndex"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="columnsRemoved">
+ <param name="parent" type="QModelIndex"/>
+ <param name="first" type="int"/>
+ <param name="last" type="int"/>
+ </signal>
+ <signal name="modelAboutToBeReset"/>
+ <signal name="modelReset"/>
+ <signal name="rowsAboutToBeMoved">
+ <param name="sourceParent" type="QModelIndex"/>
+ <param name="sourceStart" type="int"/>
+ <param name="sourceEnd" type="int"/>
+ <param name="destinationParent" type="QModelIndex"/>
+ <param name="destinationRow" type="int"/>
+ </signal>
+ <signal name="rowsMoved">
+ <param name="parent" type="QModelIndex"/>
+ <param name="start" type="int"/>
+ <param name="end" type="int"/>
+ <param name="destination" type="QModelIndex"/>
+ <param name="row" type="int"/>
+ </signal>
+ <signal name="columnsAboutToBeMoved">
+ <param name="sourceParent" type="QModelIndex"/>
+ <param name="sourceStart" type="int"/>
+ <param name="sourceEnd" type="int"/>
+ <param name="destinationParent" type="QModelIndex"/>
+ <param name="destinationColumn" type="int"/>
+ </signal>
+ <signal name="columnsMoved">
+ <param name="parent" type="QModelIndex"/>
+ <param name="start" type="int"/>
+ <param name="end" type="int"/>
+ <param name="destination" type="QModelIndex"/>
+ <param name="column" type="int"/>
+ </signal>
+ <method name="submit" type="bool"/>
+ <method name="revert"/>
+ </type>
+ <type name="QAbstractListModel" extends="QAbstractItemModel"/>
<type name="QAction" extends="Qt.QtObject">
<enum name="MenuRole">
<enumerator name="NoRole" value="0"/>
@@ -1466,7 +1552,7 @@
<signal name="progressChanged">
<param type="qreal"/>
</signal>
- <method name="errorsString" type="string"/>
+ <method name="errorString" type="string"/>
</type>
<type name="Qt.Connections" version="4.7" extends="Qt.QtObject">
<property name="target" type="Qt.QtObject"/>
@@ -2214,12 +2300,12 @@
<type name="Qt.ParentChange" version="4.7" extends="QDeclarativeStateOperation">
<property name="target" type="Qt.Item"/>
<property name="parent" type="Qt.Item"/>
- <property name="x" type="qreal"/>
- <property name="y" type="qreal"/>
- <property name="width" type="qreal"/>
- <property name="height" type="qreal"/>
- <property name="scale" type="qreal"/>
- <property name="rotation" type="qreal"/>
+ <property name="x" type="QDeclarativeScriptString"/>
+ <property name="y" type="QDeclarativeScriptString"/>
+ <property name="width" type="QDeclarativeScriptString"/>
+ <property name="height" type="QDeclarativeScriptString"/>
+ <property name="scale" type="QDeclarativeScriptString"/>
+ <property name="rotation" type="QDeclarativeScriptString"/>
</type>
<type name="Qt.Path" version="4.7" defaultProperty="pathElements" extends="Qt.QtObject">
<property name="pathElements" type="QDeclarativePathElement" isList="true"/>
@@ -2555,6 +2641,7 @@
<enumerator name="WordWrap" value="1"/>
<enumerator name="WrapAnywhere" value="3"/>
<enumerator name="WrapAtWordBoundaryOrAnywhere" value="4"/>
+ <enumerator name="Wrap" value="4"/>
</enum>
<property name="text" type="string"/>
<property name="font" type="QFont"/>
@@ -2566,6 +2653,8 @@
<property name="wrapMode" type="WrapMode"/>
<property name="textFormat" type="TextFormat"/>
<property name="elide" type="TextElideMode"/>
+ <property name="paintedWidth" type="qreal"/>
+ <property name="paintedHeight" type="qreal"/>
<signal name="textChanged">
<param name="text" type="string"/>
</signal>
@@ -2597,6 +2686,7 @@
<signal name="elideModeChanged">
<param name="mode" type="TextElideMode"/>
</signal>
+ <signal name="paintedSizeChanged"/>
</type>
<type name="Qt.TextEdit" version="4.7" defaultProperty="data" extends="QDeclarativePaintedItem">
<enum name="HAlignment">
@@ -2619,6 +2709,7 @@
<enumerator name="WordWrap" value="1"/>
<enumerator name="WrapAnywhere" value="3"/>
<enumerator name="WrapAtWordBoundaryOrAnywhere" value="4"/>
+ <enumerator name="Wrap" value="4"/>
</enum>
<property name="text" type="string"/>
<property name="color" type="QColor"/>
@@ -2628,22 +2719,29 @@
<property name="horizontalAlignment" type="HAlignment"/>
<property name="verticalAlignment" type="VAlignment"/>
<property name="wrapMode" type="WrapMode"/>
+ <property name="paintedWidth" type="qreal"/>
+ <property name="paintedHeight" type="qreal"/>
<property name="textFormat" type="TextFormat"/>
<property name="readOnly" type="bool"/>
<property name="cursorVisible" type="bool"/>
<property name="cursorPosition" type="int"/>
+ <property name="cursorRectangle" type="QRect"/>
<property name="cursorDelegate" type="Qt.Component"/>
<property name="selectionStart" type="int"/>
<property name="selectionEnd" type="int"/>
<property name="selectedText" type="string"/>
<property name="focusOnPress" type="bool"/>
+ <property name="showInputPanelOnFocus" type="bool"/>
<property name="persistentSelection" type="bool"/>
<property name="textMargin" type="qreal"/>
<property name="inputMethodHints" type="Qt.InputMethodHints"/>
+ <property name="selectByMouse" type="bool"/>
<signal name="textChanged">
<param type="string"/>
</signal>
+ <signal name="paintedSizeChanged"/>
<signal name="cursorPositionChanged"/>
+ <signal name="cursorRectangleChanged"/>
<signal name="selectionStartChanged"/>
<signal name="selectionEndChanged"/>
<signal name="selectionChanged"/>
@@ -2685,7 +2783,15 @@
<signal name="textMarginChanged">
<param name="textMargin" type="qreal"/>
</signal>
+ <signal name="selectByMouseChanged">
+ <param name="selectByMouse" type="bool"/>
+ </signal>
+ <signal name="showInputPanelOnFocusChanged">
+ <param name="showOnFocus" type="bool"/>
+ </signal>
<method name="selectAll"/>
+ <method name="openSoftwareInputPanel"/>
+ <method name="closeSoftwareInputPanel"/>
</type>
<type name="Qt.TextInput" version="4.7" defaultProperty="data" extends="QDeclarativePaintedItem">
<enum name="EchoMode">
@@ -2720,9 +2826,11 @@
<property name="acceptableInput" type="bool"/>
<property name="echoMode" type="EchoMode"/>
<property name="focusOnPress" type="bool"/>
+ <property name="showInputPanelOnFocus" type="bool"/>
<property name="passwordCharacter" type="string"/>
<property name="displayText" type="string"/>
<property name="autoScroll" type="bool"/>
+ <property name="selectByMouse" type="bool"/>
<signal name="textChanged"/>
<signal name="cursorPositionChanged"/>
<signal name="selectionStartChanged"/>
@@ -2772,6 +2880,12 @@
<signal name="autoScrollChanged">
<param name="autoScroll" type="bool"/>
</signal>
+ <signal name="selectByMouseChanged">
+ <param name="selectByMouse" type="bool"/>
+ </signal>
+ <signal name="showInputPanelOnFocusChanged">
+ <param name="showOnFocus" type="bool"/>
+ </signal>
<method name="selectAll"/>
<method name="xToPosition" type="int">
<param name="x" type="int"/>
@@ -2779,6 +2893,8 @@
<method name="moveCursorSelection">
<param name="pos" type="int"/>
</method>
+ <method name="openSoftwareInputPanel"/>
+ <method name="closeSoftwareInputPanel"/>
</type>
<type name="Qt.Timer" version="4.7" extends="Qt.QtObject">
<property name="interval" type="int"/>
@@ -2884,6 +3000,10 @@
<signal name="queryChanged"/>
<signal name="namespaceDeclarationsChanged"/>
<method name="reload"/>
+ <method name="get" type="QScriptValue">
+ <param name="index" type="int"/>
+ </method>
+ <method name="errorString" type="string"/>
</type>
<type name="Qt.XmlRole" version="4.7" extends="Qt.QtObject">
<property name="name" type="string"/>
@@ -2893,6 +3013,31 @@
<signal name="queryChanged"/>
<signal name="isKeyChanged"/>
</type>
+ <type name="Qt.labs.folderlistmodel.FolderListModel" version="1.0" extends="QAbstractListModel">
+ <enum name="SortField">
+ <enumerator name="Unsorted" value="0"/>
+ <enumerator name="Name" value="1"/>
+ <enumerator name="Time" value="2"/>
+ <enumerator name="Size" value="3"/>
+ <enumerator name="Type" value="4"/>
+ </enum>
+ <property name="folder" type="QUrl"/>
+ <property name="parentFolder" type="QUrl"/>
+ <property name="nameFilters" type="QStringList"/>
+ <property name="sortField" type="SortField"/>
+ <property name="sortReversed" type="bool"/>
+ <property name="showDirs" type="bool"/>
+ <property name="showDotAndDotDot" type="bool"/>
+ <property name="showOnlyReadable" type="bool"/>
+ <property name="count" type="int"/>
+ <signal name="folderChanged"/>
+ <method name="isFolder" type="bool">
+ <param name="index" type="int"/>
+ </method>
+ </type>
+ <type name="Qt.labs.gestures.GestureArea" version="1.0" defaultProperty="data" extends="Qt.Item">
+ <property name="gesture" type="QGesture"/>
+ </type>
<type name="Qt.labs.particles.ParticleMotion" version="1.0" extends="Qt.QtObject"/>
<type name="Qt.labs.particles.ParticleMotionGravity" version="1.0" extends="Qt.labs.particles.ParticleMotion">
<property name="xattractor" type="qreal"/>
@@ -2947,169 +3092,6 @@
<param name="count" type="int"/>
</method>
</type>
- <type name="Qt.multimedia.Audio" version="4.7" extends="Qt.QtObject">
- <enum name="Status">
- <enumerator name="UnknownStatus" value="0"/>
- <enumerator name="NoMedia" value="1"/>
- <enumerator name="Loading" value="2"/>
- <enumerator name="Loaded" value="3"/>
- <enumerator name="Stalled" value="4"/>
- <enumerator name="Buffering" value="5"/>
- <enumerator name="Buffered" value="6"/>
- <enumerator name="EndOfMedia" value="7"/>
- <enumerator name="InvalidMedia" value="8"/>
- </enum>
- <enum name="Error">
- <enumerator name="NoError" value="0"/>
- <enumerator name="ResourceError" value="1"/>
- <enumerator name="FormatError" value="2"/>
- <enumerator name="NetworkError" value="3"/>
- <enumerator name="AccessDenied" value="4"/>
- <enumerator name="ServiceMissing" value="5"/>
- </enum>
- <property name="source" type="QUrl"/>
- <property name="autoLoad" type="bool"/>
- <property name="playing" type="bool"/>
- <property name="paused" type="bool"/>
- <property name="status" type="Status"/>
- <property name="duration" type="int"/>
- <property name="position" type="int"/>
- <property name="volume" type="qreal"/>
- <property name="muted" type="bool"/>
- <property name="bufferProgress" type="int"/>
- <property name="seekable" type="bool"/>
- <property name="playbackRate" type="qreal"/>
- <property name="error" type="Error"/>
- <property name="errorString" type="string"/>
- <signal name="sourceChanged"/>
- <signal name="autoLoadChanged"/>
- <signal name="playingChanged"/>
- <signal name="pausedChanged"/>
- <signal name="started"/>
- <signal name="resumed"/>
- <signal name="paused"/>
- <signal name="stopped"/>
- <signal name="statusChanged"/>
- <signal name="loaded"/>
- <signal name="buffering"/>
- <signal name="stalled"/>
- <signal name="buffered"/>
- <signal name="endOfMedia"/>
- <signal name="durationChanged"/>
- <signal name="positionChanged"/>
- <signal name="volumeChanged"/>
- <signal name="mutedChanged"/>
- <signal name="bufferProgressChanged"/>
- <signal name="seekableChanged"/>
- <signal name="playbackRateChanged"/>
- <signal name="errorChanged"/>
- <signal name="error">
- <param name="error" type="QDeclarativeAudio.Error"/>
- <param name="errorString" type="string"/>
- </signal>
- <method name="play"/>
- <method name="pause"/>
- <method name="stop"/>
- </type>
- <type name="Qt.multimedia.SoundEffect" version="4.7" extends="Qt.QtObject">
- <property name="source" type="QUrl"/>
- <property name="loops" type="int"/>
- <property name="volume" type="int"/>
- <property name="muted" type="bool"/>
- <signal name="sourceChanged"/>
- <signal name="loopsChanged"/>
- <signal name="volumeChanged"/>
- <signal name="mutedChanged"/>
- <method name="play"/>
- </type>
- <type name="Qt.multimedia.Video" version="4.7" defaultProperty="data" extends="Qt.Item">
- <enum name="FillMode">
- <enumerator name="Stretch" value="0"/>
- <enumerator name="PreserveAspectFit" value="1"/>
- <enumerator name="PreserveAspectCrop" value="2"/>
- </enum>
- <enum name="Status">
- <enumerator name="UnknownStatus" value="0"/>
- <enumerator name="NoMedia" value="1"/>
- <enumerator name="Loading" value="2"/>
- <enumerator name="Loaded" value="3"/>
- <enumerator name="Stalled" value="4"/>
- <enumerator name="Buffering" value="5"/>
- <enumerator name="Buffered" value="6"/>
- <enumerator name="EndOfMedia" value="7"/>
- <enumerator name="InvalidMedia" value="8"/>
- </enum>
- <enum name="Error">
- <enumerator name="NoError" value="0"/>
- <enumerator name="ResourceError" value="1"/>
- <enumerator name="FormatError" value="2"/>
- <enumerator name="NetworkError" value="3"/>
- <enumerator name="AccessDenied" value="4"/>
- <enumerator name="ServiceMissing" value="5"/>
- </enum>
- <property name="source" type="QUrl"/>
- <property name="autoLoad" type="bool"/>
- <property name="playing" type="bool"/>
- <property name="paused" type="bool"/>
- <property name="status" type="Status"/>
- <property name="duration" type="int"/>
- <property name="position" type="int"/>
- <property name="volume" type="qreal"/>
- <property name="muted" type="bool"/>
- <property name="hasAudio" type="bool"/>
- <property name="hasVideo" type="bool"/>
- <property name="bufferProgress" type="int"/>
- <property name="seekable" type="bool"/>
- <property name="playbackRate" type="qreal"/>
- <property name="error" type="Error"/>
- <property name="errorString" type="string"/>
- <property name="fillMode" type="FillMode"/>
- <signal name="sourceChanged"/>
- <signal name="autoLoadChanged"/>
- <signal name="playingChanged"/>
- <signal name="pausedChanged"/>
- <signal name="started"/>
- <signal name="resumed"/>
- <signal name="paused"/>
- <signal name="stopped"/>
- <signal name="statusChanged"/>
- <signal name="loaded"/>
- <signal name="buffering"/>
- <signal name="stalled"/>
- <signal name="buffered"/>
- <signal name="endOfMedia"/>
- <signal name="durationChanged"/>
- <signal name="positionChanged"/>
- <signal name="volumeChanged"/>
- <signal name="mutedChanged"/>
- <signal name="hasAudioChanged"/>
- <signal name="hasVideoChanged"/>
- <signal name="bufferProgressChanged"/>
- <signal name="seekableChanged"/>
- <signal name="playbackRateChanged"/>
- <signal name="errorChanged"/>
- <signal name="error">
- <param name="error" type="QDeclarativeVideo.Error"/>
- <param name="errorString" type="string"/>
- </signal>
- <method name="play"/>
- <method name="pause"/>
- <method name="stop"/>
- </type>
- <type name="Qt.widgets.QGraphicsGridLayout" version="4.7" defaultProperty="children" extends="Qt.QtObject">
- <property name="children" type="QGraphicsLayoutItem" isList="true"/>
- <property name="spacing" type="qreal"/>
- <property name="contentsMargin" type="qreal"/>
- <property name="verticalSpacing" type="qreal"/>
- <property name="horizontalSpacing" type="qreal"/>
- </type>
- <type name="Qt.widgets.QGraphicsLinearLayout" version="4.7" defaultProperty="children" extends="Qt.QtObject">
- <property name="children" type="QGraphicsLayoutItem" isList="true"/>
- <property name="orientation" type="Qt.Orientation"/>
- <property name="spacing" type="qreal"/>
- <property name="contentsMargin" type="qreal"/>
- </type>
- <type name="Qt.widgets.QGraphicsLinearLayoutStretchItem" version="4.7" extends="Qt.QtObject"/>
<type name="org.webkit.WebView" version="1.0" defaultProperty="data" extends="Qt.Item">
<enum name="Status">
<enumerator name="Null" value="0"/>
diff --git a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml b/share/qtcreator/templates/wizards/qml-runtime/wizard_disabled.xml
similarity index 100%
rename from share/qtcreator/templates/wizards/qml-runtime/wizard.xml
rename to share/qtcreator/templates/wizards/qml-runtime/wizard_disabled.xml
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 2a47c9da1b47bbf5465eb895d6728f63a0bfcbef..1d922d2184929bf68b2e3ca67e40445bdd4fe09c 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -429,7 +429,7 @@
<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>Das Verzeichnis %1 enthält eine veraltetet cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erneuern. Zusätzliche Für Kommandozeilenargumente können unten angegeben werden. Beachten Sie, dass cmake die Argumente vorangegangener Aufrufe speichert.</translation>
+ <translation>Das Verzeichnis %1 enthält eine veraltete cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erneuern. Zusätzliche Kommandozeilenargumente können unten angegeben werden. Beachten Sie, dass cmake die Argumente vorangegangener Aufrufe speichert.</translation>
</message>
<message>
<location line="+6"/>
@@ -5481,7 +5481,7 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<message>
<location filename="../../../src/plugins/designer/cpp/formclasswizarddialog.cpp" line="+52"/>
<source>Qt Designer Form Class</source>
- <translation>Qt Designer-Formular-Klasse</translation>
+ <translation>Qt-Designer-Formularklasse</translation>
</message>
<message>
<location line="+3"/>
@@ -5522,22 +5522,22 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<message>
<location filename="../../../src/plugins/designer/formeditorplugin.cpp" line="+130"/>
<source>Qt Designer Form</source>
- <translation>Qt Designer-Formular</translation>
+ <translation>Qt-Designer-Formular</translation>
</message>
<message>
<location line="+2"/>
<source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt C++ Project.</source>
- <translation>Erstellt eine Qt Designer-Formular-Datei mit zugehörigem Klassenrumpf (bestehend aus C++-Header- und Quelldatei) für ein existierendes C++-Projekt.</translation>
+ <translation>Erstellt ein Qt-Designer-Formular mit zugehörigem Klassenrumpf (bestehend aus C++-Header- und -Quelldatei) für ein existierendes C++-Projekt.</translation>
</message>
<message>
<location line="+8"/>
<source>Creates a Qt Designer form that you can add to a Qt C++ project. This is useful if you already have an existing class for the UI business logic.</source>
- <translation>Erstellt eine Qt Designer-Formular-Datei für ein C++-Projekt. Verwenden Sie diese Vorlage, wenn bereits Geschäftslogik existiert.</translation>
+ <translation>Erstellt ein Qt-Designer-Formular für ein C++-Projekt. Verwenden Sie diese Vorlage, wenn bereits eine Klasse für den Programmablauf existiert.</translation>
</message>
<message>
<location line="-2"/>
<source>Qt Designer Form Class</source>
- <translation>Qt Designer-Formular-Klasse</translation>
+ <translation>Qt-Designer-Formularklasse</translation>
</message>
</context>
<context>
@@ -5713,7 +5713,7 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<message>
<location filename="../../../src/plugins/designer/formwizarddialog.cpp" line="+60"/>
<source>Qt Designer Form</source>
- <translation>Qt Designer-Formular</translation>
+ <translation>Qt-Designer-Formular</translation>
</message>
<message>
<location line="+2"/>
@@ -8559,7 +8559,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+1"/>
<source>Qt Designer file</source>
- <translation>Qt Designer-Datei</translation>
+ <translation>Qt-Designer-Datei</translation>
</message>
<message>
<location line="+6"/>
@@ -8569,7 +8569,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="-5"/>
<source>Generic Qt Creator Project file</source>
- <translation>Generische Qt Creator Projektdatei</translation>
+ <translation>Allgemeine Qt-Creator-Projektdatei</translation>
</message>
<message>
<location line="-23"/>
@@ -8639,17 +8639,17 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+12"/>
<source>Generic Project Files</source>
- <translation>Generische Projektdateien</translation>
+ <translation>Allgemeine Projektdateien</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Project Include Paths</source>
- <translation>Include-Pfade für generisches Projekt</translation>
+ <translation>Include-Pfade für allgemeines Projekt</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Project Configuration File</source>
- <translation>Projekt-Konfigurationsdatei für generische Projekte</translation>
+ <translation>Projekt-Konfigurationsdatei für allgemeine Projekte</translation>
</message>
<message>
<location line="+1"/>
@@ -10006,7 +10006,7 @@ Fehler: %2</translation>
<message>
<location line="+52"/>
<source>File &pattern:</source>
- <translation>Such&muster für Dateinamen</translation>
+ <translation>Such&muster für Dateinamen:</translation>
</message>
</context>
<context>
@@ -10165,7 +10165,7 @@ Fehler: %2</translation>
<message>
<location line="+47"/>
<source>File &pattern:</source>
- <translation>Such&muster für Dateinamen</translation>
+ <translation>Such&muster für Dateinamen:</translation>
</message>
</context>
<context>
@@ -11851,7 +11851,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<message>
<location/>
<source>Explore Qt Quick Examples</source>
- <translation>Qt Quick-Beispiele öffnen</translation>
+ <translation>Qt-Quick-Beispiele öffnen</translation>
</message>
<message>
<location/>
@@ -11871,7 +11871,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<source>Creates a Qt application for the desktop. Includes a Qt Designer-based main window.
Preselects a desktop Qt for building the application if available.</source>
- <translation>Erstellt eine Qt-Anwendung für den Desktop mit einem Qt Designer-basierten Hauptfenster.
+ <translation>Erstellt eine Qt-Anwendung für den Desktop mit einem Qt-Designer-basierten Hauptfenster.
Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfügbar ist.</translation>
</message>
@@ -12010,7 +12010,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<message>
<location line="+3"/>
<source>Forms</source>
- <translation>Formular-Dateien</translation>
+ <translation>Formulardateien</translation>
</message>
<message>
<location line="+3"/>
@@ -14470,7 +14470,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location line="+4"/>
<source>File &pattern:</source>
- <translation>Such&muster für Dateinamen</translation>
+ <translation>Such&muster für Dateinamen:</translation>
</message>
<message>
<location line="+18"/>
@@ -17419,7 +17419,7 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<message>
<location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+83"/>
<source>Qt Quick Designer</source>
- <translation>Qt Quick Designer</translation>
+ <translation>Qt-Quick-Designer</translation>
</message>
</context>
<context>
@@ -20133,7 +20133,7 @@ QML-Anwendungen werden durch die QML-Laufzeitumgebung direkt ausgeführt und ben
<message>
<location filename="../../../src/plugins/qmldesigner/qmldesignerplugin.cpp" line="+130"/>
<source>Switch Text/Design</source>
- <translation>Text/Entwurf umschalten</translation>
+ <translation>Text/Design umschalten</translation>
</message>
<message>
<location line="+200"/>
@@ -20171,7 +20171,7 @@ QML-Anwendungen werden durch die QML-Laufzeitumgebung direkt ausgeführt und ben
<message>
<location filename="../../../src/plugins/coreplugin/designmode.cpp" line="+151"/>
<source>Design</source>
- <translation>Entwurf</translation>
+ <translation>Design</translation>
</message>
</context>
<context>
@@ -21509,7 +21509,7 @@ Haben Sie Qemu gestartet?</translation>
<message>
<location filename="../../../src/plugins/designer/formeditorfactory.cpp" line="+93"/>
<source>This file can only be edited in <b>Design</b> mode.</source>
- <translation>Datei kann nur im <b>Entwurfsmodus</b> bearbeitet werden.</translation>
+ <translation>Datei kann nur im <b>Designmodus</b> bearbeitet werden.</translation>
</message>
<message>
<location line="+1"/>
@@ -21579,7 +21579,7 @@ Haben Sie Qemu gestartet?</translation>
<source>Creates a Qt application optimized for mobile devices with a Qt Designer-based main window.
Preselects Qt for Simulator and mobile targets if available</source>
- <translation>Erstellt eine Qt-Anwendung für mobile Geräte mit einem Qt Designer-basierten Hauptfenster.
+ <translation>Erstellt eine Qt-Anwendung für mobile Geräte mit einem Qt-Designer-basierten Hauptfenster.
Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar sind.</translation>
</message>
@@ -21678,23 +21678,23 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<message>
<location line="-15"/>
<source>Do you want to enable the experimental Qt Quick Designer?</source>
- <translation>Möchten Sie den experimentellen Quick-Designer aktivieren?</translation>
+ <translation>Möchten Sie den experimentellen Qt-Quick-Designer aktivieren?</translation>
</message>
<message>
<location line="+1"/>
<location line="+23"/>
<source>Enable Qt Quick Designer</source>
- <translation>Quick Designer aktivieren</translation>
+ <translation>Qt-Quick-Designer aktivieren</translation>
</message>
<message>
<location line="-6"/>
<source>Enable experimental Qt Quick Designer?</source>
- <translation>Möchten Sie den experimentellen Quick-Designer aktivieren?</translation>
+ <translation>Möchten Sie den experimentellen Qt-Quick-Designer aktivieren?</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to enable the experimental Qt Quick Designer? After enabling it, you can access the visual design capabilities by switching to Design Mode. This can affect the overall stability of Qt Creator. To disable Qt Quick Designer again, visit the menu '%1' and disable 'QmlDesigner'.</source>
- <translation>Möchten Sie den experimentellen Quick-Designer aktivieren? Nach der Aktivierung haben Sie Zugriff auf die graphische Entwurfsfunktionalität, wenn Sie in den Entwurfsmodus schalten. Das kann allerdings die Stabilität von Qt Creator beeinträchtigen. Um Quick-Designer zu deaktivieren, wählen Sie '%1' und deaktivieren 'QmlDesigner' in dem gezeigten Fenster.</translation>
+ <translation>Möchten Sie den experimentellen Qt-Quick-Designer aktivieren? Dadurch bekommen Sie Zugriff auf die grafische Designfunktion, wenn Sie in den Designmodus schalten. Dies kann allerdings die Stabilität von Qt Creator beeinträchtigen. Um den Qt-Quick-Designer wieder zu deaktivieren, wählen Sie '%1' und deaktivieren 'QmlDesigner' in dem gezeigten Fenster.</translation>
</message>
<message>
<location line="+6"/>
@@ -22576,7 +22576,7 @@ Namen <E-Mail> Alias <E-Mail?</translation>
<location line="+1"/>
<source>Could not preview Qt Quick (QML) file. Reason:
%1</source>
- <translation>Die Qt-Quick-Datei (QML) konnte angezeigt werden:
+ <translation>Die Qt-Quick-Datei (QML) konnte nicht angezeigt werden:
%1</translation>
</message>
</context>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 23e56ea1744ae4f9c68ed498eaaa5c8d7f38b424..b297f8692ce1227c1534c9fc7ece8e49f1498652 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -28,7 +28,7 @@
<translation>Ðе удалоÑÑŒ найти 'Core.pluginspec' в %1</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Qt Creator - Plugin loader messages</source>
<translation>Qt Creator - Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° модулей</translation>
</message>
@@ -60,8 +60,8 @@
</message>
<message>
<location/>
- <source>Attach to Process ID:</source>
- <translation>Поключить к ID процеÑÑа:</translation>
+ <source>Attach to process ID:</source>
+ <translation>ПоключитьÑÑ Ðº процеÑÑу Ñ ID:</translation>
</message>
</context>
<context>
@@ -153,7 +153,7 @@
<message>
<location/>
<source>Animation</source>
- <translation type="unfinished">ÐнимациÑ</translation>
+ <translation>ÐнимациÑ</translation>
</message>
<message>
<location/>
@@ -163,17 +163,17 @@
<message>
<location/>
<source>Settings</source>
- <translation>ÐаÑтройки</translation>
+ <translation type="unfinished">ÐаÑтройки</translation>
</message>
<message>
<location/>
<source>Duration:</source>
- <translation>ПродолжительноÑÑ‚ÑŒ:</translation>
+ <translation>ДлительноÑÑ‚ÑŒ:</translation>
</message>
<message>
<location/>
<source>Curve:</source>
- <translation type="unfinished">ÐŸÐµÑ€ÐµÑ…Ð¾Ð´Ð½Ð°Ñ ÐºÑ€Ð¸Ð²Ð°Ñ:</translation>
+ <translation type="unfinished">КриваÑ:</translation>
</message>
<message>
<location/>
@@ -229,7 +229,7 @@
<translation>ÐÐ¾Ð²Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°</translation>
</message>
<message>
- <location filename="../../../src/shared/help/bookmarkmanager.cpp" line="+175"/>
+ <location filename="../../../src/shared/help/bookmarkmanager.cpp" line="+178"/>
<location line="+18"/>
<location line="+39"/>
<location line="+18"/>
@@ -251,7 +251,7 @@
<context>
<name>BookmarkManager</name>
<message>
- <location line="+424"/>
+ <location line="+432"/>
<source>Bookmarks</source>
<translation>Закладки</translation>
</message>
@@ -275,7 +275,7 @@
<context>
<name>BookmarkWidget</name>
<message>
- <location line="-420"/>
+ <location line="-428"/>
<source>Delete Folder</source>
<translation>Удалить папку</translation>
</message>
@@ -305,12 +305,7 @@
<translation>Переименовать закладку</translation>
</message>
<message>
- <location line="+38"/>
- <source>Filter:</source>
- <translation>Шаблон:</translation>
- </message>
- <message>
- <location line="+26"/>
+ <location line="+72"/>
<source>Add</source>
<translation>Добавить</translation>
</message>
@@ -404,15 +399,53 @@
</message>
<message>
<location line="+10"/>
- <source>Previous Bookmark In Document</source>
+ <source>Previous Bookmark in Document</source>
<translation>ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ° в документе</translation>
</message>
<message>
<location line="+5"/>
- <source>Next Bookmark In Document</source>
+ <source>Next Bookmark in Document</source>
<translation>Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ° в документе</translation>
</message>
</context>
+<context>
+ <name>BorderImageSpecifics</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml" line="+17"/>
+ <source>Image</source>
+ <translation type="unfinished">Изображение</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Source</source>
+ <translation type="unfinished">ИÑточник</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Source Size</source>
+ <translation type="unfinished">Размер иÑточника</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Left</source>
+ <translation type="unfinished">Левый</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Right</source>
+ <translation type="unfinished">Правый</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Top</source>
+ <translation type="unfinished">Верхний</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Bottom</source>
+ <translation type="unfinished">Ðижний</translation>
+ </message>
+</context>
<context>
<name>BreakByFunctionDialog</name>
<message>
@@ -476,7 +509,7 @@
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+623"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+625"/>
<source>&Change</source>
<translation>&Изменить</translation>
</message>
@@ -484,7 +517,7 @@
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+130"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+132"/>
<source>CMake Wizard</source>
<translation>МаÑтер CMake</translation>
</message>
@@ -516,7 +549,7 @@
</message>
<message>
<location line="+5"/>
- <source>Select the working directory</source>
+ <source>Select Working Directory</source>
<translation>Выбор рабочего каталога</translation>
</message>
<message>
@@ -642,7 +675,7 @@
<translation>CMake</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
<source>Executable:</source>
<translation>Программа:</translation>
</message>
@@ -650,7 +683,7 @@
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmaketarget.cpp" line="+47"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmaketarget.cpp" line="+49"/>
<location filename="../../../src/plugins/projectexplorer/userfileaccessor.cpp" line="+772"/>
<source>Desktop</source>
<comment>CMake Default target display name</comment>
@@ -662,7 +695,7 @@
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-239"/>
<source>Qt Creator has detected an <b>in-source-build in %1</b> 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 обнаружил <b>Ñборку в каталоге Ñ Ð¸Ñходниками (%1)</b>, что препÑÑ‚Ñтвует фоновой Ñборке. Qt Creator не позволит изменить каталог Ñборки. ЕÑли требуетÑÑ Ñ„Ð¾Ð½Ð¾Ð²Ð°Ñ Ñборка, необходимо очиÑтить каталог иÑходников и открыть проект Ñнова.</translation>
+ <translation>Qt Creator обнаружил <b>Ñборку в каталоге Ñ Ð¸Ñходниками (%1)</b>, что препÑÑ‚Ñтвует теневой Ñборке. Qt Creator не позволит изменить каталог Ñборки. ЕÑли требуетÑÑ Ñ‚ÐµÐ½ÐµÐ²Ð°Ñ Ñборка, необходимо очиÑтить каталог иÑходников и открыть проект Ñнова.</translation>
</message>
<message>
<location line="+5"/>
@@ -934,7 +967,7 @@
<translation>&Повторить</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+26"/>
<source>Closing CVS Editor</source>
<translation>Закрытие редактора CVS</translation>
</message>
@@ -1018,7 +1051,7 @@
</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>No cvs executable specified!</source>
<translation>Ðе указан иÑполнÑемый файл программы cvs!</translation>
</message>
@@ -1065,8 +1098,8 @@
<name>CVS::Internal::CheckoutWizard</name>
<message>
<location filename="../../../src/plugins/cvs/checkoutwizard.cpp" line="+56"/>
- <source>Checks out a project from a CVS repository.</source>
- <translation>Извлечение проекта из хранилища CVS.</translation>
+ <source>Checks out a CVS repository and tries to load the contained project.</source>
+ <translation>Извлечение хранилища CVS Ñ Ð¿Ð¾Ñледующей попыткой загрузки ÑодержащегоÑÑ Ñ‚Ð°Ð¼ проекта.</translation>
</message>
<message>
<location line="+5"/>
@@ -1094,26 +1127,6 @@
</context>
<context>
<name>CVS::Internal::SettingsPage</name>
- <message>
- <location filename="../../../src/plugins/cvs/settingspage.ui"/>
- <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>CVS Command:</source>
- <translation>Команда CVS:</translation>
- </message>
- <message>
- <location/>
- <source>CVS Root:</source>
- <translation>Корень CVS:</translation>
- </message>
- <message>
- <location/>
- <source>Diff Options:</source>
- <translation>Опции ÑравнениÑ:</translation>
- </message>
<message>
<location filename="../../../src/plugins/cvs/settingspage.cpp" line="+98"/>
<source>CVS</source>
@@ -1149,6 +1162,26 @@
<source>s</source>
<translation> Ñек</translation>
</message>
+ <message>
+ <location/>
+ <source>CVS command:</source>
+ <translation>Команда CVS:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>CVS root:</source>
+ <translation>Корень CVS:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Diff options:</source>
+ <translation>Опции ÑравнениÑ:</translation>
+ </message>
+ <message>
+ <location/>
+ <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>
</context>
<context>
<name>CVS::Internal::SettingsPageWidget</name>
@@ -1161,7 +1194,7 @@
<context>
<name>CVSPlugin</name>
<message>
- <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="-977"/>
+ <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="-974"/>
<source>Cannot find repository for '%1'</source>
<translation>Ðе удалоÑÑŒ найти хранилище Ð´Ð»Ñ "%1"</translation>
</message>
@@ -1169,7 +1202,7 @@
<context>
<name>CdbCore::CoreEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/coreengine.cpp" line="+429"/>
+ <location filename="../../../src/plugins/debugger/cdb/coreengine.cpp" line="+430"/>
<source>Unable to set the image path to %1: %2</source>
<translation>Ðе удалоÑÑŒ уÑтановить путь к образу "%1": %2</translation>
</message>
@@ -1191,12 +1224,6 @@
<source>These options take effect at the next start of Qt Creator.</source>
<translation>Данные наÑтройки вÑтупÑÑ‚ в Ñилу поÑле перезапуÑка Qt Creator.</translation>
</message>
- <message>
- <location/>
- <source>Cdb</source>
- <extracomment>Placeholder</extracomment>
- <translation>Cdb</translation>
- </message>
<message>
<location/>
<source>Path:</source>
@@ -1235,12 +1262,18 @@
</message>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
- <source>Other options</source>
+ <source>CDB</source>
+ <extracomment>Placeholder</extracomment>
+ <translation></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Other Options</source>
<translation>Другие параметры</translation>
</message>
<message>
<location/>
- <source>Verbose Symbol Loading</source>
+ <source>Verbose symbol loading</source>
<translation>ÐаглÑÐ´Ð½Ð°Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ñимволов</translation>
</message>
</context>
@@ -1275,7 +1308,7 @@
<translation><ÐеизвеÑтное значение></translation>
</message>
<message>
- <location line="+301"/>
+ <location line="+297"/>
<source><Unknown></source>
<translation><ÐеизвеÑтный></translation>
</message>
@@ -1284,11 +1317,6 @@
<name>ChangeSelectionDialog</name>
<message>
<location filename="../../../src/plugins/git/changeselectiondialog.ui"/>
- <source>Repository Location:</source>
- <translation>Хранилище:</translation>
- </message>
- <message>
- <location/>
<source>Select</source>
<translation>Выбрать</translation>
</message>
@@ -1297,6 +1325,11 @@
<source>Change:</source>
<translation>ФикÑациÑ:</translation>
</message>
+ <message>
+ <location/>
+ <source>Repository location:</source>
+ <translation>Хранилище:</translation>
+ </message>
</context>
<context>
<name>CodePaster</name>
@@ -1309,7 +1342,7 @@
<context>
<name>CodePaster::CodePasterProtocol</name>
<message>
- <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+79"/>
+ <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+80"/>
<source>No Server defined in the CodePaster preferences.</source>
<translation>Ðе указан Ñервер в наÑтройках CodePaster.</translation>
</message>
@@ -1319,7 +1352,7 @@
<translation>Ðе указан Ñервер в наÑтройках CodePaster.</translation>
</message>
<message>
- <location line="+104"/>
+ <location line="+97"/>
<source>No such paste</source>
<translation>Ðет такой вÑтавки</translation>
</message>
@@ -1332,7 +1365,7 @@
<translation>CodePaster</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+27"/>
<source>Server:</source>
<translation>Сервер:</translation>
</message>
@@ -1345,7 +1378,7 @@
<context>
<name>CodePaster::CodepasterPlugin</name>
<message>
- <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+118"/>
+ <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+120"/>
<source>&Code Pasting</source>
<translation>Ð’Ñтавка &Кода</translation>
</message>
@@ -1375,11 +1408,80 @@
<translation></translation>
</message>
<message>
- <location line="+180"/>
+ <location line="+183"/>
<source>Empty snippet received for "%1".</source>
<translation>Ð”Ð»Ñ "%1" получен пуÑтой фрагмент.</translation>
</message>
</context>
+<context>
+ <name>CodePaster::FileShareProtocol</name>
+ <message>
+ <location filename="../../../src/plugins/cpaster/fileshareprotocol.cpp" line="+104"/>
+ <source>Cannot open %1: %2</source>
+ <translation>Ðе удалоÑÑŒ открыть %1: %2</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>%1 does not appear to be a paster file.</source>
+ <translation>%1 не ÑвлÑетÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð¼ paster.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Error in %1 at %2: %3</source>
+ <translation>Ошибка в %1, Ñтрока %2: %3</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Please configure a path.</source>
+ <translation>Ðеобходимо наÑтроить путь.</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Unable to open a file for writing in %1: %2</source>
+ <translation>Ðе удалоÑÑŒ открыть файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи в %1: %2</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Pasted: %1</source>
+ <translation>Ð’Ñтавлен: %1</translation>
+ </message>
+</context>
+<context>
+ <name>CodePaster::FileShareProtocolSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/cpaster/fileshareprotocolsettingspage.cpp" line="+110"/>
+ <source>Fileshare</source>
+ <translation type="unfinished">Общие файлы</translation>
+ </message>
+</context>
+<context>
+ <name>CodePaster::FileShareProtocolSettingsWidget</name>
+ <message>
+ <location filename="../../../src/plugins/cpaster/fileshareprotocolsettingswidget.ui"/>
+ <source>Form</source>
+ <translation>Форма</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Path:</source>
+ <translation>&Путь:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Display:</source>
+ <translation>&Отображать:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>entries</source>
+ <translation> запиÑей</translation>
+ </message>
+ <message>
+ <location/>
+ <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
+ <translation>Протокол на базе общей папки позволÑет публиковать фрагменты кода проÑто иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñетевой диÑк Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð². Файлы никогда не удалÑÑŽÑ‚ÑÑ.</translation>
+ </message>
+</context>
<context>
<name>CodePaster::PasteBinDotComSettings</name>
<message>
@@ -1406,12 +1508,12 @@
<translation>Обновить</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>Waiting for items</source>
<translation>Ожидание Ñлементов</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+13"/>
<source>This protocol does not support listing</source>
<translation>Данный протокол не поддерживает получение ÑпиÑка</translation>
</message>
@@ -1429,6 +1531,19 @@
<translation><Комментарий></translation>
</message>
</context>
+<context>
+ <name>CodePaster::Protocol</name>
+ <message>
+ <location filename="../../../src/plugins/cpaster/protocol.cpp" line="+143"/>
+ <source>%1 - Configuration Error</source>
+ <translation>%1 - ошибка конфигурации</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Settings...</source>
+ <translation>ÐаÑтройки...</translation>
+ </message>
+</context>
<context>
<name>CodePaster::SettingsPage</name>
<message>
@@ -1443,18 +1558,18 @@
</message>
<message>
<location/>
- <source>Copy Paste URL to clipboard</source>
- <translation>Скопировать ÑÑылку в буфер обмена</translation>
+ <source>Default protocol:</source>
+ <translation>Протокол по умолчанию:</translation>
</message>
<message>
<location/>
- <source>Display Output Pane after sending a post</source>
+ <source>Display Output pane after sending a post</source>
<translation>Отправив данные, показать окно вывода</translation>
</message>
<message>
<location/>
- <source>Default Protocol:</source>
- <translation>Протокол по умолчанию:</translation>
+ <source>Copy-paste URL to clipboard</source>
+ <translation type="unfinished">Скопировать ÑÑылку в буфер обмена</translation>
</message>
</context>
<context>
@@ -1464,11 +1579,6 @@
<source>Command Mappings</source>
<translation>СвÑзывание команд</translation>
</message>
- <message>
- <location/>
- <source>Filter:</source>
- <translation>Шаблон:</translation>
- </message>
<message>
<location/>
<source>Command</source>
@@ -1511,8 +1621,8 @@
</message>
<message>
<location/>
- <source>Remove</source>
- <translation>Удалить</translation>
+ <source>Reset</source>
+ <translation>СброÑить</translation>
</message>
</context>
<context>
@@ -1532,20 +1642,6 @@
<source>Use alternating row colors in debug views</source>
<translation>Чередование цвета Ñтрок в предÑтавлении отладчика</translation>
</message>
- <message>
- <source>When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic
- reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it.</source>
- <translation type="obsolete">Когда включён данный параметр, в определенных ÑитуациÑÑ… 'Зайти в' объединÑет неÑколько шагов в один, позволÑÑ 'Ñнизить шум' при отладке.
-Ðапример, будет пропущен атомарный код подÑчета ÑÑылок и единÑÑ‚Ð²ÐµÐ½Ð½Ð°Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ 'Зайти в' инициации Ñигнала завершитÑÑ Ð¿Ñ€Ñмо в Ñлоте, подключённому к данному Ñигналу.</translation>
- </message>
- <message>
- <source>Skip known frames when stepping</source>
- <translation type="obsolete">ПропуÑкать извеÑтные кадры при пошаговой отладке</translation>
- </message>
- <message>
- <source>Enable reverse debugging</source>
- <translation type="obsolete">Включить реверÑивную отладку</translation>
- </message>
<message>
<location/>
<source>Maximal stack depth:</source>
@@ -1556,10 +1652,6 @@
<source><unlimited></source>
<translation><беÑконечна></translation>
</message>
- <message>
- <source>Show a message box when receiving a signal</source>
- <translation type="obsolete">Показывать Ñообщение при получении Ñигнала</translation>
- </message>
<message>
<location/>
<source>Use tooltips in main editor while debugging</source>
@@ -1580,10 +1672,6 @@
<source>Change debugger language automatically</source>
<translation>ÐвтоматичеÑки менÑÑ‚ÑŒ Ñзык отладчика</translation>
</message>
- <message>
- <source>C++</source>
- <translation type="obsolete">C++</translation>
- </message>
<message>
<location/>
<source>Register Qt Creator for debugging crashed applications.</source>
@@ -1591,13 +1679,58 @@
</message>
<message>
<location/>
- <source>Use Creator for post-mortem debugging</source>
+ <source>GUI Behavior</source>
+ <translation>ОÑобенноÑти интерфейÑа пользователÑ</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use Qt Creator for post-mortem debugging</source>
<translation>Ðазначить Qt Creator ÑиÑтемным отладчиком</translation>
</message>
+</context>
+<context>
+ <name>CommonSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/commonsettingspage.ui"/>
+ <source>Wrap submit message at:</source>
+ <translation>Ограничить длину Ñтроки до:</translation>
+ </message>
<message>
<location/>
- <source>Gui behavior</source>
- <translation>ОÑобенноÑти интерфейÑа пользователÑ</translation>
+ <source> characters</source>
+ <translation> Ñимволов</translation>
+ </message>
+ <message>
+ <location/>
+ <source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source>
+ <translation>Программа, которой передаётÑÑ Ñ„Ð°Ð¹Ð» ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ фикÑации в качеÑтве первого аргумента. Она должна завершитьÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ неравным нулю и Ñообщением в Ñтандартный поток ошибок в Ñлучае Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¸.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Submit message check script:</source>
+ <translation>Скрипт проверки Ñообщений:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>A file listing user names and email addresses in a 4-column mailmap format:
+name <email> alias <email></source>
+ <translation>Файл ÑпиÑка пользователей и их email в 4-Ñ… Ñтолбцовом формате mailmap:
+Ð¸Ð¼Ñ <email> Ð°Ð»Ð¸Ð°Ñ <email></translation>
+ </message>
+ <message>
+ <location/>
+ <source>User/alias configuration file:</source>
+ <translation>Файл наÑтройки пользователей:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</source>
+ <translation>ПроÑтой файл, Ñодержащий Ñтроки типа "Reviewed-By:", которые будут добавлены ниже редактора ÑообщениÑ.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>User fields configuration file:</source>
+ <translation>Файл наÑтройки полей:</translation>
</message>
</context>
<context>
@@ -1630,33 +1763,33 @@
<message>
<location/>
<source>&Case-sensitivity:</source>
- <translation>&Учёт региÑтра:</translation>
+ <translation>&Учитывать региÑÑ‚Ñ€:</translation>
</message>
<message>
<location/>
<source>Full</source>
- <translation>Полный</translation>
+ <translation>Ð’Ñегда</translation>
</message>
<message>
<location/>
<source>None</source>
- <translation>ОтÑутÑтвует</translation>
+ <translation>Ðикогда</translation>
</message>
<message>
<location/>
- <source>First letter</source>
- <translation>Только Ð¿ÐµÑ€Ð²Ð°Ñ Ð±ÑƒÐºÐ²Ð°</translation>
+ <source>Insert &space after function name</source>
+ <translation>&Ð’ÑтавлÑÑ‚ÑŒ пробел поÑле имени функции</translation>
</message>
<message>
<location/>
- <source>Insert &space after function name</source>
- <translation>&Ð’ÑтавлÑÑ‚ÑŒ пробел поÑле имени функции</translation>
+ <source>First Letter</source>
+ <translation>Первой буквы</translation>
</message>
</context>
<context>
<name>ContentWindow</name>
<message>
- <location filename="../../../src/shared/help/contentwindow.cpp" line="+136"/>
+ <location filename="../../../src/shared/help/contentwindow.cpp" line="+138"/>
<source>Open Link</source>
<translation>Открыть ÑÑылку</translation>
</message>
@@ -1669,9 +1802,9 @@
<context>
<name>Core</name>
<message>
- <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="+227"/>
+ <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="+236"/>
<source>Qt</source>
- <translation>Qt</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -1682,7 +1815,7 @@
<context>
<name>Core::BaseFileWizard</name>
<message>
- <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+160"/>
+ <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+162"/>
<source>Unable to create the directory %1.</source>
<translation>Ðевозможно Ñоздать каталог %1.</translation>
</message>
@@ -1697,7 +1830,7 @@
<translation>Ошибка при запиÑи в %1: %2</translation>
</message>
<message>
- <location line="+339"/>
+ <location line="+348"/>
<location line="+30"/>
<location line="+7"/>
<location line="+6"/>
@@ -1706,17 +1839,17 @@
</message>
<message>
<location line="-22"/>
- <location line="+120"/>
+ <location line="+125"/>
<source>Existing files</source>
<translation>СущеÑтвующие файлы</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Failed to open an editor for '%1'.</source>
<translation>Ðе удалоÑÑŒ открыть редактор Ð´Ð»Ñ '%1'.</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+18"/>
<source> [read only]</source>
<translation> [только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ]</translation>
</message>
@@ -1750,7 +1883,7 @@ Would you like to overwrite them?</source>
<context>
<name>Core::CommandMappings</name>
<message>
- <location filename="../../../src/plugins/coreplugin/actionmanager/commandmappings.cpp" line="+138"/>
+ <location filename="../../../src/plugins/coreplugin/actionmanager/commandmappings.cpp" line="+139"/>
<source>Command</source>
<translation>Команда</translation>
</message>
@@ -1771,30 +1904,31 @@ Would you like to overwrite them?</source>
<context>
<name>Core::EditorManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+225"/>
- <location line="+1531"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+226"/>
+ <location line="+1547"/>
<source>Revert to Saved</source>
<translation>Вернуть к Ñохранённому</translation>
</message>
<message>
- <location line="-1528"/>
- <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="+303"/>
+ <location line="-1544"/>
+ <location line="+97"/>
+ <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="+302"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-96"/>
<source>Close All</source>
<translation>Закрыть вÑÑ‘</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1327"/>
+ <location line="+1343"/>
<source>Close Others</source>
<translation>Закрыть другие</translation>
</message>
<message>
- <location line="-1326"/>
+ <location line="-1342"/>
<source>Next Open Document in History</source>
<translation>Следующий открытый документ в иÑтории</translation>
</message>
@@ -1805,7 +1939,7 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="+1"/>
- <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="-223"/>
+ <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="-222"/>
<source>Go Back</source>
<translation>Перейти назад</translation>
</message>
@@ -1826,12 +1960,12 @@ Would you like to overwrite them?</source>
<translation>Вернуть файл к Ñохранённому ÑоÑтоÑнию</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+28"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+17"/>
<source>Ctrl+Shift+W</source>
<translation>Ctrl+Shift+W</translation>
</message>
@@ -1906,22 +2040,22 @@ Would you like to overwrite them?</source>
<translation>Удалить вÑе разделениÑ</translation>
</message>
<message>
- <location line="+1149"/>
+ <location line="+1160"/>
<source>Save %1 &As...</source>
<translation>Сохранить %1 &как...</translation>
</message>
<message>
- <location line="-1165"/>
+ <location line="-1176"/>
<source>%1,2</source>
<translation>%1,2</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-65"/>
<source>Ctrl+F4</source>
<translation>Ctrl+F4</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+71"/>
<source>%1,3</source>
<translation>%1,3</translation>
</message>
@@ -1956,7 +2090,7 @@ Would you like to overwrite them?</source>
<translation>Alt+V,Alt+I</translation>
</message>
<message>
- <location line="+746"/>
+ <location line="+750"/>
<source>All Files (*)</source>
<translation>Ð’Ñе Файлы (*)</translation>
</message>
@@ -1988,12 +2122,12 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="+2"/>
- <location line="+135"/>
+ <location line="+138"/>
<source>Make writable</source>
<translation>Сделать запиÑываемым</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-134"/>
<source>Save as ...</source>
<translation>Сохранить как...</translation>
</message>
@@ -2014,12 +2148,12 @@ Would you like to overwrite them?</source>
<translation>Ðе удалоÑÑŒ разрешить запиÑÑŒ.</translation>
</message>
<message>
- <location line="+93"/>
+ <location line="+96"/>
<source><b>Warning:</b> You are changing a read-only file.</source>
<translation><b>Внимание:</b> Ð’Ñ‹ изменÑете файл, доÑтупный только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ.</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+21"/>
<source>&Save %1</source>
<translation>&Сохранить %1</translation>
</message>
@@ -2062,7 +2196,7 @@ Would you like to overwrite them?</source>
<context>
<name>Core::EditorToolBar</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="+197"/>
+ <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="+196"/>
<source>Copy full path to clipboard</source>
<translation>Скопировать полный путь в буфер обмена</translation>
</message>
@@ -2080,7 +2214,7 @@ Would you like to overwrite them?</source>
<context>
<name>Core::FileManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+517"/>
+ <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+514"/>
<source>Cannot save file</source>
<translation>Ðе удалоÑÑŒ Ñохранить файл</translation>
</message>
@@ -2110,10 +2244,18 @@ Would you like to overwrite them?</source>
<translation>Открыть файл</translation>
</message>
</context>
+<context>
+ <name>Core::InteractiveSshConnection</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/ssh/sshconnection.cpp" line="+231"/>
+ <source>Error sending input</source>
+ <translation>Ошибка отправки ввода</translation>
+ </message>
+</context>
<context>
<name>Core::Internal::ComboBox</name>
<message>
- <location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="+375"/>
+ <location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="+475"/>
<source>Activate %1</source>
<translation>Включить %1</translation>
</message>
@@ -2241,7 +2383,7 @@ Would you like to overwrite them?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../../../src/plugins/coreplugin/generalsettings.cpp" line="+67"/>
+ <location filename="../../../src/plugins/coreplugin/generalsettings.cpp" line="+68"/>
<source>General</source>
<translation>ОÑновные</translation>
</message>
@@ -2251,7 +2393,7 @@ Would you like to overwrite them?</source>
<translation><СиÑтемный></translation>
</message>
<message>
- <location line="+184"/>
+ <location line="+216"/>
<source>Restart required</source>
<translation>ТребуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк</translation>
</message>
@@ -2270,16 +2412,6 @@ Would you like to overwrite them?</source>
<source>When files are externally modified:</source>
<translation>Когда файлы изменены извне:</translation>
</message>
- <message>
- <location/>
- <source>Always ask</source>
- <translation>Ð’Ñегда Ñпрашивать</translation>
- </message>
- <message>
- <location/>
- <source>Ignore modifications</source>
- <translation>Игнорировать изменениÑ</translation>
- </message>
<message>
<location/>
<source>External file browser:</source>
@@ -2307,9 +2439,24 @@ Would you like to overwrite them?</source>
</message>
<message>
<location/>
- <source>Reload all unchanged editors</source>
+ <source>Default file encoding: </source>
+ <translation>Кодировка файла по умолчанию: </translation>
+ </message>
+ <message>
+ <location/>
+ <source>Always Ask</source>
+ <translation>Ð’Ñегда Ñпрашивать</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Reload All Unchanged Editors</source>
<translation>Перезагружать неизменённые</translation>
</message>
+ <message>
+ <location/>
+ <source>Ignore Modifications</source>
+ <translation>Игнорировать изменениÑ</translation>
+ </message>
</context>
<context>
<name>Core::Internal::MainWindow</name>
@@ -2339,7 +2486,7 @@ Would you like to overwrite them?</source>
<translation>&Окно</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+11"/>
<source>&Help</source>
<translation>Справ&ка</translation>
</message>
@@ -2392,7 +2539,7 @@ Would you like to overwrite them?</source>
<translation>Пе&чать...</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>E&xit</source>
<translation>В&ыход</translation>
</message>
@@ -2470,6 +2617,11 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="+11"/>
+ <source>&Views</source>
+ <translation>&Обзоры</translation>
+ </message>
+ <message>
+ <location line="+5"/>
<source>About &Qt Creator</source>
<translation>О программе &Qt Creator</translation>
</message>
@@ -2485,12 +2637,17 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="+25"/>
- <source>New...</source>
+ <source>New</source>
<comment>Title of dialog</comment>
- <translation>Ðовый...</translation>
+ <translation>Ðовый</translation>
+ </message>
+ <message>
+ <location line="+515"/>
+ <source>Open Project</source>
+ <translation>Открытие проекта</translation>
</message>
<message>
- <location line="+542"/>
+ <location line="+38"/>
<source>Settings...</source>
<translation>ÐаÑтройки...</translation>
</message>
@@ -2551,8 +2708,23 @@ Would you like to overwrite them?</source>
</message>
<message>
<location/>
- <source>1</source>
- <translation></translation>
+ <source>Choose a template:</source>
+ <translation>Выберите шаблон:</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/newdialog.cpp" line="+161"/>
+ <source>&Choose...</source>
+ <translation>&Выбрать...</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Projects</source>
+ <translation>Проекты</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Files and Classes</source>
+ <translation>Файлы и клаÑÑÑ‹</translation>
</message>
</context>
<context>
@@ -2592,7 +2764,7 @@ Would you like to overwrite them?</source>
<context>
<name>Core::Internal::OpenEditorsWindow</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/openeditorswindow.cpp" line="+203"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/openeditorswindow.cpp" line="+212"/>
<location line="+27"/>
<source>*</source>
<translation>*</translation>
@@ -2609,7 +2781,7 @@ Would you like to overwrite them?</source>
<context>
<name>Core::Internal::OutputPaneManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+206"/>
+ <location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+209"/>
<source>Output</source>
<translation>Вывод</translation>
</message>
@@ -2629,18 +2801,18 @@ Would you like to overwrite them?</source>
<translation>Предыдущий</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+199"/>
+ <location line="+5"/>
+ <location line="+195"/>
<source>Maximize Output Pane</source>
<translation>Развернуть панель вывода</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Output &Panes</source>
<translation>Панели в&ывода</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+131"/>
<source>Minimize Output Pane</source>
<translation>Свернуть панель вывода</translation>
</message>
@@ -2717,7 +2889,7 @@ Would you like to overwrite them?</source>
<context>
<name>Core::Internal::SettingsDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.cpp" line="+256"/>
+ <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.cpp" line="+271"/>
<source>Preferences</source>
<translation>ÐаÑтройки</translation>
</message>
@@ -2730,34 +2902,33 @@ Would you like to overwrite them?</source>
<context>
<name>Core::Internal::ShortcutSettings</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/shortcutsettings.cpp" line="+78"/>
+ <location filename="../../../src/plugins/coreplugin/dialogs/shortcutsettings.cpp" line="+77"/>
<source>Keyboard</source>
<translation>Клавиатура</translation>
</message>
<message>
- <location line="+23"/>
- <location line="+2"/>
+ <location line="+24"/>
<source>Keyboard Shortcuts</source>
<translation>Клавиатурные ÑокращениÑ</translation>
</message>
<message>
- <location line="-1"/>
- <source>Shortcut:</source>
- <translation type="unfinished">Клавиши:</translation>
+ <location line="+1"/>
+ <source>Key sequence:</source>
+ <translation>Сочетание клавиш:</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Shortcut</source>
- <translation type="unfinished">Клавиши</translation>
+ <translation>Сокращение</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+113"/>
<source>Import Keyboard Mapping Scheme</source>
<translation>Импорт Ñхемы разметки клавиатуры</translation>
</message>
<message>
<location line="+2"/>
- <location line="+41"/>
+ <location line="+49"/>
<source>Keyboard Mapping Scheme (*.kms)</source>
<translation>Схемы разметки клавиатуры (*.kms)</translation>
</message>
@@ -2770,7 +2941,7 @@ Would you like to overwrite them?</source>
<context>
<name>Core::Internal::SideBarWidget</name>
<message>
- <location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="-130"/>
+ <location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="-147"/>
<source>Split</source>
<translation>Разделить</translation>
</message>
@@ -2796,23 +2967,28 @@ Would you like to overwrite them?</source>
<translation>О Qt Creator</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+9"/>
+ <source>(%1)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>From revision %1<br/></source>
<extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment>
<translation>Ð ÐµÐ²Ð¸Ð·Ð¸Ñ %1<br/></translation>
</message>
<message>
<location line="+3"/>
- <source><h3>Qt Creator %1</h3>Based on Qt %2 (%3 bit)<br/><br/>Built on %4 at %5<br /><br/>%8<br/>Copyright 2008-%6 %7. All rights reserved.<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/></source>
- <translation><h3>Qt Creator %1</h3>ОÑнован на Qt %2 (%3-Ñ… битной)<br/><br/>Собран %4 в %5<br /><br/>%8<br/>Copyright 2008-%6 %7. All rights reserved.<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/></translation>
+ <source><h3>Qt Creator %1 %8</h3>Based on Qt %2 (%3 bit)<br/><br/>Built on %4 at %5<br /><br/>%9<br/>Copyright 2008-%6 %7. All rights reserved.<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/></source>
+ <translation><h3>Qt Creator %1 %8</h3>ОÑнован на Qt %2 (%3-Ñ… битной)<br/><br/>Собран %4 в %5<br /><br/>%9<br/>© 2008-%6 %7. Ð’Ñе права защищены.<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/></translation>
</message>
</context>
<context>
<name>Core::ModeManager</name>
<message>
<location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+180"/>
- <source>Switch to %1 mode</source>
- <translation>Переключить в режим %1</translation>
+ <source>Switch to <b>%1</b> mode</source>
+ <translation>Переключить в режим <b>%1</b></translation>
</message>
</context>
<context>
@@ -2830,6 +3006,55 @@ Would you like to overwrite them?</source>
<translation>ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°</translation>
</message>
</context>
+<context>
+ <name>Core::SftpConnection</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/ssh/sshconnection.cpp" line="+59"/>
+ <source>Error setting up SFTP subsystem</source>
+ <translation>Ошибка инициализации подÑиÑтемы SFTP</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <location line="+20"/>
+ <source>Could not open file '%1'</source>
+ <translation>Ðе удалоÑÑŒ открыть файл "%1"</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Could not uplodad file '%1'</source>
+ <translation>Ðе удалоÑÑŒ закачать файл "%1"</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Could not copy remote file '%1' to local file '%2'</source>
+ <translation>Ðе удалоÑÑŒ Ñкопировать удалённый файл "%1" в локальный "%2"</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Could not create remote directory</source>
+ <translation>Ðе удалоÑÑŒ Ñоздать удалённый каталог</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Could not remove remote directory</source>
+ <translation>Ðе удалоÑÑŒ удалить удалённый каталог</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Could not get remote directory contents</source>
+ <translation>Ðе удалоÑÑŒ получить Ñодержимое удалённого каталога</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Could not remove remote file</source>
+ <translation>Ðе удалоÑÑŒ удалить удалённый файл</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Could not change remote working directory</source>
+ <translation>Ðе удалоÑÑŒ Ñменить удалённый рабочий каталог</translation>
+ </message>
+</context>
<context>
<name>Core::StandardFileWizard</name>
<message>
@@ -2838,6 +3063,14 @@ Would you like to overwrite them?</source>
<translation>Ðовый %1</translation>
</message>
</context>
+<context>
+ <name>CppEditor</name>
+ <message>
+ <location filename="../../../src/plugins/cppeditor/cppeditorconstants.h" line="+63"/>
+ <source>C++</source>
+ <translation></translation>
+ </message>
+</context>
<context>
<name>CppEditor::Internal::CPPEditor</name>
<message>
@@ -2912,14 +3145,19 @@ Would you like to overwrite them?</source>
<context>
<name>CppEditor::Internal::CppPlugin</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+212"/>
- <source>C++</source>
- <translation>C++</translation>
+ <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+218"/>
+ <source>Creates a C++ header and a source file for a new class that you can add to a C++ project.</source>
+ <translation>Создание новых заголовочного и иÑходного файлов C++ под новый клаÑÑ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² проект C++.</translation>
</message>
<message>
- <location line="+13"/>
- <source>Creates a C++ header file.</source>
- <translation>Создание нового заголовочного файл C++.</translation>
+ <location line="+4"/>
+ <source>Creates a C++ source file that you can add to a C++ project.</source>
+ <translation>Создание нового иÑходного файла C++ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² проект C++.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Creates a C++ header file that you can add to a C++ project.</source>
+ <translation>Создание нового заголовочного файл C++ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² проект C++.</translation>
</message>
<message>
<location line="+1"/>
@@ -2942,12 +3180,12 @@ Would you like to overwrite them?</source>
<translation>Переименовать Ñимвол под курÑором</translation>
</message>
<message>
- <location line="-44"/>
- <source>Creates a C++ source file.</source>
- <translation>Создание нового иÑходного файла C++.</translation>
+ <location line="+12"/>
+ <source>Update Code Model</source>
+ <translation>Обновить модель кода</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-55"/>
<source>C++ Source File</source>
<translation>Файл иÑходных текÑтов C++</translation>
</message>
@@ -2957,12 +3195,7 @@ Would you like to overwrite them?</source>
<translation>КлаÑÑ C++</translation>
</message>
<message>
- <location line="+3"/>
- <source>Creates a header and a source file for a new class.</source>
- <translation>Создание заголовочного и иÑходного файлов Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ клаÑÑа.</translation>
- </message>
- <message>
- <location line="+41"/>
+ <location line="+44"/>
<source>Find Usages</source>
<translation>Ðайти иÑпользование</translation>
</message>
@@ -2971,11 +3204,6 @@ Would you like to overwrite them?</source>
<source>Ctrl+Shift+U</source>
<translation>Ctrl+Shift+U</translation>
</message>
- <message>
- <location line="+17"/>
- <source>Update code model</source>
- <translation>Обновить модель кода</translation>
- </message>
</context>
<context>
<name>CppFileSettingsPage</name>
@@ -2996,15 +3224,14 @@ Would you like to overwrite them?</source>
</message>
<message>
<location/>
- <source>License Template:</source>
- <translatorcomment>"Шаблон лицензии" обрезаетÑÑ</translatorcomment>
- <translation>ЛицензиÑ:</translation>
+ <source>License template:</source>
+ <translation>Шаблон лицензии:</translation>
</message>
</context>
<context>
<name>CppPreprocessor</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+543"/>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+580"/>
<source>%1: No such file or directory</source>
<translation>%1: Ðет такого файла или каталога</translation>
</message>
@@ -3025,7 +3252,7 @@ Would you like to overwrite them?</source>
<context>
<name>CppTools::Internal::CompletionSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cpptools/completionsettingspage.cpp" line="+60"/>
+ <location filename="../../../src/plugins/cpptools/completionsettingspage.cpp" line="+59"/>
<source>Completion</source>
<translation>Дополнение</translation>
</message>
@@ -3072,8 +3299,8 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="+62"/>
- <source>Choose a location for the new license template file</source>
- <translation>Выбор нового файла шаблона лицензии</translation>
+ <source>Choose Location for New License Template File</source>
+ <translation>Выбор Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ файла шаблона лицензии</translation>
</message>
<message>
<location line="+5"/>
@@ -3114,21 +3341,21 @@ Would you like to overwrite them?</source>
<context>
<name>CppTools::Internal::CppModelManager</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+333"/>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+334"/>
<source>Scanning</source>
<translatorcomment>Слово "Ñканирование" Ñлишком длинное</translatorcomment>
<translation>Ðнализ</translation>
</message>
<message>
<location line="+41"/>
- <source>Indexing</source>
- <translation>ИндекÑациÑ</translation>
+ <source>Parsing</source>
+ <translation>Разбор</translation>
</message>
</context>
<context>
<name>CppTools::Internal::CppToolsPlugin</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+128"/>
+ <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+129"/>
<source>&C++</source>
<translation>&C++</translation>
</message>
@@ -3141,17 +3368,68 @@ Would you like to overwrite them?</source>
<context>
<name>CppTools::Internal::FunctionArgumentWidget</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+453"/>
+ <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+413"/>
<source>%1 of %2</source>
<translation>%1 из %2</translation>
</message>
</context>
<context>
- <name>Debugger</name>
+ <name>CppTools::QuickFix</name>
<message>
- <source>Common</source>
- <translation type="obsolete">Общее</translation>
+ <location filename="../../../src/plugins/cppeditor/cppquickfix.cpp" line="+133"/>
+ <location line="+96"/>
+ <source>Rewrite Using %1</source>
+ <translation>ПерепиÑать Ñ Ð¸Ñпользованием %1</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Swap Operands</source>
+ <translation>ОбменÑÑ‚ÑŒ операнды</translation>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Rewrite Condition Using ||</source>
+ <translation>ПерепиÑать уÑловие иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ||</translation>
+ </message>
+ <message>
+ <location line="+61"/>
+ <source>Split Declaration</source>
+ <translation>Разделить объÑвление</translation>
+ </message>
+ <message>
+ <location line="+106"/>
+ <source>Add Curly Braces</source>
+ <translation>Добавить фигурные Ñкобки</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <location line="+63"/>
+ <source>Move Declaration out of Condition</source>
+ <translation>ВынеÑти обÑвление из уÑловиÑ</translation>
+ </message>
+ <message>
+ <location line="+85"/>
+ <source>Split if Statement</source>
+ <translation>Разделить оператор if</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Enclose in QLatin1String(...)</source>
+ <translation>Обернуть в QLatin1String(...)</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Convert to Objective-C String Literal</source>
+ <translation>Преобразовать в Ñтроковый литерал Objective-C</translation>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Use Fast String Concatenation with %</source>
+ <translation>ИÑпользовать быÑтрое объединение Ñтрок Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ %</translation>
</message>
+</context>
+<context>
+ <name>Debugger</name>
<message>
<location filename="../../../src/plugins/debugger/debuggerconstants.h" line="+59"/>
<source>General</source>
@@ -3163,7 +3441,7 @@ Would you like to overwrite them?</source>
<translation>Отладчик</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+699"/>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+701"/>
<source><Encoding error></source>
<translation><Ошибка кодировки></translation>
</message>
@@ -3184,18 +3462,18 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::DebuggerManager</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+489"/>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+509"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location line="+5"/>
- <location line="+1310"/>
+ <location line="+1315"/>
<source>Interrupt</source>
<translation>Прервать</translation>
</message>
<message>
- <location line="-1303"/>
+ <location line="-1308"/>
<source>Step Over</source>
<translation>Перейти через</translation>
</message>
@@ -3223,7 +3501,7 @@ Would you like to overwrite them?</source>
<message>
<location line="+3"/>
<source>Immediately Return From Inner Function</source>
- <translation type="unfinished">Ðемедленно выйти из функции</translation>
+ <translation>Ðемедленно выйти из функции</translation>
</message>
<message>
<location line="+2"/>
@@ -3253,28 +3531,27 @@ Would you like to overwrite them?</source>
<translation>Обратное направление</translation>
</message>
<message>
- <location line="+272"/>
+ <location line="+276"/>
<source>Running...</source>
<translation>Выполнение...</translation>
</message>
<message>
- <location line="+102"/>
- <location line="+21"/>
+ <location line="+90"/>
<source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
<translation>Изменение ÑоÑтоÑние точки оÑтанова требует или полноÑтью оÑтановленную программу, или полноÑтью запущенную.</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+36"/>
<source>The application requires the debugger engine '%1', which is disabled.</source>
<translation>Приложению требуетÑÑ Ð´Ð²Ð¸Ð¶Ð¾Ðº отладчика '%1', который выключен.</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+115"/>
<source>Starting debugger for tool chain '%1'...</source>
<translation>ЗапуÑкаетÑÑ Ð¾Ñ‚Ð»Ð°Ð´Ñ‡Ð¸Ðº из инÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ñ '%1'...</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+30"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
@@ -3284,7 +3561,7 @@ Would you like to overwrite them?</source>
<translation>Ðе удалоÑÑŒ отладить '%1' (инÑтрументарий: '%2'): %3</translation>
</message>
<message>
- <location line="-592"/>
+ <location line="-583"/>
<source>Abort Debugging</source>
<translation>Прервать отладку</translation>
</message>
@@ -3294,7 +3571,7 @@ Would you like to overwrite them?</source>
<translation>Прервать отладку и ÑброÑить отладчик в иÑходное ÑоÑтоÑние.</translation>
</message>
<message>
- <location line="+303"/>
+ <location line="+307"/>
<source>Stopped</source>
<translation>ОÑтановлен</translation>
</message>
@@ -3304,12 +3581,12 @@ Would you like to overwrite them?</source>
<translation>Завершён</translation>
</message>
<message>
- <location line="+481"/>
+ <location line="+475"/>
<source>Save Debugger Log</source>
<translation>Сохранить журнал отладчика</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+330"/>
<source>Turn off helper usage</source>
<translation>Ðе иÑпользовать помощника</translation>
</message>
@@ -3324,12 +3601,12 @@ Would you like to overwrite them?</source>
<translation>Помощник отладчика иÑпользуетÑÑ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹ некоторых типов данных Qt и Ñтандартной библиотеки к наглÑдному виду. Он должен быть Ñобран отдельно Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ верÑии Qt. Ðто можно Ñделать в параметрах Qt, выбрав профиль Qt и нажав на 'ПереÑобрать' в Ñтроке 'Помощник отладчика'.</translation>
</message>
<message>
- <location line="+173"/>
+ <location line="+177"/>
<source>Stop Debugger</source>
<translation>ОÑтановить отладчик</translation>
</message>
<message>
- <location line="-191"/>
+ <location line="-195"/>
<source>%1 (explicitly set in the Debugger Options)</source>
<translation>%1 (уÑтановлено в параметрах отладчика)</translation>
</message>
@@ -3352,27 +3629,17 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::DebuggerUISwitcher</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggeruiswitcher.cpp" line="+219"/>
- <source>Locked</source>
- <translation>ЗафикÑировано</translation>
- </message>
- <message>
- <location line="+12"/>
+ <location filename="../../../src/plugins/debugger/debuggeruiswitcher.cpp" line="+217"/>
<source>&Languages</source>
<translation>&Языки</translation>
</message>
<message>
- <location line="+4"/>
- <source>&Views</source>
- <translation>&Обзоры</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Reset to default layout</source>
- <translation>СброÑить в иÑходное ÑоÑтоÑние</translation>
+ <location line="+32"/>
+ <source>Alt+L</source>
+ <translation></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+49"/>
<source>Language</source>
<translation>Язык</translation>
</message>
@@ -3465,6 +3732,24 @@ Would you like to overwrite them?</source>
<translation>Обновить</translation>
</message>
</context>
+<context>
+ <name>Debugger::Internal::BinaryToolChainDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/gdbchooserwidget.cpp" line="+522"/>
+ <source>Select binary and toolchains</source>
+ <translation>Выбор программы и инÑтрументариÑ</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Gdb binary</source>
+ <translation>Программа gdb</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Path:</source>
+ <translation>Путь:</translation>
+ </message>
+</context>
<context>
<name>Debugger::Internal::BreakHandler</name>
<message>
@@ -3532,7 +3817,7 @@ Would you like to overwrite them?</source>
<message>
<location line="-22"/>
<source>Corrected Line Number:</source>
- <translation type="unfinished">Уточнённый номер Ñтроки:</translation>
+ <translation>ИÑправленный номер Ñтроки:</translation>
</message>
<message>
<location line="+2"/>
@@ -3547,7 +3832,7 @@ Would you like to overwrite them?</source>
<translation>КоличеÑтво пропуÑков:</translation>
</message>
<message>
- <location line="+227"/>
+ <location line="+234"/>
<source>Number</source>
<translation>Ðомер</translation>
</message>
@@ -3595,7 +3880,7 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::Internal::BreakWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/breakwindow.cpp" line="+88"/>
+ <location filename="../../../src/plugins/debugger/breakwindow.cpp" line="+89"/>
<source>Breakpoints</source>
<translation>Точки оÑтанова</translation>
</message>
@@ -3640,12 +3925,22 @@ Would you like to overwrite them?</source>
<translation>СоглаÑовать точки оÑтанова</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+10"/>
+ <source>Disable Selected Breakpoints</source>
+ <translation>Выключить выбранную точку оÑтанова</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Enable Selected Breakpoints</source>
+ <translation>Включить выбранную точку оÑтанова</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Disable Breakpoint</source>
<translation>Отключить точку оÑтанова</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Enable Breakpoint</source>
<translation>Включить точку оÑтанова</translation>
</message>
@@ -3694,7 +3989,7 @@ Would you like to overwrite them?</source>
<translation>Сбой функции "%1()": %2</translation>
</message>
<message>
- <location line="+222"/>
+ <location line="+225"/>
<source>Version: %1</source>
<translation>ВерÑиÑ: %1</translation>
</message>
@@ -3729,7 +4024,7 @@ Would you like to overwrite them?</source>
<translation>ПроцеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %1.</translation>
</message>
<message>
- <location line="+177"/>
+ <location line="+181"/>
<source>Continuing with '%1'...</source>
<translation>Продолжение '%1'...</translation>
</message>
@@ -3779,7 +4074,7 @@ Would you like to overwrite them?</source>
<translation>Ðевозможно приÑвоить '%2' значение '%1': %3</translation>
</message>
<message>
- <location line="+184"/>
+ <location line="+187"/>
<source>Unable to retrieve %1 bytes of memory at 0x%2: %3</source>
<translation>Ðе удалоÑÑŒ получить %1 байт памÑти Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ 0x%2: %3</translation>
</message>
@@ -3800,7 +4095,7 @@ Would you like to overwrite them?</source>
<translation>ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° оÑтанова пропущена...</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+58"/>
<source>Interrupted in thread %1, current thread: %2</source>
<translation>Прервано в потоке %1, текущий поток: %2</translation>
</message>
@@ -3815,14 +4110,29 @@ Would you like to overwrite them?</source>
<translation>Смена потоков: %1 -> %2</translation>
</message>
<message>
- <location line="+84"/>
- <source>Thread %1: Missing debug information for top stack frame (%2).</source>
- <translation>Поток %1: ОтÑутÑтвует Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ вершине кадра Ñтека (%2).</translation>
+ <location line="+57"/>
+ <source>Stopped at %1:%2 in thread %3.</source>
+ <translation>ОÑтановлено на %1:%2 в потоке %3.</translation>
</message>
<message>
- <location line="+1"/>
- <source>Thread %1: No debug information available (%2).</source>
- <translation>Поток %1: ÐžÑ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупна (%2).</translation>
+ <location line="+5"/>
+ <source>Stopped at %1 in thread %2 (missing debug information).</source>
+ <translation>ОÑтановлено на %1 в потоке %2 (нет отладочной информации).</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Stopped at %1 (%2) in thread %3 (missing debug information).</source>
+ <translation>ОÑтановлено на %1 (%2) в потоке %3 (нет отладочной информации).</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Stopped in thread %1 (missing debug information).</source>
+ <translation>ОÑтановлено в потоке %1 (нет отладочной информации).</translation>
+ </message>
+ <message>
+ <location line="+112"/>
+ <source>Breakpoint: %1</source>
+ <translation>Точка оÑтановка: %1</translation>
</message>
</context>
<context>
@@ -4022,7 +4332,7 @@ Would you like to terminate it?</source>
<context>
<name>Debugger::Internal::DebuggerPlugin</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+317"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+315"/>
<source>Option '%1' is missing the parameter.</source>
<translation>У наÑтройки '%1' пропущен параметр.</translation>
</message>
@@ -4077,7 +4387,7 @@ Would you like to terminate it?</source>
<translation>СброÑить отладчик</translation>
</message>
<message>
- <location line="+194"/>
+ <location line="+196"/>
<source>Threads:</source>
<translation>Потоки:</translation>
</message>
@@ -4087,7 +4397,7 @@ Would you like to terminate it?</source>
<translation>Подключение к PID %1.</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+100"/>
<source>Remove Breakpoint</source>
<translation>Удалить точки оÑтанова</translation>
</message>
@@ -4107,7 +4417,7 @@ Would you like to terminate it?</source>
<translation>УÑтановить точку оÑтанова</translation>
</message>
<message>
- <location line="+232"/>
+ <location line="+253"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
@@ -4117,7 +4427,7 @@ Would you like to terminate it?</source>
<translation>Ðевозможно подключитьÑÑ Ðº PID 0</translation>
</message>
<message>
- <location line="-332"/>
+ <location line="-364"/>
<source>Attaching to core %1.</source>
<translation>Подключение к дампу %1.</translation>
</message>
@@ -4125,7 +4435,7 @@ Would you like to terminate it?</source>
<context>
<name>Debugger::Internal::DebuggerRunControl</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+199"/>
+ <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+207"/>
<source>Debugger</source>
<translation>Отладчик</translation>
</message>
@@ -4133,7 +4443,7 @@ Would you like to terminate it?</source>
<context>
<name>Debugger::Internal::DebuggerRunControlFactory</name>
<message>
- <location line="-125"/>
+ <location line="-133"/>
<source>Debug</source>
<translation>Отладка</translation>
</message>
@@ -4218,12 +4528,12 @@ Would you like to terminate it?</source>
<message>
<location line="+14"/>
<source>Show "std::" Namespace in Types</source>
- <translation type="unfinished">Показывать проÑтранÑтво имён "std::" в типах</translation>
+ <translation>Показывать проÑтранÑтво имён "std::" в типах</translation>
</message>
<message>
<location line="+8"/>
<source>Show Qt's Namespace in Types</source>
- <translation type="unfinished">Показывать проÑтранÑтво имён Qt в типах</translation>
+ <translation>Показывать проÑтранÑтво имён Qt в типах</translation>
</message>
<message>
<location line="+11"/>
@@ -4406,17 +4716,40 @@ Would you like to terminate it?</source>
</message>
</context>
<context>
- <name>Debugger::Internal::GdbEngine</name>
+ <name>Debugger::Internal::GdbChooserWidget</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+295"/>
- <source>The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
- <translation>ПроцеÑÑ Gdb не Ñмог запуÑтитьÑÑ. Или Ð²Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° '%1' отÑутÑтвует, или у Ð²Ð°Ñ Ð½ÐµÑ‚ прав на ее вызов.</translation>
+ <location filename="../../../src/plugins/debugger/gdb/gdbchooserwidget.cpp" line="-378"/>
+ <source>Binary</source>
+ <translation>Программа</translation>
</message>
<message>
- <location line="+5"/>
- <source>The Gdb process crashed some time after starting successfully.</source>
- <translation>ПроцеÑÑ Gdb вылетел через некоторое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ñле уÑпешного запуÑка.</translation>
- </message>
+ <location line="+0"/>
+ <source>Toolchains</source>
+ <translation>ИнÑтрументарий</translation>
+ </message>
+ <message>
+ <location line="+186"/>
+ <source>Duplicate binary</source>
+ <translation type="unfinished">Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The binary '%1' already exists.</source>
+ <translation>Программа "%1" уже приÑутÑтвует.</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::GdbEngine</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+290"/>
+ <source>The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
+ <translation>ПроцеÑÑ Gdb не Ñмог запуÑтитьÑÑ. Или Ð²Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° "%1" отÑутÑтвует, или у Ð²Ð°Ñ Ð½ÐµÑ‚ прав на её вызов.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The Gdb process crashed some time after starting successfully.</source>
+ <translation>ПроцеÑÑ Gdb вылетел через некоторое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ñле уÑпешного запуÑка.</translation>
+ </message>
<message>
<location line="+3"/>
<source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
@@ -4435,7 +4768,7 @@ Would you like to terminate it?</source>
<message>
<location line="+140"/>
<source>Thread group %1 created.</source>
- <translation>Группа потоков %1 Ñоздана.</translation>
+ <translation type="unfinished">Группа потоков %1 Ñоздана.</translation>
</message>
<message>
<location line="+76"/>
@@ -4443,9 +4776,9 @@ Would you like to terminate it?</source>
<translation>Чтение %1...</translation>
</message>
<message>
- <location line="+265"/>
+ <location line="+270"/>
<source>Stopping temporarily.</source>
- <translation>Временно оÑтановлено.</translation>
+ <translation type="unfinished">Временно оÑтановлено.</translation>
</message>
<message>
<location line="+70"/>
@@ -4457,20 +4790,20 @@ You can choose between waiting longer or abort debugging.</source>
<message>
<location line="+49"/>
<source>Process failed to start.</source>
- <translation>Ðе удалоÑÑŒ запуÑтить процеÑÑ.</translation>
+ <translation type="unfinished">Ðе удалоÑÑŒ запуÑтить процеÑÑ.</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+183"/>
<source>Jumped. Stopped.</source>
- <translation>Переход Ñделан. ОÑтановлено.</translation>
+ <translation type="unfinished">Переход Ñделан. ОÑтановлено.</translation>
</message>
<message>
- <location line="-280"/>
+ <location line="-289"/>
<source>Processing queued commands.</source>
- <translation>Обработка очереди команд.</translation>
+ <translation type="unfinished">Обработка очереди команд.</translation>
</message>
<message>
- <location line="-375"/>
+ <location line="-380"/>
<source>Library %1 loaded</source>
<translation>Библиотека %1 загружена</translation>
</message>
@@ -4500,7 +4833,7 @@ You can choose between waiting longer or abort debugging.</source>
<translation>Выбран поток %1</translation>
</message>
<message>
- <location line="+715"/>
+ <location line="+729"/>
<source>Application exited with exit code %1</source>
<translation>Приложение завершилоÑÑŒ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %1</translation>
</message>
@@ -4532,36 +4865,31 @@ You can choose between waiting longer or abort debugging.</source>
<message>
<location line="+2"/>
<source>Stopped: %1 by signal %2</source>
- <translation type="unfinished">ОÑтановлено по причине %1 (Ñигнал %2)</translation>
+ <translation>ОÑтановлено по причине %1 (Ñигнал %2)</translation>
</message>
<message>
<location line="+6"/>
- <location line="+156"/>
+ <location line="+108"/>
<source>Stopped.</source>
<translation>ОÑтановлено.</translation>
</message>
<message>
- <location line="-181"/>
+ <location line="-133"/>
<source>Stopped: "%1"</source>
<translation>ОÑтановлено: "%1"</translation>
</message>
<message>
- <location line="+123"/>
- <source>The debugger you are using identifies itself as:</source>
- <translation>Отладчик, иÑпользуемый вами, определÑет ÑÐµÐ±Ñ ÐºÐ°Ðº:</translation>
- </message>
- <message>
- <location line="+311"/>
+ <location line="+391"/>
<source>Continuing after temporary stop...</source>
<translation>Продолжение поÑле временного оÑтанова...</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="+687"/>
+ <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="+689"/>
<source>The debugging helper library was not found at %1.</source>
<translation>Библиотека помощника отладчика не обнаружена в %1.</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+2283"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+2143"/>
<source>Unable to start gdb '%1': %2</source>
<translation>Ðе удалоÑÑŒ запуÑтить gdb '%1': %2</translation>
</message>
@@ -4571,7 +4899,7 @@ You can choose between waiting longer or abort debugging.</source>
<translation>Ðе удалоÑÑŒ запуÑтить адаптер</translation>
</message>
<message>
- <location line="-1348"/>
+ <location line="-1203"/>
<location line="+15"/>
<source>Snapshot Creation Error</source>
<translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñнимка</translation>
@@ -4601,17 +4929,17 @@ Do you want to stop the debugged process and load the selected snapshot?</source
Желаете оÑтановить отлаживаемую программу и загрузить выбранный Ñнимок?</translation>
</message>
<message>
- <location line="+437"/>
+ <location line="+378"/>
<source>Finished retrieving data</source>
<translation>Закончено получение данных</translation>
</message>
<message>
- <location line="+667"/>
+ <location line="-1605"/>
<source>There is no gdb binary available for '%1'</source>
<translation>ОтÑутÑтвует программа gdb Ð´Ð»Ñ "%1"</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+2326"/>
<source>Cannot find debugger initialization script</source>
<translation>Ðе удалоÑÑŒ найти Ñкрипт инициализации отладчика</translation>
</message>
@@ -4621,7 +4949,7 @@ Do you want to stop the debugged process and load the selected snapshot?</source
<translation>Ð’ наÑтройках указан файл Ñкрипта '%1', который ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ´Ð¾Ñтупен. ЕÑли файл Ñкрипта не обÑзателен, проÑто очиÑтите поле, чтобы не было Ñтого предупреждениÑ.</translation>
</message>
<message>
- <location line="-1626"/>
+ <location line="-1481"/>
<source>Unable to run '%1': %2</source>
<translation>Ðе удалоÑÑŒ запуÑтить '%1': %2</translation>
</message>
@@ -4641,7 +4969,7 @@ Do you want to stop the debugged process and load the selected snapshot?</source
</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="-2391"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="-2367"/>
<source>An unknown error in the Gdb process occurred. </source>
<translation>ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° возникла у процеÑÑа Gdb. </translation>
</message>
@@ -4651,19 +4979,19 @@ Do you want to stop the debugged process and load the selected snapshot?</source
<translation>Потребована оÑтановка...</translation>
</message>
<message>
- <location line="+235"/>
+ <location line="+240"/>
<location line="+29"/>
<location line="+3"/>
<source>Executable failed</source>
<translation>Программа завершилаÑÑŒ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹</translation>
</message>
<message>
- <location line="-367"/>
+ <location line="-372"/>
<source>Running...</source>
<translation>Выполнение...</translation>
</message>
<message>
- <location line="+293"/>
+ <location line="+298"/>
<source>Gdb not responding</source>
<translation>Gdb не отвечает</translation>
</message>
@@ -4684,14 +5012,14 @@ Do you want to stop the debugged process and load the selected snapshot?</source
<translation>Программа завершилаÑÑŒ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹: %1</translation>
</message>
<message>
- <location line="+123"/>
+ <location line="+132"/>
<source><unknown></source>
<translation type="unfinished"><неизвеÑтно></translation>
</message>
<message>
<location line="+317"/>
<source>Stopped at breakpoint %1 in thread %2.</source>
- <translation>ОÑтановлено на точке оÑтанова %1 потока %2.</translation>
+ <translation type="unfinished">ОÑтановлено на точке оÑтанова %1 потока %2.</translation>
</message>
<message>
<location line="+17"/>
@@ -4706,24 +5034,15 @@ Do you want to stop the debugged process and load the selected snapshot?</source
<translation> <ÐеизвеÑтно></translation>
</message>
<message>
- <location line="+110"/>
- <source>This version is not officially supported by Qt Creator.
-Debugging will most likely not work well.
-Using gdb 7.1 or later is strongly recommended.</source>
- <translation>Qt Creator не поддерживает официально Ñту верÑию.
-Отладка может не работать.
-ÐаÑтоÑтельно рекомендуетÑÑ Ð¸Ñпользование gdb верÑии не ниже 7.1.</translation>
- </message>
- <message>
- <location line="+62"/>
- <location line="+292"/>
+ <location line="+124"/>
+ <location line="+297"/>
<location line="+63"/>
<source>Execution Error</source>
<translation>Ошибка выполнениÑ</translation>
</message>
<message>
- <location line="-354"/>
- <location line="+292"/>
+ <location line="-359"/>
+ <location line="+297"/>
<location line="+63"/>
<source>Cannot continue debugged process:
</source>
@@ -4731,17 +5050,17 @@ Using gdb 7.1 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location line="-254"/>
+ <location line="-259"/>
<source>Failed to shut down application</source>
<translation>Ðе удалоÑÑŒ закрыть приложение</translation>
</message>
<message>
- <location line="+106"/>
+ <location line="+110"/>
<source>Launching</source>
<translation>ЗапуÑк</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Running requested...</source>
<translation>Потребован запуÑк...</translation>
</message>
@@ -4786,9 +5105,9 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation>Потребован немедленный выход из функции...</translation>
</message>
<message>
- <location line="+401"/>
+ <location line="+406"/>
<source>ATTEMPT BREAKPOINT SYNC</source>
- <translation></translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+229"/>
@@ -4803,7 +5122,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation>Выход из подложного кадра...</translation>
</message>
<message numerus="yes">
- <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="-586"/>
+ <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="-588"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
<translation>
<numerusform>Получение наблюдаемых данных (%n Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ‚ÑÑ)...</numerusform>
@@ -4812,17 +5131,17 @@ Using gdb 7.1 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location line="+592"/>
+ <location line="+594"/>
<source>Debugging helpers not found.</source>
<translation>Помощники отладчика не найдены.</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+686"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+608"/>
<source>Custom dumper setup: %1</source>
<translation>ÐаÑтройка пользовательÑкого дампера: %1</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="-267"/>
+ <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="-268"/>
<source><0 items></source>
<translation><0 Ñлементов></translation>
</message>
@@ -4837,12 +5156,12 @@ Using gdb 7.1 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+130"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+52"/>
<source><shadowed></source>
<translation><затенено></translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="+348"/>
+ <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="+349"/>
<source><n/a></source>
<translation><н/д></translation>
</message>
@@ -4858,15 +5177,15 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation><нет информации></translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+310"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+322"/>
<location line="+26"/>
<location line="+15"/>
- <location line="+60"/>
+ <location line="+61"/>
<source>Disassembler failed: %1</source>
<translation>Ðе удалоÑÑŒ дизаÑÑемблировать: %1</translation>
</message>
<message>
- <location line="+206"/>
+ <location line="+204"/>
<source>Gdb I/O Error</source>
<translation>Ошибка вводы/вывода gdb</translation>
</message>
@@ -4924,10 +5243,6 @@ Using gdb 7.1 or later is strongly recommended.</source>
<source>Gdb</source>
<translation>Gdb</translation>
</message>
- <message>
- <source>Choose Gdb Location</source>
- <translation type="obsolete">Выбор Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Gdb</translation>
- </message>
<message>
<location line="+24"/>
<source>Choose Location of Startup Script File</source>
@@ -4944,7 +5259,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<message>
<location line="+16"/>
<source>No memory viewer available</source>
- <translation>ПроÑмотрщик памÑти отÑутÑтвует</translation>
+ <translation>Ðе доÑтупна программа проÑмотра памÑти</translation>
</message>
<message>
<location line="+1"/>
@@ -4955,7 +5270,17 @@ Using gdb 7.1 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::ModulesModel</name>
<message>
- <location filename="../../../src/plugins/debugger/moduleshandler.cpp" line="+87"/>
+ <location filename="../../../src/plugins/debugger/moduleshandler.cpp" line="+90"/>
+ <source>yes</source>
+ <translation>да</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation>нет</translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>Module name</source>
<translation>Ðазвание модулÑ</translation>
</message>
@@ -4983,7 +5308,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation>Модули</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Update Module List</source>
<translation>Обновить ÑпиÑок модулей</translation>
</message>
@@ -5076,6 +5401,74 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation>Ðе удалоÑÑŒ открыть FiFo %1: %2</translation>
</message>
</context>
+<context>
+ <name>Debugger::Internal::PdbEngine</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/pdb/pdbengine.cpp" line="+155"/>
+ <source>Running requested...</source>
+ <translation>Потребовано выполнение...</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Unable to start pdb '%1': %2</source>
+ <translation>Ðе удалоÑÑŒ запуÑтить pdb "%1": %2</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Adapter start failed</source>
+ <translation>Ðе удалоÑÑŒ запуÑтить адаптер</translation>
+ </message>
+ <message>
+ <location line="+263"/>
+ <source>'%1' contains no identifier</source>
+ <translation>"%1" не Ñодержит идентификаторов</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>String literal %1</source>
+ <translation>Строковый литерал %1</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
+ <translation>Робкий отказ вычиÑлить выражение "%1" Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼Ð¸ побочными Ñффектами</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Pdb I/O Error</source>
+ <translation>Ошибка вводы/вывода pdb</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The Pdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
+ <translation>ПроцеÑÑ Pdb не Ñмог запуÑтитьÑÑ. Или Ð²Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° "%1" отÑутÑтвует, или у Ð²Ð°Ñ Ð½ÐµÑ‚ прав на её вызов.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The Pdb process crashed some time after starting successfully.</source>
+ <translation>ПроцеÑÑ Pdb вылетел через некоторое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ñле уÑпешного запуÑка.</translation>
+ </message>
+ <message>
+ <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="+4"/>
+ <source>An error occurred when attempting to write to the Pdb process. For example, the process may not be running, or it may have closed its input channel.</source>
+ <translation>Возникла ошибка при отправке данных процеÑÑу Pdb. Ðапример, процеÑÑ Ð¼Ð¾Ð¶ÐµÑ‚ уже не работать или он мог закрыть Ñвой входной канал.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>An error occurred when attempting to read from the Pdb process. For example, the process may not be running.</source>
+ <translation>Возникла ошибка при получении данных от процеÑÑа Pdb. Ðапример, процеÑÑ Ð¼Ð¾Ð¶ÐµÑ‚ уже не работать.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>An unknown error in the Pdb process occurred. </source>
+ <translation>ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° возникла у процеÑÑа Pdb. </translation>
+ </message>
+</context>
<context>
<name>Debugger::Internal::PlainGdbAdapter</name>
<message>
@@ -5112,7 +5505,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation>РегиÑтры</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+22"/>
<source>Reload Register Listing</source>
<translation>Перезагрузить ÑпиÑок региÑтров</translation>
</message>
@@ -5314,7 +5707,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::SourceFilesWindow</name>
<message>
- <location line="+74"/>
+ <location line="+75"/>
<source>Source Files</source>
<translation>Файлы иÑходных текÑтов</translation>
</message>
@@ -5411,7 +5804,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::StackWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+63"/>
+ <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+64"/>
<source>Stack</source>
<translation>Стек</translation>
</message>
@@ -5546,7 +5939,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::ThreadsWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+49"/>
+ <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+50"/>
<source>Thread</source>
<translation>Поток</translation>
</message>
@@ -5562,89 +5955,53 @@ Using gdb 7.1 or later is strongly recommended.</source>
</message>
</context>
<context>
- <name>Debugger::Internal::TrkGdbAdapter</name>
- <message>
- <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1738"/>
- <source>Unable to acquire a device on '%1'. It appears to be in use.</source>
- <translation>Ðе удалоÑÑŒ получить доÑтуп к уÑтройÑтву через "%1". Возможно, оно уже иÑпользуетÑÑ.</translation>
- </message>
- <message>
- <location line="+120"/>
- <source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
- <translation>ПроцеÑÑ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½, PID: 0x%1, ID потока: 0x%2, Ñегмент кода: 0x%3, Ñегмент данных: 0x%4.</translation>
- </message>
+ <name>Debugger::Internal::ToolChainSelectorWidget</name>
<message>
- <location line="+40"/>
- <source>Connecting to TRK server adapter failed:
-</source>
- <translation>Ðе удалоÑÑŒ подключитьÑÑ Ðº адаптеру TRK Ñервера:
-</translation>
+ <location filename="../../../src/plugins/debugger/gdb/gdbchooserwidget.cpp" line="+83"/>
+ <source>Desktop/General</source>
+ <translation>ÐаÑтольный/Стандартный</translation>
</message>
-</context>
-<context>
- <name>Debugger::Internal::TrkOptionsPage</name>
<message>
- <source>Symbian TRK</source>
- <translation type="obsolete">Symbian TRK</translation>
+ <location line="+1"/>
+ <source>Symbian</source>
+ <translation></translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+59"/>
- <source>Symbian</source>
+ <location line="+1"/>
+ <source>Maemo</source>
<translation></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>
- <source>Communication</source>
- <translation type="obsolete">СвÑзь</translation>
- </message>
- <message>
- <location/>
- <source>Serial Port</source>
- <translation>ПоÑледовательный порт</translation>
- </message>
+ <name>Debugger::Internal::TrkGdbAdapter</name>
<message>
- <location/>
- <source>Bluetooth</source>
- <translation>Bluetooth</translation>
+ <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1723"/>
+ <source>Port specification missing.</source>
+ <translation>ОтÑутÑтвует ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿Ð¾Ñ€Ñ‚Ð°.</translation>
</message>
<message>
- <location/>
- <source>Port:</source>
- <translation>Порт:</translation>
+ <location line="+6"/>
+ <source>Unable to acquire a device on '%1'. It appears to be in use.</source>
+ <translation>Ðе удалоÑÑŒ получить доÑтуп к уÑтройÑтву через "%1". Возможно, оно уже иÑпользуетÑÑ.</translation>
</message>
<message>
- <location/>
- <source>Device:</source>
- <translation>УÑтройÑтво:</translation>
+ <location line="+118"/>
+ <source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
+ <translation>ПроцеÑÑ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½, PID: 0x%1, ID потока: 0x%2, Ñегмент кода: 0x%3, Ñегмент данных: 0x%4.</translation>
</message>
<message>
- <location/>
- <source>Device Communication</source>
- <translation>СвÑзь Ñ ÑƒÑтройÑтвом</translation>
+ <location line="+40"/>
+ <source>Connecting to TRK server adapter failed:
+</source>
+ <translation>Ðе удалоÑÑŒ подключитьÑÑ Ðº адаптеру TRK Ñервера:
+</translation>
</message>
</context>
<context>
<name>Debugger::Internal::WatchData</name>
<message>
+ <location filename="../../../src/plugins/debugger/watchdata.cpp" line="+246"/>
<location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+74"/>
- <location line="+258"/>
<source><not in scope></source>
<translation><вне облаÑти></translation>
</message>
@@ -5692,7 +6049,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation>Поколение</translation>
</message>
<message>
- <location line="+1040"/>
+ <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+1083"/>
<source>unknown address</source>
<translation>неизвеÑтный адреÑ</translation>
</message>
@@ -5702,22 +6059,22 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation type="unfinished">Объект типа %1 по адреÑу %2</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+209"/>
<source><Edit></source>
- <translation><Измените></translation>
+ <translation><Изменить></translation>
</message>
<message>
- <location line="-1208"/>
+ <location line="-1250"/>
<source>Root</source>
<translation>Корень</translation>
</message>
<message>
- <location line="-48"/>
+ <location filename="../../../src/plugins/debugger/watchdata.cpp" line="-11"/>
<source>Name</source>
<translation>ИмÑ</translation>
</message>
<message>
- <location line="+54"/>
+ <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+6"/>
<source>Locals</source>
<translation>Локальные переменные</translation>
</message>
@@ -5735,7 +6092,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::WatchModel</name>
<message>
- <location line="+455"/>
+ <location line="+489"/>
<source>decimal</source>
<translation>деÑÑтичный</translation>
</message>
@@ -5798,7 +6155,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::WatchWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+130"/>
+ <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+131"/>
<source>Locals and Watchers</source>
<translation>Переменные</translation>
</message>
@@ -5828,17 +6185,17 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation>Сменить формат объекта</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+10"/>
<source>Insert New Watch Item</source>
<translation>Ð’Ñтавить новый наблюдаемый Ñлемент</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Select Widget to Watch</source>
<translation>Выбрать виджет Ð´Ð»Ñ ÑлежениÑ</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Open Memory Editor...</source>
<translation>Открыть редактор памÑти...</translation>
</message>
@@ -5848,7 +6205,7 @@ Using gdb 7.1 or later is strongly recommended.</source>
<translation>Открыть редактор памÑти Ñ %1</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Refresh Code Model Snapshot</source>
<translation>Обновить образ модели кода</translation>
</message>
@@ -5904,28 +6261,18 @@ Using gdb 7.1 or later is strongly recommended.</source>
<source>Use code model</source>
<translation>ИÑпользовать модель кода</translation>
</message>
- <message>
- <source>Use Debugging helper</source>
- <translation type="obsolete">ИÑпользовать помощник отладчика</translation>
- </message>
<message>
<location/>
- <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> The debugging helper in only used to produce a nice display of objects of certain type like QString or std::map in the &quot;Locals and Watchers&quot; view.</p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">It is not strictly necessary for debugging with Qt Creator.</p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></source>
- <translation><html><body style="font-size:9pt;">
-<p><b>Справка:</b> Помощник отладчика иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð³Ð¾ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð² некоторых типов, вроде QString и std::map в обзоре &quot;Переменные&quot; режима отладки.</p>
-<p>Он не ÑвлÑетÑÑ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¼ Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Qt Creator.</p>
-</body></html></translation>
+ <source><html><head/><body>
+<p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Watchers&quot; view.</p>
+<p> It is not strictly necessary for debugging with Qt Creator. </p></body></html></source>
+ <translation><html><head/><body>
+<p>Помощник отладчика иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð³Ð¾ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð² некоторых типов, вроде QString и std::map в обзоре &quot;Переменные&quot; режима отладки.</p>
+<p>Он не ÑвлÑетÑÑ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¼ Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Qt Creator.</p></body></html></translation>
</message>
<message>
<location/>
- <source>Use debugging helper</source>
+ <source>Use Debugging Helper</source>
<translation>ИÑпользовать помощник отладчика</translation>
</message>
</context>
@@ -6040,11 +6387,6 @@ Rebuilding the project might help.</source>
<source>Aggregation</source>
<translation>ÐгрегациÑ</translation>
</message>
- <message>
- <location/>
- <source>Multiple Inheritance</source>
- <translation>МножеÑтвенное наÑледование</translation>
- </message>
<message>
<location/>
<source>Code Generation</source>
@@ -6060,6 +6402,11 @@ Rebuilding the project might help.</source>
<source>Use Qt module name in #include-directive</source>
<translation>ИÑпользовать в директиве #include название Ð¼Ð¾Ð´ÑƒÐ»Ñ Qt</translation>
</message>
+ <message>
+ <location/>
+ <source>Multiple inheritance</source>
+ <translation>МножеÑтвенное наÑледование</translation>
+ </message>
</context>
<context>
<name>Designer::Internal::FormClassWizardDialog</name>
@@ -6106,13 +6453,13 @@ Rebuilding the project might help.</source>
<name>Designer::Internal::FormEditorFactory</name>
<message>
<location filename="../../../src/plugins/designer/formeditorfactory.cpp" line="+93"/>
- <source>This file can only be edited in Design Mode.</source>
- <translation>Ðтот файл можно редактировать только в режиме дизайна.</translation>
+ <source>This file can only be edited in <b>Design</b> mode.</source>
+ <translation>Ðтот файл можно редактировать только в режиме <b>дизайна</b>.</translation>
</message>
<message>
<location line="+1"/>
- <source>Open Designer</source>
- <translation>Открыть дизайнер</translation>
+ <source>Switch mode</source>
+ <translation>Переключить режим</translation>
</message>
</context>
<context>
@@ -6124,18 +6471,18 @@ Rebuilding the project might help.</source>
</message>
<message>
<location line="+2"/>
- <source>Creates a Qt Designer form file (.ui).</source>
- <translation>Создание файла формы Qt Designer (.ui).</translation>
+ <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt C++ Project.</source>
+ <translation>Создание формы дизайнера Qt и ÑоответÑтвующего клаÑÑа (иÑходный и заголовочный файлы C++) Ð´Ð»Ñ Ñ€ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸. Их можно будет добавить к ÑущеÑтвующему проекту Qt C++.</translation>
</message>
<message>
- <location line="+5"/>
- <source>Qt Designer Form Class</source>
- <translation>КлаÑÑ Ñ„Ð¾Ñ€Ð¼Ñ‹ Qt Designer</translation>
+ <location line="+8"/>
+ <source>Creates a Qt Designer form that you can add to a Qt C++ project. This is useful if you already have an existing class for the UI business logic.</source>
+ <translation type="unfinished">Создание формы дизайнера Qt Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ðº ÑущеÑтвующему проекту Qt C++. Ðто полезно в Ñлучае, еÑли уже имеетÑÑ ÐºÐ»Ð°ÑÑ Ð±Ð¸Ð·Ð½ÐµÑ-логики интерфеÑа пользователÑ.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Creates a Qt Designer form file (.ui) with a matching class.</source>
- <translation>Создание файла формы Qt Designer (.ui) и ÑоответÑтвующего клаÑÑа.</translation>
+ <location line="-2"/>
+ <source>Qt Designer Form Class</source>
+ <translation>КлаÑÑ Ñ„Ð¾Ñ€Ð¼Ñ‹ Qt Designer</translation>
</message>
</context>
<context>
@@ -6146,128 +6493,113 @@ Rebuilding the project might help.</source>
<translation>Панель виджетов</translation>
</message>
<message>
- <location line="-105"/>
- <location line="+111"/>
+ <location line="-104"/>
+ <location line="+110"/>
<source>Object Inspector</source>
<translation>ИнÑпектор объектов</translation>
</message>
<message>
- <location line="-108"/>
- <location line="+114"/>
+ <location line="-107"/>
+ <location line="+113"/>
<source>Property Editor</source>
<translation>Редактор ÑвойÑтв</translation>
</message>
<message>
- <location line="-108"/>
- <location line="+119"/>
+ <location line="-107"/>
+ <location line="+118"/>
<source>Action Editor</source>
<translation>Редактор дейÑтвий</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-130"/>
<source>Widget box</source>
<translation>Панель виджетов</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+173"/>
<source>For&m Editor</source>
<translation>Редактор &форм</translation>
</message>
<message>
- <location line="+33"/>
- <source>Edit widgets</source>
- <translation>Изменение виджетов</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>F3</source>
- <translation>F3</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Edit signals/slots</source>
- <translation>Изменение Ñигналов/Ñлотов</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>F4</source>
- <translation>F4</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Edit buddies</source>
- <translation>Изменение партнёров</translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
- <source>Edit tab order</source>
- <translation>Изменение порÑдка обхода</translation>
+ <source>F4</source>
+ <translation></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+14"/>
<source>Meta+H</source>
- <translation>Meta+H</translation>
+ <translation></translation>
</message>
<message>
<location line="+0"/>
<source>Ctrl+H</source>
- <translation>Ctrl+H</translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
<source>Meta+L</source>
- <translation>Meta+L</translation>
+ <translation></translation>
</message>
<message>
<location line="+0"/>
<source>Ctrl+L</source>
- <translation>Ctrl+L</translation>
+ <translation></translation>
</message>
<message>
<location line="+17"/>
<source>Meta+G</source>
- <translation>Meta+G</translation>
+ <translation></translation>
</message>
<message>
<location line="+0"/>
<source>Ctrl+G</source>
- <translation>Ctrl+G</translation>
+ <translation></translation>
</message>
<message>
<location line="+9"/>
<source>Meta+J</source>
- <translation>Meta+J</translation>
+ <translation></translation>
</message>
<message>
<location line="+0"/>
<source>Ctrl+J</source>
- <translation>Ctrl+J</translation>
- </message>
- <message>
- <location line="+46"/>
- <source>Views</source>
- <translation>Обзоры</translation>
+ <translation></translation>
</message>
<message>
- <location line="-295"/>
- <location line="+117"/>
+ <location line="-249"/>
+ <location line="+116"/>
<source>Signals && Slots Editor</source>
<translation>Редактор Ñигналов и Ñлотов</translation>
</message>
<message>
- <location line="-110"/>
- <source>Locked</source>
- <translation>ЗафикÑировано</translation>
+ <location line="+82"/>
+ <source>Edit Widgets</source>
+ <translation>Изменение виджетов</translation>
</message>
<message>
- <location line="+7"/>
- <source>Reset to Default Layout</source>
- <translation>СброÑить в иÑходное ÑоÑтоÑние</translation>
+ <location line="+5"/>
+ <source>Edit Signals/Slots</source>
+ <translation>Изменение Ñигналов/Ñлотов</translation>
</message>
<message>
- <location line="+257"/>
+ <location line="+5"/>
+ <source>Edit Buddies</source>
+ <translation>Изменение партнёров</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Edit Tab Order</source>
+ <translation>Изменение порÑдка обхода</translation>
+ </message>
+ <message>
+ <location line="+58"/>
<source>Ctrl+Alt+R</source>
- <translation>Ctrl+Alt+R</translation>
+ <translation></translation>
</message>
<message>
<location line="+14"/>
@@ -6275,7 +6607,7 @@ Rebuilding the project might help.</source>
<translation>О модулÑÑ… Qt Designer...</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+33"/>
<source>Preview in</source>
<translation>ПредпроÑмотр в</translation>
</message>
@@ -6285,7 +6617,7 @@ Rebuilding the project might help.</source>
<translation>Дизайнер</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+175"/>
<source>The image could not be created: %1</source>
<translation>Картинка не может быть Ñоздана: %1</translation>
</message>
@@ -6389,14 +6721,6 @@ Rebuilding the project might help.</source>
<source>Remove</source>
<translation>Удалить</translation>
</message>
- <message>
- <source><html><body><p>The Documentation page lets you install and remove compressed help files.</p>
-<p>Click the <b>Install</b> button and choose the path of the compressed help file (*.qch) you would like to install. To delete a help file, select a documentation set in the list and click <b>Remove</b>.</p></body></html>
-</source>
- <translation type="obsolete"><html><body><p>Ð’ разделе Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶Ð½Ð¾ уÑтановить или удалить Ñжатые файлы Ñправки.</p>
-<p>Щёлкните кнопку <b>УÑтановить</b> и выберите Ñжатый файл Ñправки (*qch), который желаете уÑтановить. Чтобы удалить файл Ñправки, выберите набор документации и щёлкните <b>Удалить</b>.</p></body></html>
-</translation>
- </message>
<message>
<location/>
<source>Add and remove compressed help files, .qch.</source>
@@ -6419,6 +6743,56 @@ Rebuilding the project might help.</source>
<translation>ÐаÑтройки редактора</translation>
</message>
</context>
+<context>
+ <name>ExpressionEditor</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/ExpressionEditor.qml" line="+49"/>
+ <source>Expression</source>
+ <translation>Выражение</translation>
+ </message>
+</context>
+<context>
+ <name>Extended</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/Extended.qml" line="+5"/>
+ <source>Effect</source>
+ <translation>Ðффект</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <location line="+70"/>
+ <source>Blur Radius:</source>
+ <translation type="unfinished">Ð Ð°Ð´Ð¸ÑƒÑ Ñ€Ð°Ð·Ð¼Ð°Ð·Ñ‹Ð²Ð°Ð½Ð¸Ñ:</translation>
+ </message>
+ <message>
+ <location line="-18"/>
+ <source>Pixel Size:</source>
+ <translation type="unfinished">Размер пикÑелÑ:</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>x Offset: </source>
+ <translation type="unfinished">Смещение по x: </translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>y Offset: </source>
+ <translation type="unfinished">Смещение по y: </translation>
+ </message>
+</context>
+<context>
+ <name>ExtendedFunctionButton</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml" line="+64"/>
+ <source>Reset</source>
+ <translation>СброÑить</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Set Expression</source>
+ <translation>ПриÑвоить выражение</translation>
+ </message>
+</context>
<context>
<name>ExtensionSystem::Internal::PluginDetailsView</name>
<message>
@@ -6494,7 +6868,7 @@ Rebuilding the project might help.</source>
<context>
<name>ExtensionSystem::Internal::PluginSpecPrivate</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+482"/>
+ <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+471"/>
<source>File does not exist: %1</source>
<translation>Файл не ÑущеÑтвует: %1</translation>
</message>
@@ -6626,7 +7000,7 @@ Rebuilding the project might help.</source>
<context>
<name>ExtensionSystem::PluginManager</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginmanager.cpp" line="+758"/>
+ <location filename="../../../src/libs/extensionsystem/pluginmanager.cpp" line="+788"/>
<source>Circular dependency detected:
</source>
<translation>Обнаружена цикличеÑÐºÐ°Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑ‚ÑŒ:
@@ -6645,13 +7019,8 @@ Rebuilding the project might help.</source>
<translation>%1(%2)</translation>
</message>
<message>
- <location line="+9"/>
- <source>Cannot load plugin because dependencies are not resolved</source>
- <translation>Ðе удалоÑÑŒ загрузить модуль, так как его завиÑимоÑти не были разрешены</translation>
- </message>
- <message>
- <location line="+9"/>
- <location line="+35"/>
+ <location line="+15"/>
+ <location line="+39"/>
<source>Cannot load plugin because dependency failed to load: %1(%2)
Reason: %3</source>
<translation>Ðе удалоÑÑŒ загрузить модуль, так как его завиÑимоÑÑ‚ÑŒ не загрузилаÑÑŒ: %1(%2)
@@ -6663,12 +7032,12 @@ Reason: %3</source>
<message>
<location filename="../../../src/libs/extensionsystem/pluginview.cpp" line="+158"/>
<location line="+19"/>
- <location line="+58"/>
+ <location line="+57"/>
<source>Load on Startup</source>
<translation>Загружать при запуÑке</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-69"/>
<source>Utilities</source>
<translation>Утилиты</translation>
</message>
@@ -6677,11 +7046,16 @@ Reason: %3</source>
<name>FakeVim::Internal</name>
<message>
<location filename="../../../src/plugins/fakevim/fakevimactions.cpp" line="+120"/>
- <source>Use vim-style editing</source>
+ <source>Use Vim-style Editing</source>
<translation>ИÑпользовать редактирование в Ñтиле Vim</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+8"/>
+ <source>Read .vimrc</source>
+ <translation>Загрузить .vimrc</translation>
+ </message>
+ <message>
+ <location line="+85"/>
<source>FakeVim properties...</source>
<translation>ÐаÑтройки FakeVim...</translation>
</message>
@@ -6689,7 +7063,7 @@ Reason: %3</source>
<context>
<name>FakeVim::Internal::FakeVimExCommandsPage</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+291"/>
+ <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+294"/>
<location line="+23"/>
<source>Ex Command Mapping</source>
<translation type="unfinished">РаÑширенное ÑвÑзывание команд</translation>
@@ -6706,7 +7080,7 @@ Reason: %3</source>
</message>
<message>
<location line="+1"/>
- <source>Regular Expression:</source>
+ <source>Regular expression:</source>
<translation>РегулÑрное выражение:</translation>
</message>
<message>
@@ -6718,17 +7092,17 @@ Reason: %3</source>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+1294"/>
+ <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+1367"/>
<source>Not implemented in FakeVim</source>
<translation>Ðе реализовано в FakeVim</translation>
</message>
<message>
- <location line="-1011"/>
+ <location line="-1082"/>
<source>E20: Mark '%1' not set</source>
<translation>E20: Отметка '%1' не уÑтановлена</translation>
</message>
<message>
- <location line="+987"/>
+ <location line="+1058"/>
<source>%1%2%</source>
<translation>%1%2%</translation>
</message>
@@ -6738,7 +7112,7 @@ Reason: %3</source>
<translation>%1Ð’Ñе</translation>
</message>
<message>
- <location line="+1441"/>
+ <location line="+1563"/>
<source>File '%1' exists (add ! to override)</source>
<translation>Файл '%1' уже ÑущеÑтвует (добавьте !, чтобы перезапиÑать)</translation>
</message>
@@ -6758,12 +7132,12 @@ Reason: %3</source>
<translation>Ðе удалоÑÑŒ открыть файл '%1' Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+22"/>
<source>"%1" %2L, %3C</source>
<translation>"%1" %2L, %3C</translation>
</message>
<message numerus="yes">
- <location line="+19"/>
+ <location line="+31"/>
<source>%n lines filtered</source>
<translation type="unfinished">
<numerusform>%n Ñтрока ÑоответÑтвует шаблону</numerusform>
@@ -6772,7 +7146,7 @@ Reason: %3</source>
</translation>
</message>
<message numerus="yes">
- <location line="+7"/>
+ <location line="+17"/>
<source>%n lines >ed %1 time</source>
<translation>
<numerusform>%n Ñтрока Ñдвинута вправо %1 раз</numerusform>
@@ -6781,12 +7155,17 @@ Reason: %3</source>
</translation>
</message>
<message>
- <location line="+119"/>
+ <location line="+37"/>
+ <source>Can't open file %1</source>
+ <translation>Ðевозможно открыть файл %1</translation>
+ </message>
+ <message>
+ <location line="+67"/>
<source>E512: Unknown option: </source>
<translation>E512: ÐеизвеÑтный параметр: </translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+50"/>
<source>search hit BOTTOM, continuing at TOP</source>
<translation>поиÑк дошёл до ÐИЗРи продолжилÑÑ Ð¡Ð’Ð•Ð Ð¥Ð£</translation>
</message>
@@ -6796,12 +7175,12 @@ Reason: %3</source>
<translation>поиÑк дошёл до ВЕРХРи продолжилÑÑ Ð¡ÐИЗУ</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+8"/>
<source>Pattern not found: </source>
<translation>Шаблон не найден: </translation>
</message>
<message>
- <location line="+786"/>
+ <location line="+841"/>
<source>Already at oldest change</source>
<translation>Уже на первом изменении</translation>
</message>
@@ -6814,7 +7193,7 @@ Reason: %3</source>
<context>
<name>FakeVim::Internal::FakeVimOptionPage</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="-187"/>
+ <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="-188"/>
<source>General</source>
<translation>ОÑновное</translation>
</message>
@@ -6827,7 +7206,7 @@ Reason: %3</source>
<context>
<name>FakeVim::Internal::FakeVimPluginPrivate</name>
<message>
- <location line="+471"/>
+ <location line="+483"/>
<source>Switch to next file</source>
<translation>Перейти к Ñледующему файлу</translation>
</message>
@@ -6837,13 +7216,13 @@ Reason: %3</source>
<translation>Перейти к предыдущему файлу</translation>
</message>
<message>
- <location line="+234"/>
- <location line="+215"/>
+ <location line="+257"/>
+ <location line="+216"/>
<source>Quit FakeVim</source>
<translation>Покинуть FakeVim</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-142"/>
<source>Saving succeeded</source>
<translation>Сохранение выполнено уÑпешно</translation>
</message>
@@ -6857,7 +7236,7 @@ Reason: %3</source>
</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+22"/>
<source>Not an editor command: %1</source>
<translation>Ðе команда редактора: %1</translation>
</message>
@@ -6871,98 +7250,106 @@ Reason: %3</source>
<name>FakeVimOptionPage</name>
<message>
<location filename="../../../src/plugins/fakevim/fakevimoptions.ui"/>
- <source>Vim style settings</source>
- <translation>ÐаÑтройки ÑÑ‚Ð¸Ð»Ñ Vim</translation>
+ <source>Shift width:</source>
+ <translation>Ширина ÑмещениÑ:</translation>
</message>
<message>
<location/>
- <source>vim's "expandtab" option</source>
- <translation>параметр vim "expandtab"</translation>
+ <source>vim's "tabstop" option</source>
+ <translation>параметр vim "tabstop"</translation>
</message>
<message>
<location/>
- <source>Expand tabulators:</source>
- <translation>Разворачивать табулÑции:</translation>
+ <source>Tabulator size:</source>
+ <translation>Размер табулÑторов:</translation>
</message>
<message>
<location/>
- <source>Highlight search results:</source>
- <translation>ПодÑвечивать результаты поиÑка:</translation>
+ <source>Backspace:</source>
+ <translation>Забой:</translation>
</message>
<message>
<location/>
- <source>Shift width:</source>
- <translation>Ширина ÑмещениÑ:</translation>
+ <source>Use FakeVim</source>
+ <translation>ИÑпользовать FakeVim</translation>
</message>
<message>
<location/>
- <source>Smart tabulators:</source>
- <translation>Умные табулÑторы:</translation>
+ <source>Vim Behavior</source>
+ <translation>Поведение Vim</translation>
</message>
<message>
<location/>
- <source>Start of line:</source>
- <translation>Ðачало Ñтроки:</translation>
+ <source>Automatic indentation</source>
+ <translation>ÐвтоматичеÑкие отÑтупы</translation>
</message>
<message>
<location/>
- <source>vim's "tabstop" option</source>
- <translation>параметр vim "tabstop"</translation>
+ <source>Start of line</source>
+ <translation>Вначале Ñтроки</translation>
</message>
<message>
<location/>
- <source>Tabulator size:</source>
- <translation>Размер табулÑторов:</translation>
+ <source>Smart indentation</source>
+ <translation>Умные отÑтупы</translation>
</message>
<message>
<location/>
- <source>Backspace:</source>
- <translation>Забой:</translation>
+ <source>Use search dialog</source>
+ <translation>ИÑпользовать диалог поиÑка</translation>
</message>
<message>
<location/>
- <source>VIM's "autoindent" option</source>
- <translation>параметр vim "autoindent"</translation>
+ <source>Expand tabulators</source>
+ <translation>Разворачивать табулÑторы</translation>
</message>
<message>
<location/>
- <source>Automatic indentation:</source>
- <translation>ÐвтоматичеÑкие отÑтупы:</translation>
+ <source>Smart tabulators</source>
+ <translation>Умные табулÑторы</translation>
</message>
<message>
<location/>
- <source>Incremental search:</source>
- <translation>Пошаговый поиÑк:</translation>
+ <source>Highlight search results</source>
+ <translation>ВыделÑÑ‚ÑŒ результаты поиÑка</translation>
</message>
<message>
<location/>
- <source>Copy text editor settings</source>
- <translation>ÐаÑтройки редактора</translation>
+ <source>Incremental search</source>
+ <translation>Пошаговый поиÑк</translation>
</message>
<message>
<location/>
- <source>Set Qt style</source>
- <translation>Стиль Qt</translation>
+ <source>Read .vimrc</source>
+ <translation>Загрузить .vimrc</translation>
</message>
<message>
<location/>
- <source>Set plain style</source>
- <translation>ПроÑтой Ñтиль</translation>
+ <source>Keyword characters:</source>
+ <translation>Ключевые Ñимволы:</translation>
</message>
<message>
<location/>
- <source>Smart indentation:</source>
- <translation>"Умные" отÑтупы:</translation>
+ <source>Copy Text Editor Settings</source>
+ <translation type="unfinished">Копировать наÑтройки редактора</translation>
</message>
<message>
<location/>
- <source>Use FakeVim</source>
- <translation>ИÑпользовать FakeVim</translation>
+ <source>Set Qt Style</source>
+ <translation>Стиль Qt</translation>
</message>
<message>
<location/>
- <source>Use search dialog:</source>
- <translation>ИÑпользовать диалог поиÑка:</translation>
+ <source>Set Plain Style</source>
+ <translation>ПроÑтой Ñтиль</translation>
+ </message>
+</context>
+<context>
+ <name>FileWidget</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp" line="+102"/>
+ <source>Open File</source>
+ <translation>Открытие файла</translation>
</message>
</context>
<context>
@@ -7005,32 +7392,6 @@ Reason: %3</source>
<source>Remove</source>
<translation>Удалить</translation>
</message>
- <message>
- <source><html><body>
-<p>
-The Filters page lets you create and remove documentation filters.
-</p><p>
-To add a new filter, click the <b>Add</b> button, specify a filter name in the pop-up dialog and click <b>OK</b>, then select the filter attributes in the list box on the right hand side. You can delete a filter by selecting it and clicking the <b>Remove</b> button.
-</p><p>
-A filter is identified by its name and contains a list of filter attributes. An attribute is just a string that can be freely chosen. Attributes are defined by the documentation itself, this means that every documentation set usually has one or more attributes.
-</p><p>
-For example, the Qt 4.7.0 Linguist documentation defines the attributes '<b>qt</b>', '<b>tools</b>' and '<b>4.7.0</b>', Qt Designer defines '<b>designer</b>', '<b>tools</b>' and '<b>4.7.0</b>'. The filter to display all tools would then define only the attribute '<b>tools</b>' since this attribute is part of both documentation sets.
-</p><p>
-Adding the attribute '<b>qmake</b>' to the filter would then only show qmake documentation, since the Qt Designer documentation does not contain this attribute. Having an empty list of attributes in a filter will match all documentation; i.e., it is equivalent to requesting unfiltered documentation.
-</p></body></html></source>
- <translation type="obsolete"><html><body>
-<p>
-Ð’ разделе Фильтры можно Ñоздавать и удалÑÑ‚ÑŒ фильтры документации.
-</p><p>
-Чтобы добавить новый фильтры, щёлкните кнопку <b>Добавить</b>, укажите название фильтра в открывшемÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ðµ и щёлкните кнопку <b>OK</b>, затем выберите разделы в правом ÑпиÑке. Чтобы удалить фильтр, выберите его и щёлкните кнопку <b>Удалить</b>.
-</p><p>
-Фильтр определÑетÑÑ Ð¿Ð¾ его названию и Ñодержит ÑпиÑок разделов. Раздел - Ñто проÑто Ñтрока, которую можно Ñвободно менÑÑ‚ÑŒ. Разделы задаютÑÑ Ð² документации, что означает, что ÐºÐ°Ð¶Ð´Ð°Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ñодержит, как минимум, один раздел.
-</p><p>
-Ðапример, Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ðº Qt Linguist 4.7.0 Ñодержит разделы: «<b>qt</b>», «<b>tools</b>» и «<b>4.7.0</b>»; а к Qt Designer: «<b>designer</b>», «<b>tools</b>» и «<b>4.7.0</b>». Чтобы фильтр показывал вÑе «<b>tools</b>», необходимо выбрать только раздел «<b>tools</b>», так как он входит в обе документации.
-</p><p>
-ЕÑли же добавить раздел «<b>qmake</b>» в фильтр, то будет отображатьÑÑ Ñправка только по qmake, так как в документации к Qt Designer нет Ñтого раздела. ЕÑли не указать набор разделов, то отображатьÑÑ Ð±ÑƒÐ´ÐµÑ‚ вÑÑ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ.
-</p></body></html></translation>
- </message>
<message>
<location/>
<source><html><body>
@@ -7234,19 +7595,39 @@ Add, modify, and remove document filters, which determine the documentation set
</message>
</context>
<context>
- <name>GdbOptionsPage</name>
+ <name>FontGroupBox</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/FontGroupBox.qml" line="+6"/>
+ <location line="+7"/>
+ <source>Font</source>
+ <translation type="unfinished">Шрифт</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Size</source>
+ <translation type="unfinished">Размер</translation>
+ </message>
<message>
- <source>Gdb interaction</source>
- <translation type="obsolete">ВзаимодейÑтвие Ñ Gdb</translation>
+ <location line="+32"/>
+ <source>Font Style</source>
+ <translation type="unfinished">Ðачертание</translation>
</message>
<message>
- <source>This is either a full absolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH.</source>
- <translation type="obsolete">Ðто абÑолютный путь к иÑполнÑемому файлу gdb, который желаете иÑпользовать, или проÑто его имÑ, которое будет иÑкатьÑÑ Ð² ÑиÑтемных путÑÑ….</translation>
+ <location line="+9"/>
+ <source>Style</source>
+ <translation type="unfinished">Стиль</translation>
</message>
+</context>
+<context>
+ <name>GdbChooserWidget</name>
<message>
- <source>Gdb location:</source>
- <translation type="obsolete">Размещение Gdb:</translation>
+ <location filename="../../../src/plugins/debugger/gdb/gdbchooserwidget.cpp" line="-315"/>
+ <source>Unable to run '%1': %2</source>
+ <translation>Ðе удалоÑÑŒ запуÑтить "%1": %2</translation>
</message>
+</context>
+<context>
+ <name>GdbOptionsPage</name>
<message>
<location filename="../../../src/plugins/debugger/gdb/gdboptionspage.ui"/>
<source>Environment:</source>
@@ -7262,11 +7643,6 @@ Add, modify, and remove document filters, which determine the documentation set
<source>Gdb startup script:</source>
<translation>Сценарий запуÑка gdb:</translation>
</message>
- <message>
- <location/>
- <source>Behaviour of breakpoint setting in plugins</source>
- <translation>Поведение точек оÑтанова, уÑтанавливаемых в модулÑÑ…</translation>
- </message>
<message>
<location/>
<source>This is the slowest but safest option.</source>
@@ -7354,6 +7730,11 @@ on slow machines. In this case, the value should be increased.</source>
<source>Show a message box when receiving a signal</source>
<translation>Показывать Ñообщение при получении Ñигнала</translation>
</message>
+ <message>
+ <location/>
+ <source>Behavior of Breakpoint Setting in Plugins</source>
+ <translation>Поведение точек оÑтанова, уÑтанавливаемых в модулÑÑ…</translation>
+ </message>
</context>
<context>
<name>GeneralSettingsPage</name>
@@ -7392,26 +7773,6 @@ on slow machines. In this case, the value should be increased.</source>
<source>On help start:</source>
<translation>При запуÑке Ñправки:</translation>
</message>
- <message>
- <location/>
- <source>Show my home page</source>
- <translation>Открыть домашнюю Ñтраницу</translation>
- </message>
- <message>
- <location/>
- <source>Show a blank page</source>
- <translation>Открыть пуÑтую Ñтраницу</translation>
- </message>
- <message>
- <location/>
- <source>Show my tabs from last session</source>
- <translation>Открыть вкладки Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ запуÑка</translation>
- </message>
- <message>
- <location/>
- <source>Home Page:</source>
- <translation>ДомашнÑÑ Ñтраница:</translation>
- </message>
<message>
<location/>
<source>Use &Current Page</source>
@@ -7449,19 +7810,39 @@ on slow machines. In this case, the value should be increased.</source>
</message>
<message>
<location/>
- <source>Show side-by-side if possible</source>
+ <source>Home page:</source>
+ <translation>ДомашнÑÑ Ñтраница:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Show Side-by-Side if Possible</source>
<translation>Показывать Ñбоку, еÑли возможно</translation>
</message>
<message>
<location/>
- <source>Always show side-by-side</source>
+ <source>Always Show Side-by-Side</source>
<translation>Ð’Ñегда показывать Ñбоку</translation>
</message>
<message>
<location/>
- <source>Always start full help</source>
+ <source>Always Start Full Help</source>
<translation>Ð’Ñегда запуÑкать полную Ñправку</translation>
</message>
+ <message>
+ <location/>
+ <source>Show My Home Page</source>
+ <translation>Открыть домашнюю Ñтраницу</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Show a Blank Page</source>
+ <translation>Открыть пуÑтую Ñтраницу</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Show My Tabs from Last Session</source>
+ <translation>Открыть вкладки Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ запуÑка</translation>
+ </message>
</context>
<context>
<name>GenericMakeStep</name>
@@ -7511,7 +7892,7 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GenericProjectManager::Internal::GenericBuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+463"/>
+ <location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+480"/>
<source>Configuration Name:</source>
<translation>Ðазвание конфигурации:</translation>
</message>
@@ -7561,25 +7942,20 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GenericProjectManager::Internal::GenericProjectWizard</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericprojectwizard.cpp" line="+97"/>
+ <location filename="../../../src/plugins/genericprojectmanager/genericprojectwizard.cpp" line="+109"/>
<source>Import Existing Project</source>
<translation>Импорт ÑущеÑтвующего проекта</translation>
</message>
<message>
<location line="+2"/>
- <source>Creates a generic project, supporting any build system.</source>
- <translation>Создание базового проекта, поддерживающего любую ÑиÑтему Ñборки.</translation>
- </message>
- <message>
- <location line="+127"/>
- <source>The project %1 could not be opened.</source>
- <translation>Ðевозможно открыть проект %1.</translation>
+ <source>Imports existing projects that do not use qmake or CMake. This allows you to use Qt Creator as a code editor.</source>
+ <translation>Импорт ÑущеÑтвующего проекта, не иÑпользующего qmake или CMake. Ðто позволÑет иÑпользовать Qt Creator в качеÑтве редактора кода.</translation>
</message>
</context>
<context>
<name>GenericProjectManager::Internal::GenericProjectWizardDialog</name>
<message>
- <location line="-170"/>
+ <location line="-50"/>
<source>Import Existing Project</source>
<translation>Импорт ÑущеÑтвующего проекта</translation>
</message>
@@ -7604,6 +7980,50 @@ on slow machines. In this case, the value should be increased.</source>
<translation>Размещение</translation>
</message>
</context>
+<context>
+ <name>GenericProjectManager::Internal::Manager</name>
+ <message>
+ <location filename="../../../src/plugins/genericprojectmanager/genericprojectmanager.cpp" line="+73"/>
+ <source>Failed opening project '%1': Project already open</source>
+ <translation>Ðе удалоÑÑŒ открыть проект "%1": проект уже открыт</translation>
+ </message>
+</context>
+<context>
+ <name>GenericSshConnection</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/ssh/sshconnection.cpp" line="-303"/>
+ <source>Could not connect to host.</source>
+ <translation>Ðу удалоÑÑŒ подключитьÑÑ Ðº узлу.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error in cryptography backend: %1</source>
+ <translation>Ошибка в криптографичеÑком модуле: %1</translation>
+ </message>
+</context>
+<context>
+ <name>Geometry</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/Geometry.qml" line="+8"/>
+ <source>Geometry</source>
+ <translation type="unfinished">ГеометриÑ</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Position</source>
+ <translation type="unfinished">Положение</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Size</source>
+ <translation type="unfinished">Размер</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Lock aspect ratio</source>
+ <translation type="unfinished">ЗафикÑировать Ñоотношение Ñторон</translation>
+ </message>
+</context>
<context>
<name>Git::CloneWizardPage</name>
<message>
@@ -7696,21 +8116,21 @@ on slow machines. In this case, the value should be increased.</source>
</message>
<message>
<location/>
- <source>Remote branches</source>
- <translation>Удаленные ветки</translation>
+ <source>Remote Branches</source>
+ <translation>Внешние ветки</translation>
</message>
</context>
<context>
<name>Git::Internal::ChangeSelectionDialog</name>
<message>
<location filename="../../../src/plugins/git/changeselectiondialog.cpp" line="+43"/>
- <source>Select a Git commit</source>
- <translation>Выберите фикÑацию Git</translation>
+ <source>Select a Git Commit</source>
+ <translation>Выбор фикÑации Git</translation>
</message>
<message>
<location line="+22"/>
- <source>Select Git repository</source>
- <translation>Выбрать хранилище Git</translation>
+ <source>Select Git Repository</source>
+ <translation>Выбор хранилища Git</translation>
</message>
<message>
<location line="+17"/>
@@ -7727,8 +8147,8 @@ on slow machines. In this case, the value should be increased.</source>
<name>Git::Internal::CloneWizard</name>
<message>
<location filename="../../../src/plugins/git/clonewizard.cpp" line="+55"/>
- <source>Clones a project from a git repository.</source>
- <translation>Клонирование проекта из хранилища GIT.</translation>
+ <source>Clones a Git repository and tries to load the contained project.</source>
+ <translation>Клонирование хранилища Git Ñ Ð¿Ð¾Ñледующей попыткой загрузки ÑодержащегоÑÑ Ñ‚Ð°Ð¼ проекта.</translation>
</message>
<message>
<location line="+5"/>
@@ -7739,7 +8159,7 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::GitClient</name>
<message>
- <location filename="../../../src/plugins/git/gitclient.cpp" line="+74"/>
+ <location filename="../../../src/plugins/git/gitclient.cpp" line="+75"/>
<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>Следует иметь в виду, что модуль Git до Ñих пор не умеет работать Ñ Ñервером. ПоÑтому, Ñ€ÑƒÑ‡Ð½Ð°Ñ Ð½Ð°Ñтройка ssh-авторизации и другое не будет работать.</translation>
</message>
@@ -7762,7 +8182,7 @@ on slow machines. In this case, the value should be increased.</source>
<translation>Ожидание данных...</translation>
</message>
<message>
- <location line="+92"/>
+ <location line="+74"/>
<source>Git Diff</source>
<translation>Git - Сравнение</translation>
</message>
@@ -7873,13 +8293,13 @@ on slow machines. In this case, the value should be increased.</source>
</message>
<message>
<location line="+45"/>
- <source>Stash description</source>
- <translation>ОпиÑание ÑпрÑтанного</translation>
+ <source>Description:</source>
+ <translation>ОпиÑание:</translation>
</message>
<message>
<location line="+0"/>
- <source>Description:</source>
- <translation>ОпиÑание:</translation>
+ <source>Stash Description</source>
+ <translation>ОпиÑание ÑпрÑтанного</translation>
</message>
<message>
<location line="+94"/>
@@ -8023,7 +8443,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+36"/>
<source>The command 'git pull --rebase' failed, aborting rebase.</source>
- <translation type="unfinished">Ðе удалоÑÑŒ выполнить команду "git pull --rebase", перебазирование прервано.</translation>
+ <translation>Ðе удалоÑÑŒ выполнить команду "git pull --rebase", перебазирование прервано.</translation>
</message>
<message>
<location line="+46"/>
@@ -8067,7 +8487,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+3"/>
<source>Alt+G,Alt+D</source>
- <translation>Alt+G,Alt+D</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -8082,7 +8502,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+2"/>
<source>Alt+G,Alt+L</source>
- <translation>Alt+G,Alt+L</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -8097,7 +8517,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+3"/>
<source>Alt+G,Alt+B</source>
- <translation>Alt+G,Alt+B</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -8112,7 +8532,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+3"/>
<source>Alt+G,Alt+U</source>
- <translation>Alt+G,Alt+U</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -8127,7 +8547,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+2"/>
<source>Alt+G,Alt+A</source>
- <translation>Alt+G,Alt+A</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -8150,7 +8570,12 @@ on slow machines. In this case, the value should be increased.</source>
<translation>Сравнить проект "%1"</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+64"/>
+ <source>Stash Snapshot...</source>
+ <translation>СпрÑтать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ (stash)...</translation>
+ </message>
+ <message>
+ <location line="+34"/>
<source>Stashes...</source>
<translation>СпрÑтанное (stashes)...</translation>
</message>
@@ -8167,7 +8592,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+3"/>
<source>Alt+G,Alt+K</source>
- <translation>Alt+G,Alt+K</translation>
+ <translation></translation>
</message>
<message>
<location line="+58"/>
@@ -8192,7 +8617,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+7"/>
<source>Diff Repository</source>
- <translation type="unfinished">Сравнить вÑÑ‘</translation>
+ <translation>Сравнить вÑÑ‘</translation>
</message>
<message>
<location line="+4"/>
@@ -8222,7 +8647,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+4"/>
<source>Undo Repository Changes</source>
- <translation type="unfinished">Отменить вÑе изменениÑ</translation>
+ <translation>Отменить вÑе изменениÑ</translation>
</message>
<message>
<location line="+3"/>
@@ -8235,12 +8660,7 @@ on slow machines. In this case, the value should be increased.</source>
<translation type="unfinished">ОчиÑтить хранилище...</translation>
</message>
<message>
- <location line="+7"/>
- <source>Stash snapshot...</source>
- <translation>СпрÑтать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ (stash)...</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+14"/>
<source>Saves the current state of your work and resets the repository.</source>
<translation>СохранÑет текущее ÑоÑтоÑние вашей работы и ÑбраÑывает хранилище.</translation>
</message>
@@ -8267,7 +8687,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+2"/>
<source>Alt+G,Alt+C</source>
- <translation>Alt+G,Alt+C</translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -8320,7 +8740,7 @@ on slow machines. In this case, the value should be increased.</source>
<translation>&Вернуть</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+71"/>
<source>Would you like to revert all pending changes to the repository
%1?</source>
<translation>Желаете откатить вÑе Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ копии
@@ -8449,7 +8869,7 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::LocalBranchModel</name>
<message>
- <location filename="../../../src/plugins/git/branchmodel.cpp" line="+196"/>
+ <location filename="../../../src/plugins/git/branchmodel.cpp" line="+197"/>
<source><New branch></source>
<translation><ÐÐ¾Ð²Ð°Ñ Ð²ÐµÑ‚ÐºÐ°></translation>
</message>
@@ -8475,25 +8895,15 @@ on slow machines. In this case, the value should be increased.</source>
<translation>Git</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+21"/>
<source>Git Settings</source>
<translation>ÐаÑтройки Git</translation>
</message>
<message>
<location filename="../../../src/plugins/git/settingspage.ui"/>
- <source>Environment variables</source>
- <translation>Переменные Ñреды окружениÑ</translation>
- </message>
- <message>
- <location/>
<source>PATH:</source>
<translation>Значение PATH:</translation>
</message>
- <message>
- <location/>
- <source>From system</source>
- <translation>СиÑтемное</translation>
- </message>
<message>
<location/>
<source><b>Note:</b></source>
@@ -8555,6 +8965,16 @@ Perl через переменные Ñреды окружениÑ.</translation
<source>Pull with rebase</source>
<translation>Принимать (pull) Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼</translation>
</message>
+ <message>
+ <location/>
+ <source>Environment Variables</source>
+ <translation>Переменные Ñреды окружениÑ</translation>
+ </message>
+ <message>
+ <location/>
+ <source>From System</source>
+ <translation>СиÑтемное</translation>
+ </message>
</context>
<context>
<name>Git::Internal::StashDialog</name>
@@ -8690,7 +9110,7 @@ You can choose between stashing the changes or discarding them.</source>
<context>
<name>GitClient</name>
<message>
- <location filename="../../../src/plugins/git/gitclient.cpp" line="-1450"/>
+ <location filename="../../../src/plugins/git/gitclient.cpp" line="-1432"/>
<source>Unable to determine the repository for %1.</source>
<translation>Ðе удалоÑÑŒ определить хранилище Ð´Ð»Ñ %1.</translation>
</message>
@@ -8738,8 +9158,8 @@ You can choose between stashing the changes or discarding them.</source>
<name>Gitorious::Internal::GitoriousCloneWizard</name>
<message>
<location filename="../../../src/plugins/git/gitorious/gitoriousclonewizard.cpp" line="+83"/>
- <source>Clones a project from a Gitorious repository.</source>
- <translation>Клонирование проекта из хранилища Gitorious.</translation>
+ <source>Clones a Gitorious repository and tries to load the contained project.</source>
+ <translation>Клонирование хранилища Gitorious Ñ Ð¿Ð¾Ñледующей попыткой загрузки ÑодержащегоÑÑ Ñ‚Ð°Ð¼ проекта.</translation>
</message>
<message>
<location line="+5"/>
@@ -9300,7 +9720,7 @@ You can choose between stashing the changes or discarding them.</source>
<name>Help::Internal::GeneralSettingsPage</name>
<message>
<location filename="../../../src/plugins/help/generalsettingspage.cpp" line="+71"/>
- <source>General settings</source>
+ <source>General Settings</source>
<translation>ОÑновные наÑтройки</translation>
</message>
<message>
@@ -9344,14 +9764,14 @@ You can choose between stashing the changes or discarding them.</source>
<context>
<name>Help::Internal::HelpPlugin</name>
<message>
- <location filename="../../../src/plugins/help/helpplugin.cpp" line="+199"/>
- <location line="+166"/>
+ <location filename="../../../src/plugins/help/helpplugin.cpp" line="+200"/>
+ <location line="+199"/>
<source>Contents</source>
<translation>Содержание</translation>
</message>
<message>
- <location line="-171"/>
- <location line="+153"/>
+ <location line="-194"/>
+ <location line="+176"/>
<source>Index</source>
<translation>Указатель</translation>
</message>
@@ -9366,12 +9786,12 @@ You can choose between stashing the changes or discarding them.</source>
<translation>Закладки</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-261"/>
<source>Home</source>
<translation>Домой</translation>
</message>
<message>
- <location line="+307"/>
+ <location line="+335"/>
<source>Previous</source>
<translation>Ðазад</translation>
</message>
@@ -9381,7 +9801,7 @@ You can choose between stashing the changes or discarding them.</source>
<translation>Вперёд</translation>
</message>
<message>
- <location line="-280"/>
+ <location line="-308"/>
<source>Add Bookmark</source>
<translation>Добавить закладку</translation>
</message>
@@ -9401,7 +9821,7 @@ You can choose between stashing the changes or discarding them.</source>
<translation>КонтекÑÑ‚Ð½Ð°Ñ Ñправка</translation>
</message>
<message>
- <location line="+153"/>
+ <location line="+181"/>
<source>Activate Index in Help mode</source>
<translation>Включить Указатель в режиме помощи</translation>
</message>
@@ -9411,14 +9831,14 @@ You can choose between stashing the changes or discarding them.</source>
<translation>Включить Содержание в режиме помощи</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-170"/>
<source>Increase Font Size</source>
<translation>Увеличить шрифт</translation>
</message>
<message>
<location line="+3"/>
<source>Ctrl++</source>
- <translation>Ctrl++</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -9428,7 +9848,7 @@ You can choose between stashing the changes or discarding them.</source>
<message>
<location line="+3"/>
<source>Ctrl+-</source>
- <translation>Ctrl+-</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -9436,12 +9856,32 @@ You can choose between stashing the changes or discarding them.</source>
<translation>ВоÑÑтановить размер шрифта</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Ctrl+0</source>
- <translation>Ctrl+0</translation>
+ <translation></translation>
</message>
<message>
- <location line="+163"/>
+ <location line="+25"/>
+ <source>Alt+Tab</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Alt+Shift+Tab</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Tab</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ctrl+Shift+Tab</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+162"/>
<source>Open Pages</source>
<translation>Открытые Ñтраницы</translation>
</message>
@@ -9485,7 +9925,7 @@ You can choose between stashing the changes or discarding them.</source>
</message>
<message>
<location line="+1"/>
- <location filename="../../../src/plugins/help/helpviewer_qwv.cpp" line="+235"/>
+ <location filename="../../../src/plugins/help/helpviewer_qwv.cpp" line="+239"/>
<source>Open Link as New Page</source>
<translation>Открыть ÑÑылку на новой Ñтранице</translation>
</message>
@@ -9516,7 +9956,7 @@ You can choose between stashing the changes or discarding them.</source>
<context>
<name>Help::Internal::OpenPagesWidget</name>
<message>
- <location filename="../../../src/plugins/help/openpageswidget.cpp" line="+128"/>
+ <location filename="../../../src/plugins/help/openpageswidget.cpp" line="+148"/>
<source>Close %1</source>
<translation>Закрыть %1</translation>
</message>
@@ -9580,7 +10020,7 @@ You can choose between stashing the changes or discarding them.</source>
<context>
<name>HelpViewer</name>
<message>
- <location filename="../../../src/plugins/help/helpviewer.cpp" line="+48"/>
+ <location filename="../../../src/plugins/help/helpviewer.cpp" line="+51"/>
<source><title>about:blank</title></source>
<translation></translation>
</message>
@@ -9590,15 +10030,53 @@ You can choose between stashing the changes or discarding them.</source>
<translation><title>Ошибка 404...</title><div align="center"><br><br><h1>Страница отÑутÑтвует</h1><br><h3>'%1'</h3></div></translation>
</message>
</context>
+<context>
+ <name>ImageSpecifics</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/ImageSpecifics.qml" line="+15"/>
+ <source>Image</source>
+ <translation type="unfinished">Изображение</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Source</source>
+ <translation type="unfinished">ИÑточник</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Fill Mode</source>
+ <translation type="unfinished">Режим заливки</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Aliasing</source>
+ <translation type="unfinished">СтупенчатоÑÑ‚ÑŒ</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Smooth</source>
+ <translation type="unfinished">Гладкий</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Source Size</source>
+ <translation type="unfinished">Размер иÑточника</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Painted Size</source>
+ <translation type="unfinished">Размер риÑованиÑ</translation>
+ </message>
+</context>
<context>
<name>IndexWindow</name>
<message>
- <location filename="../../../src/shared/help/indexwindow.cpp" line="+55"/>
+ <location filename="../../../src/shared/help/indexwindow.cpp" line="+67"/>
<source>&Look for:</source>
<translation>&ИÑкать:</translation>
</message>
<message>
- <location line="+72"/>
+ <location line="+77"/>
<source>Open Link</source>
<translation>Открыть ÑÑылку</translation>
</message>
@@ -9616,6 +10094,61 @@ You can choose between stashing the changes or discarding them.</source>
<translation>Ðажмите Ctrl-<Ввод> Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñтроки.</translation>
</message>
</context>
+<context>
+ <name>InvalidIdException</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp" line="+59"/>
+ <source>Ids have to be unique: </source>
+ <translation>Следующие идентификаторы должны быть уникальными: </translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Invalid Id: </source>
+ <translation>Ðеверный идентификатор: </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>
+Only alphanumeric characters and underscore allowed.
+Ids must begin with a lowercase letter.</source>
+ <translation>
+ДопуÑтимы только цифры, буквы и знак подчёркиваниÑ.
+Идентификаторы должны начинатьÑÑ Ñ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¾Ð¹ буквы.</translation>
+ </message>
+</context>
+<context>
+ <name>Layout</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/Layout.qml" line="+7"/>
+ <source>Layout</source>
+ <translation type="unfinished">Компоновка</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Anchors</source>
+ <translation type="unfinished">ПривÑзки</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <location line="+50"/>
+ <location line="+49"/>
+ <location line="+48"/>
+ <location line="+48"/>
+ <location line="+48"/>
+ <source>Target</source>
+ <translation type="unfinished">Цель</translation>
+ </message>
+ <message>
+ <location line="-224"/>
+ <location line="+49"/>
+ <location line="+48"/>
+ <location line="+48"/>
+ <location line="+48"/>
+ <location line="+48"/>
+ <source>Margin</source>
+ <translation type="unfinished">ОтÑтуп</translation>
+ </message>
+</context>
<context>
<name>Locator</name>
<message>
@@ -9662,8 +10195,8 @@ You can choose between stashing the changes or discarding them.</source>
<message>
<location line="+45"/>
<location line="+11"/>
- <source>Choose a directory to add</source>
- <translation>Выбор каталога Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ</translation>
+ <source>Select Directory</source>
+ <translation>Выбор каталога</translation>
</message>
<message>
<location line="+30"/>
@@ -9692,11 +10225,6 @@ You can choose between stashing the changes or discarding them.</source>
<source>Name:</source>
<translation>Ðазвание:</translation>
</message>
- <message>
- <location/>
- <source>File Types:</source>
- <translation>Типы файлов:</translation>
- </message>
<message>
<location/>
<source>Specify file name filters, separated by comma. Filters may contain wildcards.</source>
@@ -9739,6 +10267,11 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Directories:</source>
<translation>Каталоги:</translation>
</message>
+ <message>
+ <location/>
+ <source>File types:</source>
+ <translation>Типы файлов:</translation>
+ </message>
</context>
<context>
<name>Locator::Internal::FileSystemFilter</name>
@@ -9810,12 +10343,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation>Обзор...</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+16"/>
<source>Type to locate</source>
<translation>Введите, чтобы найти</translation>
</message>
<message>
- <location line="+177"/>
+ <location line="+1"/>
+ <source>Options</source>
+ <translation>Параметры</translation>
+ </message>
+ <message>
+ <location line="+179"/>
<source><type here></source>
<translation><введите здеÑÑŒ></translation>
</message>
@@ -9832,7 +10370,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<name>Locator::Internal::SettingsPage</name>
<message>
<location filename="../../../src/plugins/locator/settingspage.cpp" line="+168"/>
- <source>%1 (Prefix: %2)</source>
+ <source>%1 (prefix: %2)</source>
<translation>%1 (префикÑ: %2)</translation>
</message>
</context>
@@ -9860,13 +10398,13 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</message>
<message>
<location/>
- <source>Refresh Interval:</source>
- <translation>Период обновлениÑ:</translation>
+ <source> min</source>
+ <translation> мин</translation>
</message>
<message>
<location/>
- <source> min</source>
- <translation> мин</translation>
+ <source>Refresh interval:</source>
+ <translation>Период обновлениÑ:</translation>
</message>
</context>
<context>
@@ -9874,35 +10412,38 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.ui"/>
<source>Device Configuration Test</source>
- <translation type="unfinished">Проверка конфигурации уÑтройÑтва</translation>
+ <translation>ТеÑÑ‚ конфигурации уÑтройÑтва</translation>
</message>
</context>
<context>
- <name>MaemoSettingsWidget</name>
+ <name>MaemoPackageCreationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui"/>
- <source>Maemo Device Configurations</source>
- <translation>ÐаÑтройки уÑтройÑтва Maemo</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui"/>
+ <source>Package contents:</source>
+ <translation>Содержимое пакета:</translation>
</message>
<message>
<location/>
- <source>Configuration Name:</source>
- <translation>Ðазвание конфигурации:</translation>
+ <source>Add File to Package</source>
+ <translation>Добавить файл в пакет</translation>
</message>
<message>
<location/>
- <source>Device type:</source>
- <translation>Тип уÑтройÑтва:</translation>
+ <source>Remove File from Package</source>
+ <translation>Удалить файл из пакета</translation>
</message>
+</context>
+<context>
+ <name>MaemoSettingsWidget</name>
<message>
- <location/>
- <source>Remote Device</source>
- <translation>Внешнее уÑтройÑтво</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui"/>
+ <source>Maemo Device Configurations</source>
+ <translation>ÐаÑтройки уÑтройÑтва Maemo</translation>
</message>
<message>
<location/>
- <source>Local Simulator</source>
- <translation>ÐмулÑтор</translation>
+ <source>Device type:</source>
+ <translation>Тип уÑтройÑтва:</translation>
</message>
<message>
<location/>
@@ -9921,91 +10462,189 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</message>
<message>
<location/>
- <source>Host Name:</source>
- <translation>Ð˜Ð¼Ñ Ñ…Ð¾Ñта:</translation>
+ <source>Password:</source>
+ <translation>Пароль:</translation>
</message>
<message>
<location/>
- <source>SSH Port:</source>
- <translation>Порт SSH:</translation>
+ <source>Private key file:</source>
+ <translation>Файл Ñекретного ключа:</translation>
</message>
<message>
<location/>
- <source>Connection Timeout:</source>
- <translation>Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ:</translation>
+ <source>Add</source>
+ <translation>Добавить</translation>
</message>
<message>
<location/>
- <source>User Name:</source>
- <translation>Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:</translation>
+ <source>Remove</source>
+ <translation>Удалить</translation>
</message>
<message>
<location/>
- <source>Password:</source>
- <translation>Пароль:</translation>
+ <source>Test</source>
+ <translation>Проверить</translation>
</message>
<message>
<location/>
- <source>Private key file:</source>
- <translation>Файл Ñекретного ключа:</translation>
+ <source>Configuration:</source>
+ <translation>КонфигурациÑ:</translation>
</message>
<message>
<location/>
- <source>Gdb-server port:</source>
- <translation>Порт Ñервера Gdb:</translation>
+ <source>Name</source>
+ <translation>Ðазвание</translation>
</message>
<message>
<location/>
- <source>Add</source>
- <translation>Добавить</translation>
+ <source>IP or host name of the device</source>
+ <translation>IP или Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð° уÑтройÑтва</translation>
</message>
<message>
<location/>
- <source>Remove</source>
- <translation>Удалить</translation>
+ <source>Ports:</source>
+ <translation>Порты:</translation>
</message>
<message>
<location/>
- <source>Test</source>
- <translation>Проверить</translation>
+ <source>SSH:</source>
+ <translation></translation>
</message>
<message>
<location/>
- <source>Deploy Key ...</source>
- <translation>Ключ уÑтановки...</translation>
+ <source>Gdb server:</source>
+ <translation>Сервер gdb:</translation>
</message>
-</context>
-<context>
- <name>MainWindow</name>
<message>
- <location filename="../../../src/tools/qml/standalone/mainwindow.cpp" line="+193"/>
- <source>Ctrl+Q</source>
- <translation></translation>
+ <location/>
+ <source>Generate SSH Key ...</source>
+ <translation>Создать ключ SSH...</translation>
</message>
<message>
- <location line="-45"/>
- <source>Ctrl+O</source>
- <translation></translation>
+ <location/>
+ <source>s</source>
+ <translation> Ñек</translation>
</message>
<message>
- <location line="-57"/>
- <source>Bauhaus</source>
- <comment>MainWindowClass</comment>
- <translation>БаухауÑ</translation>
+ <location/>
+ <source>Deploy Public Key ...</source>
+ <translation>УÑтановить ключ...</translation>
</message>
<message>
- <location line="+48"/>
- <source>&File</source>
- <translation>&Файл</translation>
+ <location/>
+ <source>Remote device</source>
+ <translation>Внешнее</translation>
</message>
<message>
- <location line="+3"/>
- <source>&New...</source>
- <translation>&Ðовый...</translation>
+ <location/>
+ <source>Maemo emulator</source>
+ <translation>ÐмулÑтор Maemo</translation>
</message>
<message>
- <location line="+1"/>
- <source>Ctrl+N</source>
+ <location/>
+ <source>Host name:</source>
+ <translation>Ð˜Ð¼Ñ Ñ…Ð¾Ñта:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Connection timeout:</source>
+ <translation>Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Username:</source>
+ <translation>Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:</translation>
+ </message>
+</context>
+<context>
+ <name>MaemoSshConfigDialog</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.ui"/>
+ <source>SSH Key Configuration</source>
+ <translation>ÐаÑтройка ключа SSH</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Generate SSH Key</source>
+ <translation>Создать ключ SSH</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Close</source>
+ <translation>Закрыть</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Options</source>
+ <translation>Параметры</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Key size:</source>
+ <translation>Размер ключа:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Key algorithm:</source>
+ <translation>Ðлгоритм ключа:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>RSA</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location/>
+ <source>DSA</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Key</source>
+ <translation>Ключ</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Save Public Key...</source>
+ <translation>Сохранить открытый...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Save Private Key...</source>
+ <translation>Сохранить Ñекретный...</translation>
+ </message>
+</context>
+<context>
+ <name>MainWindow</name>
+ <message>
+ <location filename="../../../src/tools/qml/standalone/mainwindow.cpp" line="+193"/>
+ <source>Ctrl+Q</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>Ctrl+O</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-57"/>
+ <source>Bauhaus</source>
+ <comment>MainWindowClass</comment>
+ <translation>БаухауÑ</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>&File</source>
+ <translation>&Файл</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&New...</source>
+ <translation>&Ðовый...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ctrl+N</source>
<translation></translation>
</message>
<message>
@@ -10046,7 +10685,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location line="+8"/>
<source>&Preview with Debug</source>
- <translation type="unfinished">ПредпроÑмотр Ñ Ð¾Ñ‚Ð»Ð°&дкой</translation>
+ <translation>ПредпроÑмотр Ñ Ð¾Ñ‚Ð»Ð°&дкой</translation>
</message>
<message>
<location line="+1"/>
@@ -10170,8 +10809,8 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<name>Mercurial::Internal::CloneWizard</name>
<message>
<location filename="../../../src/plugins/mercurial/clonewizard.cpp" line="+56"/>
- <source>Clone a Mercurial repository</source>
- <translation>Клонировать хранилище Mercurial</translation>
+ <source>Clones a Mercurial repository and tries to load the contained project.</source>
+ <translation>Извлечение проекта из хранилища Mercurial Ñ Ð¿Ð¾Ñледующей попыткой его загрузки.</translation>
</message>
<message>
<location line="+5"/>
@@ -10244,7 +10883,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation>Hg иÑходÑщие %1</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+75"/>
<source>Working...</source>
<translation>ИÑполнение...</translation>
</message>
@@ -10331,7 +10970,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
- <location filename="../../../src/plugins/mercurial/mercurialplugin.cpp" line="+219"/>
+ <location filename="../../../src/plugins/mercurial/mercurialplugin.cpp" line="+215"/>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
@@ -10603,11 +11242,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Email to use by default on commit.</source>
<translation>Email иÑпользуемый по умолчанию при фикÑации.</translation>
</message>
- <message>
- <location/>
- <source>Default Email:</source>
- <translation>Email по умолчанию:</translation>
- </message>
<message>
<location/>
<source>Miscellaneous</source>
@@ -10644,6 +11278,11 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Log count:</source>
<translation>КоличеÑтво отображаемых запиÑей иÑтории фикÑаций:</translation>
</message>
+ <message>
+ <location/>
+ <source>Default email:</source>
+ <translation>Email по умолчанию:</translation>
+ </message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
@@ -10897,6 +11536,24 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation>Разница между файлами</translation>
</message>
</context>
+<context>
+ <name>Modifiers</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/Modifiers.qml" line="+6"/>
+ <source>Manipulation</source>
+ <translation type="unfinished">Управление</translation>
+ </message>
+ <message>
+ <location line="+118"/>
+ <source>Rotation</source>
+ <translation type="unfinished">Вращение</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>z</source>
+ <translation></translation>
+ </message>
+</context>
<context>
<name>MyMain</name>
<message>
@@ -11102,7 +11759,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>OpenWith::Editors</name>
<message>
- <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="-133"/>
+ <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="-135"/>
<source>Plain Text Editor</source>
<translation>ТекÑтовый редактор</translation>
</message>
@@ -11112,7 +11769,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation>Бинарный редактор</translation>
</message>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditorconstants.h" line="+40"/>
+ <location filename="../../../src/plugins/cppeditor/cppeditorconstants.h" line="-23"/>
<source>C++ Editor</source>
<translation>Редактор C++</translation>
</message>
@@ -11127,7 +11784,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation>Редактор *.files</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljseditorconstants.h" line="+41"/>
+ <location filename="../../../src/plugins/qmljseditor/qmljseditorconstants.h" line="+44"/>
<source>QMLJS Editor</source>
<translation>Редактор QMLJS</translation>
</message>
@@ -11175,16 +11832,16 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</message>
<message>
<location/>
- <source>Server Prefix:</source>
+ <source>Server prefix:</source>
<translation>ÐŸÑ€ÐµÑ„Ð¸ÐºÑ Ñервера:</translation>
</message>
<message>
<location/>
<source><html><head/><body>
-<p><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. qtcreator.pastebin.com). Fill in the desired prefix.</p>
+<p><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</p>
<p>Note that the plugin will use this for posting as well as fetching.</p></body></html></source>
<translation><html><head/><body>
-<p><a href="http://pastebin.com">pastebin.com</a> позволÑет отправлÑÑ‚ÑŒ данные на пользовательÑкие Ñубдомены (например, qtcreator.pastebin.com). ПоÑтому укажите желаемый префикÑ.</p>
+<p><a href="http://pastebin.com">pastebin.com</a> позволÑет отправлÑÑ‚ÑŒ данные на пользовательÑкие Ñубдомены (например, creator.pastebin.com). ПоÑтому укажите желаемый префикÑ.</p>
<p>Внимание! Модуль будет иÑпользовать его как Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, так и Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ.</p></body></html></translation>
</message>
</context>
@@ -11252,7 +11909,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation>"%1" завершилаÑÑŒ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %2: %3</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+23"/>
<source>The client does not seem to contain any mapped files.</source>
<translation>Похоже, клиент не Ñодержит отображенных файлов.</translation>
</message>
@@ -11532,7 +12189,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation>&Вернуть</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<location line="+52"/>
<source>p4 revert</source>
<translation>p4 revert</translation>
@@ -11712,36 +12369,11 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<name>Perforce::Internal::SettingsPage</name>
<message>
<location filename="../../../src/plugins/perforce/settingspage.ui"/>
- <source>P4 Command:</source>
- <translation>Команда Perforce:</translation>
- </message>
- <message>
- <location/>
- <source>Environment variables</source>
- <translation>Переменные Ñреды окружениÑ</translation>
- </message>
- <message>
- <location/>
- <source>P4 Client:</source>
- <translation>Клиент P4:</translation>
- </message>
- <message>
- <location/>
- <source>P4 User:</source>
- <translation>Пользователь P4:</translation>
- </message>
- <message>
- <location/>
- <source>P4 Port:</source>
- <translation>Порт P4:</translation>
- </message>
- <message>
- <location/>
<source>Test</source>
<translation>Проверить</translation>
</message>
<message>
- <location filename="../../../src/plugins/perforce/settingspage.cpp" line="+136"/>
+ <location filename="../../../src/plugins/perforce/settingspage.cpp" line="+137"/>
<source>Perforce</source>
<translation>Perforce</translation>
</message>
@@ -11775,6 +12407,31 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Log count:</source>
<translation>КоличеÑтво отображаемых запиÑей иÑтории фикÑаций:</translation>
</message>
+ <message>
+ <location/>
+ <source>P4 command:</source>
+ <translation>Команда Perforce:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>P4 client:</source>
+ <translation>Клиент P4:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>P4 user:</source>
+ <translation>Пользователь P4:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>P4 port:</source>
+ <translation>Порт P4:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Environment Variables</source>
+ <translation>Переменные Ñреды окружениÑ</translation>
+ </message>
</context>
<context>
<name>Perforce::Internal::SettingsPageWidget</name>
@@ -11865,7 +12522,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</message>
<message>
<location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp" line="+181"/>
- <location filename="../../../src/plugins/qmldesigner/core/pluginmanager/widgetpluginpath.cpp" line="+204"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp" line="+204"/>
<source>Failed Plugins</source>
<translation>Проблемные модули</translation>
</message>
@@ -11873,7 +12530,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>PluginSpec</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+27"/>
+ <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+32"/>
<source>'%1' misses attribute '%2'</source>
<translation>В '%1' пропущен атрибут '%2'</translation>
</message>
@@ -11908,12 +12565,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation>Ðе удалоÑÑŒ разрешить завиÑимоÑти, так как state != Read</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+19"/>
<source>Could not resolve dependency '%1(%2)'</source>
<translation>Ðе удалоÑÑŒ разрешить завиÑимоÑÑ‚ÑŒ '%1(%2)'</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+42"/>
<source>Loading the library failed because state != Resolved</source>
<translation>Ðе удалоÑÑŒ загрузить библиотеку, так как state != Resolved</translation>
</message>
@@ -11951,7 +12608,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>ProjectExplorer</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorerconstants.h" line="+190"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorerconstants.h" line="+189"/>
<source>Projects</source>
<translation>Проекты</translation>
</message>
@@ -11964,32 +12621,37 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>ProjectExplorer::AbstractProcessStep</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+201"/>
- <source><font color="#0000ff">Starting: %1 %2</font>
+ <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+202"/>
+ <source><font color="#0000ff">Starting: "%1" %2</font>
</source>
- <translation><font color="#0000ff">ЗапуÑкаетÑÑ: %1 %2</font>
+ <translation><font color="#0000ff">ЗапуÑкаетÑÑ: "%1" %2</font>
</translation>
</message>
<message>
- <location line="+7"/>
- <source><font color="#0000ff">Exited with code %1.</font></source>
- <translation><font color="#0000ff">Завершено Ñ ÐºÐ¾Ð´Ð¾Ð¼ %1.</font></translation>
+ <location line="+6"/>
+ <source><font color="#0000ff">The process "%1" exited normally.</font></source>
+ <translation><font color="#0000ff">ПроцеÑÑ "%1" завершилÑÑ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾.</font></translation>
</message>
<message>
<location line="+2"/>
- <source><font color="#ff0000"><b>Exited with code %1.</b></font></source>
- <translation><font color="#ff0000"><b>Завершено Ñ ÐºÐ¾Ð´Ð¾Ð¼ %1.</b></font></translation>
+ <source><font color="#ff0000"><b>The process "%1" exited with code %2.</b></font></source>
+ <translation><font color="#ff0000"><b>ПроцеÑÑ "%1" завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %2.</b></font></translation>
</message>
<message>
- <location line="+6"/>
- <source><font color="#ff0000"><b>Could not start process %1 </b></font></source>
- <translation><font color="#ff0000"><b>Ðевозможно запуÑтить процеÑÑ %1 </b></font></translation>
+ <location line="+2"/>
+ <source><font color="#ff0000"><b>The process "%1" crashed.</b></font></source>
+ <translation><font color="#ff0000"><b>ПроцеÑÑ "%1" завершилÑÑ ÐºÑ€Ð°Ñ…Ð¾Ð¼.</b></font></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source><font color="#ff0000"><b>Could not start process "%1"</b></font></source>
+ <translation><font color="#ff0000"><b>Ðевозможно запуÑтить процеÑÑ "%1"</b></font></translation>
</message>
</context>
<context>
<name>ProjectExplorer::ApplicationLauncher</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+126"/>
+ <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+128"/>
<source>Failed to start program. Path or permissions wrong?</source>
<translation>Ðе удалоÑÑŒ запуÑтить программу. Путь или права недопуÑтимы?</translation>
</message>
@@ -12021,7 +12683,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>ProjectExplorer::BuildConfiguration</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildconfiguration.cpp" line="+221"/>
+ <location filename="../../../src/plugins/projectexplorer/buildconfiguration.cpp" line="+230"/>
<source>System Environment</source>
<translation>СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ñреда</translation>
</message>
@@ -12046,17 +12708,8 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</context>
<context>
<name>ProjectExplorer::BuildManager</name>
- <message numerus="yes">
- <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+66"/>
- <source>Finished %n of %1 build steps</source>
- <translation>
- <numerusform>Завершен %n из %1 Ñтапов Ñборки</numerusform>
- <numerusform>Завершено %n из %1 Ñтапов Ñборки</numerusform>
- <numerusform>Завершено %n из %1 Ñтапов Ñборки</numerusform>
- </translation>
- </message>
<message>
- <location line="+31"/>
+ <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+97"/>
<source>Compile</source>
<comment>Category for compiler isses listened under 'Build Issues'</comment>
<translation>КомпилÑциÑ</translation>
@@ -12083,13 +12736,22 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source><font color="#ff0000">Canceled build.</font></source>
<translation><font color="#ff0000">Сборка прервана.</font></translation>
</message>
+ <message numerus="yes">
+ <location line="-117"/>
+ <source>Finished %1 of %n build steps</source>
+ <translation>
+ <numerusform>Завершено %1 из %n Ñтапа Ñборки</numerusform>
+ <numerusform>Завершено %1 из %n Ñтапов Ñборки</numerusform>
+ <numerusform>Завершено %1 из %n Ñтапов Ñборки</numerusform>
+ </translation>
+ </message>
<message>
- <location line="+66"/>
+ <location line="+186"/>
<source>Build</source>
<translation>Сборка</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+58"/>
<location line="+70"/>
<source><font color="#ff0000">When executing build step '%1'</font></source>
<translation><font color="#ff0000">Во Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñборки на Ñтапе '%1'</font></translation>
@@ -12146,7 +12808,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>ProjectExplorer::CustomProjectWizard</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/customwizard/customwizard.cpp" line="+421"/>
+ <location filename="../../../src/plugins/projectexplorer/customwizard/customwizard.cpp" line="+426"/>
<source>The project %1 could not be opened.</source>
<translation>Ðевозможно открыть проект %1.</translation>
</message>
@@ -12154,15 +12816,15 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>ProjectExplorer::CustomWizard</name>
<message>
- <location line="-316"/>
+ <location line="-321"/>
<source>Details</source>
<comment>Default short title for custom wizard page to be shown in the progress pane of the wizard.</comment>
<translation>Подробнее</translation>
</message>
<message>
<location filename="../../../build/ru/share/qtcreator/translations/customwizard_tr.h" line="+1"/>
- <source>Creates a plug-in for the QML runtime.</source>
- <translation>Создание Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ñреды Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML.</translation>
+ <source>Creates a C++ plugin to extend the funtionality of the QML runtime.</source>
+ <translation>Создание на С++ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾Ñти Ñреды иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML.</translation>
</message>
<message>
<location line="+1"/>
@@ -12184,7 +12846,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>ProjectExplorer::DebuggingHelperLibrary</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+149"/>
+ <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+140"/>
<source>The target directory %1 could not be created.</source>
<translation>Ðе удалоÑÑŒ Ñоздать целевой каталог %1.</translation>
</message>
@@ -12210,7 +12872,7 @@ Reason: %2</source>
Причина: %2</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>Building debugging helper library in %1
</source>
<translation>Сборка библиотеки помощника отладчика в %1
@@ -12243,7 +12905,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::EnvironmentModel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+146"/>
+ <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+143"/>
<source>Variable</source>
<translation>ПеременнаÑ</translation>
</message>
@@ -12253,18 +12915,24 @@ Reason: %2</source>
<translation>Значение</translation>
</message>
<message>
- <location line="+118"/>
- <location line="+224"/>
+ <location line="+101"/>
<source><VARIABLE></source>
+ <comment>Name when inserting a new variable</comment>
<translation><переменнаÑ></translation>
</message>
<message>
- <location line="-219"/>
+ <location line="+2"/>
<source><VALUE></source>
+ <comment>Value when inserting a new variable</comment>
<translation><значение></translation>
</message>
<message>
- <location line="-205"/>
+ <location line="+247"/>
+ <source><VARIABLE></source>
+ <translation><переменнаÑ></translation>
+ </message>
+ <message>
+ <location line="-425"/>
<source><UNSET></source>
<translation><не задано></translation>
</message>
@@ -12272,7 +12940,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::EnvironmentWidget</name>
<message>
- <location line="+343"/>
+ <location line="+345"/>
<source>&Edit</source>
<translation>&Изменить</translation>
</message>
@@ -12292,7 +12960,7 @@ Reason: %2</source>
<translation>&СброÑить</translation>
</message>
<message>
- <location line="+77"/>
+ <location line="+76"/>
<source>Using <b>%1</b></source>
<translation>ИÑпользуетÑÑ <b>%1</b></translation>
</message>
@@ -12336,7 +13004,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::AllProjectsFind</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+64"/>
+ <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+65"/>
<source>All Projects</source>
<translation>Ð’Ñе проекты</translation>
</message>
@@ -12398,12 +13066,12 @@ Reason: %2</source>
<name>ProjectExplorer::Internal::BuildSettingsWidget</name>
<message>
<location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+70"/>
- <source>No Build Settings available</source>
+ <source>No build settings available</source>
<translation>ÐаÑтройки Ñборки не обнаружены</translation>
</message>
<message>
<location line="+13"/>
- <source>Edit Build Configuration:</source>
+ <source>Edit build configuration:</source>
<translation>Изменить конфигурацию Ñборки:</translation>
</message>
<message>
@@ -12445,22 +13113,47 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::BuildStepsPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+280"/>
+ <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+176"/>
+ <source>Move Up</source>
+ <translation>ПоднÑÑ‚ÑŒ</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Move Down</source>
+ <translation>ОпуÑтить</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Remove Item</source>
+ <translation>Удалить</translation>
+ </message>
+ <message>
+ <location line="+80"/>
+ <source>Removing Step failed</source>
+ <translation>Ðе удалоÑÑŒ удалить Ñтап</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Can't remove build step while building</source>
+ <translation>Ðевозможно удалить Ñтап Ñборки во Ð²Ñ€ÐµÐ¼Ñ Ñборки</translation>
+ </message>
+ <message>
+ <location line="+29"/>
<source>No Build Steps</source>
<translation>Ðтапов Ñборки нет</translation>
</message>
<message>
<location line="+7"/>
- <source>Add build step</source>
- <translation>Добавить Ñтап Ñборки</translation>
+ <source>Add Clean Step</source>
+ <translation>Добавить Ñтап очиÑтки</translation>
</message>
<message>
<location line="+0"/>
- <source>Add clean step</source>
- <translation>Добавить Ñтап очиÑтки</translation>
+ <source>Add Build Step</source>
+ <translation>Добавить Ñтап Ñборки</translation>
</message>
<message>
- <location line="-204"/>
+ <location line="-218"/>
<source>Build Steps</source>
<translation>Ðтапы Ñборки</translation>
</message>
@@ -12518,7 +13211,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::CurrentProjectFind</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+64"/>
+ <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+65"/>
<source>Current Project</source>
<translation>Текущий проект</translation>
</message>
@@ -12619,14 +13312,14 @@ Reason: %2</source>
<name>ProjectExplorer::Internal::EditorSettingsPropertiesPage</name>
<message>
<location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.ui"/>
- <source>Default File Encoding:</source>
+ <source>Default file encoding:</source>
<translation>Кодировка файла по умолчанию:</translation>
</message>
</context>
<context>
<name>ProjectExplorer::Internal::FolderNavigationWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="+286"/>
+ <location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="+291"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
@@ -12744,7 +13437,7 @@ Reason: %2</source>
<translation>ЗапуÑкаетÑÑ %1...</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+28"/>
<source>%1 exited with code %2</source>
<translation>%1 завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %2</translation>
</message>
@@ -12752,7 +13445,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::LocalApplicationRunControlFactory</name>
<message>
- <location line="-72"/>
+ <location line="-74"/>
<source>Run</source>
<translation>Выполнить</translation>
</message>
@@ -12760,7 +13453,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::MiniProjectTargetSelector</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/miniprojecttargetselector.cpp" line="+384"/>
+ <location filename="../../../src/plugins/projectexplorer/miniprojecttargetselector.cpp" line="+392"/>
<source>Project</source>
<translation>Проект</translation>
</message>
@@ -12770,7 +13463,17 @@ Reason: %2</source>
<translation>Выбор активного проекта</translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+196"/>
+ <source>Build:</source>
+ <translation>Сборка:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Run:</source>
+ <translation>ЗапуÑк:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source><html><nobr><b>Project:</b> %1<br/>%2%3<b>Run:</b> %4%5</html></source>
<translation><html><nobr><b>Проект:</b> %1<br/>%2%3<b>ЗапуÑк:</b> %4%5</html></translation>
</message>
@@ -12793,7 +13496,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::MiniTargetWidget</name>
<message>
- <location line="-399"/>
+ <location line="-433"/>
<source>Select active build configuration</source>
<translation>Выбор активной конфигурации Ñборки</translation>
</message>
@@ -12803,33 +13506,20 @@ Reason: %2</source>
<translation>Выбор активной конфигурации запуÑка</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Build:</source>
<translation>Сборка:</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Run:</source>
<translation>ЗапуÑк:</translation>
</message>
</context>
-<context>
- <name>ProjectExplorer::Internal::NewSessionInputDialog</name>
- <message>
- <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+89"/>
- <source>New session name</source>
- <translation>Ðазвание новой ÑеÑÑии</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Enter the name of the new session:</source>
- <translation>Введите название новой ÑеÑÑии:</translation>
- </message>
-</context>
<context>
<name>ProjectExplorer::Internal::OutputPane</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+79"/>
+ <location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+73"/>
<source>Re-run this run-configuration</source>
<translation>ПерезапуÑтить Ñту конфигурацию запуÑка</translation>
</message>
@@ -12840,25 +13530,35 @@ Reason: %2</source>
<translation>ОÑтановить</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>Application Output</source>
<translation>КонÑоль приложениÑ</translation>
</message>
<message>
- <location line="+120"/>
- <source>The application is still running. Close it first.</source>
- <translation>Приложение работает. Сначала закройте его.</translation>
+ <location line="+124"/>
+ <source>The application is still running.</source>
+ <translation>Программа еще работает.</translation>
</message>
<message>
- <location line="+1"/>
- <source>Unable to close</source>
- <translation>Ðевозможно закрыть</translation>
+ <location line="+3"/>
+ <source>Force it to quit?</source>
+ <translation>Завершить её принудительно?</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Force Quit</source>
+ <translation>Завершить</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Unable to close</source>
+ <translation>Ðевозможно закрыть</translation>
</message>
</context>
<context>
<name>ProjectExplorer::Internal::OutputWindow</name>
<message>
- <location line="+86"/>
+ <location line="+93"/>
<source>Application Output Window</source>
<translation>Окно вывода приложениÑ</translation>
</message>
@@ -12900,24 +13600,24 @@ Reason: %2</source>
</message>
<message>
<location/>
- <source>Working Directory:</source>
- <translation>Рабочий каталог:</translation>
+ <source>Enable custom process step</source>
+ <translation>Включить Ñтот Ñтап</translation>
</message>
<message>
<location/>
- <source>Command Arguments:</source>
- <translation>Параметры:</translation>
+ <source>Working directory:</source>
+ <translation>Рабочий каталог:</translation>
</message>
<message>
<location/>
- <source>Enable Custom Process Step</source>
- <translation>Включить Ñтот Ñтап</translation>
+ <source>Command arguments:</source>
+ <translation>Параметры команды:</translation>
</message>
</context>
<context>
<name>ProjectExplorer::Internal::ProjectExplorerSettingsPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+127"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+129"/>
<source>General</source>
<translation>ОÑновное</translation>
</message>
@@ -12929,21 +13629,6 @@ Reason: %2</source>
<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>
@@ -12974,6 +13659,26 @@ Reason: %2</source>
<source>Projects Directory</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>Clear old application output on a new run</source>
+ <translation>Очищать Ñтарый вывод Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ новом запуÑке</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::Internal::ProjectFileFactory</name>
@@ -13071,21 +13776,11 @@ No project selected</extracomment>
</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>Resume Session</source>
- <translation>Продолжение ÑеÑÑии</translation>
+ <source>Recent Projects</source>
+ <translation>ПоÑледние проекты</translation>
</message>
<message>
- <location line="+30"/>
+ <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.cpp" line="+128"/>
<source>%1 (last session)</source>
<translation>%1 (поÑледнÑÑ ÑеÑÑиÑ)</translation>
</message>
@@ -13095,9 +13790,24 @@ No project selected</extracomment>
<translation>%1 (Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ ÑеÑÑиÑ)</translation>
</message>
<message>
- <location line="+46"/>
- <source>New Project...</source>
- <translation>Ðовый проект...</translation>
+ <location line="+47"/>
+ <source>New Project</source>
+ <translation>Ðовый проект</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.ui"/>
+ <source>Create Project...</source>
+ <translation>Создать проект...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Recent Sessions</source>
+ <translation>ПоÑледние ÑеÑÑии</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Open Project...</source>
+ <translation>Открыть проект...</translation>
</message>
</context>
<context>
@@ -13173,12 +13883,30 @@ No project selected</extracomment>
</message>
</context>
<context>
- <name>ProjectExplorer::Internal::SessionDialog</name>
+ <name>ProjectExplorer::Internal::S60ProjectChecker</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp" line="+53"/>
+ <source>The Symbian SDK and the project sources must reside on the same drive.</source>
+ <translation>Symbian SDK и иÑходные файлы проекта должны раÑполагатьÑÑ Ð½Ð° одном диÑке.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>The Symbian SDK was not found for Qt version %1.</source>
+ <translation>Ðе найден Symbian SDK Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Qt %1.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The "Open C/C++ plugin" is not installed in the Symbian SDK or the Symbian SDK path is misconfigured for Qt version %1.</source>
+ <translation>У Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Qt %1 путь к Symbian SDK неверен или в него не уÑтановлен "Open C/C++ plugin".</translation>
+ </message>
<message>
- <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+22"/>
- <source>Switch to session</source>
- <translation>Сделать активной</translation>
+ <location line="+12"/>
+ <source>The Symbian toolchain does not handle special characters in a project path well.</source>
+ <translation>ИнÑтрументарий Symbian не ÑпоÑобен обрабатывать Ñпециальные Ñимволы в пути проекта.</translation>
</message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::SessionDialog</name>
<message>
<location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
<source>Session Manager</source>
@@ -13186,23 +13914,44 @@ No project selected</extracomment>
</message>
<message>
<location/>
- <source>Create New Session</source>
- <translation>Создать</translation>
+ <source><a href="qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">What is a Session?</a></source>
+ <translation><a href="qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">Что такое ÑеÑÑиÑ?</a></translation>
</message>
<message>
<location/>
- <source>Clone Session</source>
- <translation>Копировать</translation>
+ <source>&New</source>
+ <translation>&ÐоваÑ</translation>
</message>
<message>
<location/>
- <source>Delete Session</source>
- <translation>Удалить</translation>
+ <source>&Rename</source>
+ <translation>&Переименовать</translation>
</message>
<message>
<location/>
- <source><a href="qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">What is a Session?</a></source>
- <translation><a href="qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">Что такое ÑеÑÑиÑ?</a></translation>
+ <source>C&lone</source>
+ <translation>&Дублировать</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Delete</source>
+ <translation>&Удалить</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Switch to</source>
+ <translation>&Открыть</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+178"/>
+ <location line="+18"/>
+ <source>New session name</source>
+ <translation>Ð˜Ð¼Ñ Ñоздаваемой ÑеÑÑии</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rename session</source>
+ <translation>Переименование ÑеÑÑии</translation>
</message>
</context>
<context>
@@ -13219,6 +13968,27 @@ No project selected</extracomment>
<translation>Ðеозаглавленный</translation>
</message>
</context>
+<context>
+ <name>ProjectExplorer::Internal::SessionNameInputDialog</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="-130"/>
+ <source>Enter the name of the session:</source>
+ <translation>Введите название ÑеÑÑии:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::TargetSelector</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/targetselector.h" line="+24"/>
+ <source>Run</source>
+ <translation>Выполнить</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Build</source>
+ <translation>Собрать</translation>
+ </message>
+</context>
<context>
<name>ProjectExplorer::Internal::TargetSettingsPanelWidget</name>
<message>
@@ -13227,7 +13997,7 @@ No project selected</extracomment>
<translation>Цель не указана.</translation>
</message>
<message>
- <location line="+103"/>
+ <location line="+102"/>
<source>Qt Creator</source>
<translation>Qt Creator</translation>
</message>
@@ -13250,7 +14020,7 @@ No project selected</extracomment>
<context>
<name>ProjectExplorer::Internal::TaskDelegate</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+903"/>
+ <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+927"/>
<source>File not found: %1</source>
<translation>Файл не найден: %1</translation>
</message>
@@ -13310,7 +14080,7 @@ No project selected</extracomment>
<context>
<name>ProjectExplorer::ProjectExplorerPlugin</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+273"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+271"/>
<source>Projects</source>
<translation>Проекты</translation>
</message>
@@ -13523,7 +14293,7 @@ No project selected</extracomment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+119"/>
<source>Load Project</source>
<translation>Загрузить проект</translation>
</message>
@@ -13534,12 +14304,12 @@ No project selected</extracomment>
<translation>Ðовый проект</translation>
</message>
<message>
- <location line="+523"/>
+ <location line="+527"/>
<source>Always save files before build</source>
<translation>Ð’Ñегда ÑохранÑÑ‚ÑŒ файлы перед Ñборкой</translation>
</message>
<message>
- <location line="+344"/>
+ <location line="+338"/>
<source>Cannot run without a project.</source>
<translation>Ðевозможно запуÑтить без проекта.</translation>
</message>
@@ -13549,7 +14319,7 @@ No project selected</extracomment>
<translation>Ðевозможно запуÑтить отладку без проекта.</translation>
</message>
<message>
- <location line="+151"/>
+ <location line="+140"/>
<source>New File</source>
<comment>Title of dialog</comment>
<translation>Ðовый файл</translation>
@@ -13660,8 +14430,8 @@ to version control (%2)?</source>
<context>
<name>ProjectExplorer::TaskWindow</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="-448"/>
- <location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+101"/>
+ <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="-464"/>
+ <location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+113"/>
<source>Build Issues</source>
<translation>Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñборки</translation>
</message>
@@ -13695,38 +14465,46 @@ to version control (%2)?</source>
</message>
</context>
<context>
- <name>QML</name>
+ <name>QApplication</name>
<message>
- <source>QML</source>
- <translation type="obsolete">QML</translation>
+ <location filename="../../../src/plugins/help/helpplugin.cpp" line="-520"/>
+ <source>EditorManager</source>
+ <comment>Next Open Document in History</comment>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>EditorManager</source>
+ <comment>Previous Open Document in History</comment>
+ <translation></translation>
</message>
</context>
<context>
<name>QMakeStep</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qmakestep.ui"/>
- <source>debug</source>
- <translation>debug</translation>
+ <source>Additional arguments:</source>
+ <translation>Дополнительные параметры:</translation>
</message>
<message>
<location/>
- <source>release</source>
- <translation>release</translation>
+ <source>Effective qmake call:</source>
+ <translation>Параметры вызова qmake:</translation>
</message>
<message>
<location/>
- <source>Additional arguments:</source>
- <translation>Дополнительные параметры:</translation>
+ <source>qmake build configuration:</source>
+ <translation>ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñборки qmake:</translation>
</message>
<message>
<location/>
- <source>Effective qmake call:</source>
- <translation>Параметры вызова qmake:</translation>
+ <source>Debug</source>
+ <translation>Отладка</translation>
</message>
<message>
<location/>
- <source>qmake Build Configuration:</source>
- <translation>ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñборки qmake:</translation>
+ <source>Release</source>
+ <translation>Релиз</translation>
</message>
</context>
<context>
@@ -13862,40 +14640,37 @@ to version control (%2)?</source>
</message>
</context>
<context>
- <name>Qml::Internal::EngineSpinBox</name>
+ <name>Qml::Internal::EngineComboBox</name>
<message>
- <location filename="../../../src/plugins/qmlinspector/qmlinspector.cpp" line="+128"/>
+ <location filename="../../../src/plugins/qmlinspector/qmlinspector.cpp" line="+135"/>
<source>Engine %1</source>
<comment>engine number</comment>
- <translation type="unfinished">Движок %1</translation>
+ <translation>Движок %1</translation>
</message>
</context>
<context>
<name>Qml::Internal::ExpressionQueryWidget</name>
<message>
- <location filename="../../../src/plugins/qmlinspector/components/expressionquerywidget.cpp" line="+87"/>
- <source><Expression></source>
- <translation><Выражение></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location filename="../../../src/plugins/qmlinspector/components/expressionquerywidget.cpp" line="+88"/>
<source>Write and evaluate QtScript expressions.</source>
<translation type="unfinished">ЗапиÑÑŒ и вычиÑление выражений QtScript.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>Clear Output</source>
<translation>ОчиÑтить вывод</translation>
</message>
<message>
- <location line="+31"/>
- <source>Debug Console
-</source>
- <translation>КонÑоль отладки</translation>
+ <location line="-4"/>
+ <source><Type expression to evaluate></source>
+ <translation><Введите выражение Ð´Ð»Ñ Ð²Ñ‹Ñ‡Ð¸ÑлениÑ></translation>
</message>
<message>
- <source>Triggers a completion in this scope</source>
- <translation type="obsolete">Переключение Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð² Ñтой облаÑти</translation>
+ <location line="+35"/>
+ <source>Script Console
+</source>
+ <translation>КонÑоль ÑценариÑ
+</translation>
</message>
<message>
<location line="+43"/>
@@ -13929,7 +14704,7 @@ to version control (%2)?</source>
<context>
<name>Qml::Internal::ObjectPropertiesView</name>
<message>
- <location filename="../../../src/plugins/qmlinspector/components/objectpropertiesview.cpp" line="+84"/>
+ <location filename="../../../src/plugins/qmlinspector/components/objectpropertiesview.cpp" line="+76"/>
<source>Name</source>
<translation>ИмÑ</translation>
</message>
@@ -13943,8 +14718,13 @@ to version control (%2)?</source>
<source>Type</source>
<translation>Тип</translation>
</message>
+ <message>
+ <location line="+427"/>
+ <source>Show unwatchable properties</source>
+ <translation>Отобразить ненаблюдаемые ÑвойÑтва</translation>
+ </message>
<message numerus="yes">
- <location line="+85"/>
+ <location line="-301"/>
<source><%n items></source>
<translation>
<numerusform><%n Ñлемент></numerusform>
@@ -13952,16 +14732,56 @@ to version control (%2)?</source>
<numerusform><%n Ñлементов></numerusform>
</translation>
</message>
+ <message>
+ <location line="-121"/>
+ <source>&Watch expression</source>
+ <translation>&Ðаблюдаемое выражение</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Remove watch</source>
+ <translation>&Удалить наблюдение</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show &unwatchable properties</source>
+ <translation>&Отобразить ненаблюдаемые ÑвойÑтва</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&Group by item type</source>
+ <translation>&Сгруппировать по типу</translation>
+ </message>
+ <message>
+ <location line="+407"/>
+ <source>Watch expression '%1'</source>
+ <translation>Ðаблюдаемое выражение "%1"</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Hide unwatchable properties</source>
+ <translation>Скрыть ненаблюдаемые ÑвойÑтва</translation>
+ </message>
</context>
<context>
<name>Qml::Internal::ObjectTree</name>
<message>
- <location filename="../../../src/plugins/qmlinspector/components/objecttree.cpp" line="+222"/>
- <source>Add watch...</source>
- <translation>Добавить в наблюдение...</translation>
+ <location filename="../../../src/plugins/qmlinspector/components/objecttree.cpp" line="+57"/>
+ <source>Add watch expression...</source>
+ <translation type="unfinished">Добавить выражение Ð´Ð»Ñ Ð½Ð°Ð±Ð»ÑŽÐ´ÐµÐ½Ð¸Ñ...</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1"/>
+ <source>Show uninspectable items</source>
+ <translation type="unfinished">Отобразить неиÑÑледуемые Ñлементы</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Go to file</source>
+ <translation>Перейти к файлу</translation>
+ </message>
+ <message>
+ <location line="+215"/>
<source>Watch expression</source>
<translation>Ðаблюдаемое выражение</translation>
</message>
@@ -13979,10 +14799,18 @@ to version control (%2)?</source>
<translation>ЧаÑтота кадров</translation>
</message>
</context>
+<context>
+ <name>Qml::Internal::StartExternalQmlDialog</name>
+ <message>
+ <location filename="../../../src/plugins/qmlinspector/startexternalqmldialog.cpp" line="+17"/>
+ <source><No project></source>
+ <translation><Ðе указан></translation>
+ </message>
+</context>
<context>
<name>Qml::Internal::WatchTableModel</name>
<message>
- <location filename="../../../src/plugins/qmlinspector/components/watchtable.cpp" line="+143"/>
+ <location filename="../../../src/plugins/qmlinspector/components/watchtable.cpp" line="+153"/>
<source>Name</source>
<translation>ИмÑ</translation>
</message>
@@ -13995,7 +14823,7 @@ to version control (%2)?</source>
<context>
<name>Qml::Internal::WatchTableView</name>
<message>
- <location line="+187"/>
+ <location line="+219"/>
<source>Stop watching</source>
<translation>Прекратить наблюдение</translation>
</message>
@@ -14003,9 +14831,19 @@ to version control (%2)?</source>
<context>
<name>Qml::QmlInspector</name>
<message>
- <location filename="../../../src/plugins/qmlinspector/qmlinspector.cpp" line="+70"/>
- <source>No active project, debugging canceled.</source>
- <translation>Ðет активных проектов, отладка отменена.</translation>
+ <location filename="../../../src/plugins/qmlinspector/qmlinspector.cpp" line="+75"/>
+ <source>Failed to connect to debugger</source>
+ <translation>Ðе удалоÑÑŒ подключитьÑÑ Ðº отладчику</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not connect to debugger server.</source>
+ <translation>Ðе удалоÑÑŒ подключитьÑÑ Ðº Ñерверу отладчика.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Invalid project, debugging canceled.</source>
+ <translation>Ðекорректный проект, отладка отменена.</translation>
</message>
<message>
<location line="+7"/>
@@ -14013,12 +14851,12 @@ to version control (%2)?</source>
<translation>Ðе удалоÑÑŒ найти конфигурацию запуÑка проекта, отладка отменена.</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+38"/>
<source>[Inspector] set to connect to debug server %1:%2</source>
<translation>[ИнÑпектор] уÑтановите Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº Ñерверу отладки %1: %2</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+20"/>
<source>[Inspector] disconnected.
</source>
@@ -14027,7 +14865,7 @@ to version control (%2)?</source>
</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+14"/>
<source>[Inspector] resolving host...</source>
<translation>[ИнÑпектор] определение узла...</translation>
</message>
@@ -14055,12 +14893,40 @@ to version control (%2)?</source>
<translation>[ИнÑпектор] ошибка (%1) %2</translation>
</message>
<message>
- <location line="+13"/>
- <source>Frame rate</source>
- <translation>ЧаÑтота кадров</translation>
+ <location line="+111"/>
+ <source>Start Debugging C++ and QML Simultaneously...</source>
+ <translation>ЗапуÑтить одновременно отладку C++ и QML...</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+32"/>
+ <source>No project was found.</source>
+ <translation>Ðе найдено ни одного проекта.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <location line="+47"/>
+ <source>No run configurations were found for the project '%1'.</source>
+ <translation>Ðе обнаружена ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿ÑƒÑка Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð° "%1".</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No valid run configuration was found for the project %1. Only locally runnable configurations are supported.
+Please check your project settings.</source>
+ <translation>Ðе обнаружена ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿ÑƒÑка Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð° %1. ПоддерживаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ локально запуÑкаемые конфигурации.
+ПожалуйÑта, проверьте наÑтройки.</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>A valid run control was not registered in Qt Creator for this project run configuration.</source>
+ <translation type="unfinished">Корректное управление выполнением не зарегиÑтрировано в Qt Creator Ð´Ð»Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ запуÑка Ñтого проекта.</translation>
+ </message>
+ <message>
+ <location line="+54"/>
+ <source>Debugging failed: could not start C++ debugger.</source>
+ <translation>Ошибка отладки: не удалоÑÑŒ запуÑтить отладчик C++.</translation>
+ </message>
+ <message>
+ <location line="-287"/>
<source>QML engine:</source>
<translation>Движок QML:</translation>
</message>
@@ -14070,44 +14936,21 @@ to version control (%2)?</source>
<translation>Дерево объектов</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+46"/>
<source>Properties and Watchers</source>
<translation>СвойÑтва и наблюдаемые</translation>
</message>
<message>
- <location line="+18"/>
- <source>Contents of the scene.</source>
- <translation>Содержимое Ñцены.</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Frame rate graph for analyzing performance.</source>
- <translation>График чаÑтоты кадров Ð´Ð»Ñ Ð°Ð½Ð°Ð»Ð¸Ð·Ð° быÑтродейÑтвиÑ.</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Properties of the selected item.</source>
- <translation>СвойÑтва выбранного Ñлемента.</translation>
+ <location line="+24"/>
+ <source>Script Console</source>
+ <translation>КонÑоль ÑценариÑ</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Output of the QML inspector, such as information on connecting to the server.</source>
<translation>Вывод инÑпектора QML, такой как Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ подключении к Ñерверу.</translation>
</message>
</context>
-<context>
- <name>Qml::QmlInspectorPlugin</name>
- <message>
- <location filename="../../../src/plugins/qmlinspector/qmlinspectorplugin.cpp" line="+173"/>
- <source>Failed to connect to debugger</source>
- <translation>Ðе удалоÑÑŒ подключитьÑÑ Ðº отладчику</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Could not connect to debugger server. Please check your settings from Projects pane.</source>
- <translation>Ðе удалоÑÑŒ подключитьÑÑ Ðº Ñерверу отладчика. Проверьте наÑтройки проекта.</translation>
- </message>
-</context>
<context>
<name>QmlDesigner::AllPropertiesBox</name>
<message>
@@ -14117,6 +14960,14 @@ to version control (%2)?</source>
<translation>СвойÑтва</translation>
</message>
</context>
+<context>
+ <name>QmlDesigner::ComponentView</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/components/integration/componentview.cpp" line="+75"/>
+ <source>whole document</source>
+ <translation>документ полноÑтью</translation>
+ </message>
+</context>
<context>
<name>QmlDesigner::DesignDocumentController</name>
<message>
@@ -14125,7 +14976,7 @@ to version control (%2)?</source>
<translation>-ÐÐ¾Ð²Ð°Ñ Ð¤Ð¾Ñ€Ð¼Ð°-</translation>
</message>
<message>
- <location line="+178"/>
+ <location line="+182"/>
<source>Cannot save to file "%1": permission denied.</source>
<translation>Ðе удалоÑÑŒ Ñохранить в файл "%1": недоÑтаточно прав.</translation>
</message>
@@ -14135,20 +14986,38 @@ to version control (%2)?</source>
<translation>РодительÑкий каталог "%1" файла "%2" не ÑущеÑтвует.</translation>
</message>
<message>
- <location line="+307"/>
+ <location line="+312"/>
<source>Cannot write file: "%1".</source>
<translation>Ðе удалоÑÑŒ запиÑать файл: "%1".</translation>
</message>
</context>
<context>
- <name>QmlDesigner::Internal::BauhausPlugin</name>
+ <name>QmlDesigner::FormEditorWidget</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp" line="+88"/>
+ <source>Snap to guides (E)</source>
+ <translation>Прилипать к направлÑющим (E)</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Show bounding rectangles (A)</source>
+ <translation type="unfinished">Отображать прÑмоугольники границы (A)</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Only select items with content (S)</source>
+ <translation>ВыделÑÑ‚ÑŒ только Ñлементы Ñ Ñодержимым (S)</translation>
+ </message>
+</context>
+<context>
+ <name>QmlDesigner::Internal::BauhausPlugin</name>
<message>
<location filename="../../../src/plugins/qmldesigner/qmldesignerplugin.cpp" line="+130"/>
<source>Switch Text/Design</source>
<translation>Переключить текÑÑ‚/дизайн</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+200"/>
<source>Save %1 As...</source>
<translation>Сохранить %1 как...</translation>
</message>
@@ -14181,7 +15050,7 @@ to version control (%2)?</source>
<context>
<name>QmlDesigner::Internal::DesignModeWidget</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/designmodewidget.cpp" line="+128"/>
+ <location filename="../../../src/plugins/qmldesigner/designmodewidget.cpp" line="+148"/>
<source>&Undo</source>
<translation>&Отменить</translation>
</message>
@@ -14241,17 +15110,37 @@ to version control (%2)?</source>
<translation>Выделить вÑе "%1"</translation>
</message>
<message>
- <location line="+364"/>
+ <location line="+2"/>
+ <source>Toggle Full Screen</source>
+ <translation>Переключить полноÑкранный режим</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&Restore Default View</source>
+ <translation type="unfinished">&ВоÑÑтановить иÑходный вид</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Toggle &Left Sidebar</source>
+ <translation type="unfinished">Показать/Ñкрыть &левую панель</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Toggle &Right Sidebar</source>
+ <translation type="unfinished">Показать/Ñкрыть &правую панель</translation>
+ </message>
+ <message>
+ <location line="+429"/>
<source>Projects</source>
<translation>Проекты</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>File System</source>
<translation>Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Open Documents</source>
<translation>Открытые документы</translation>
</message>
@@ -14259,15 +15148,28 @@ to version control (%2)?</source>
<context>
<name>QmlDesigner::Internal::DocumentWarningWidget</name>
<message>
- <location line="-422"/>
+ <location line="-502"/>
<source><a href="goToError">Go to error</a></source>
<translation><a href="goToError">Перейти к ошибке</a></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+16"/>
<source>%3 (%1:%2)</source>
<translation>%3 (%1:%2)</translation>
</message>
+ <message>
+ <location line="+3"/>
+ <source>Internal error (%1)</source>
+ <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° (%1)</translation>
+ </message>
+</context>
+<context>
+ <name>QmlDesigner::Internal::ModelPrivate</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/designercore/model/model.cpp" line="+172"/>
+ <source>invalid type</source>
+ <translation>некорректный тип</translation>
+ </message>
</context>
<context>
<name>QmlDesigner::Internal::SettingsPage</name>
@@ -14276,46 +15178,6 @@ to version control (%2)?</source>
<source>Form</source>
<translation></translation>
</message>
- <message>
- <source>&Snap to Grid</source>
- <translation type="obsolete">ПритÑгивать к &Ñетке</translation>
- </message>
- <message>
- <source>Show Bounding Rectangles</source>
- <translation type="obsolete">Показывать границы</translation>
- </message>
- <message>
- <source>Only Show Items with Contents</source>
- <translation type="obsolete">Отображать только непуÑтые Ñлементы</translation>
- </message>
- <message>
- <source>Designer</source>
- <translation type="obsolete">Дизайнер</translation>
- </message>
- <message>
- <source>Open editor in:</source>
- <translation type="obsolete">Открывать редактор в режиме:</translation>
- </message>
- <message>
- <location/>
- <source>Design mode</source>
- <translation>Дизайнере</translation>
- </message>
- <message>
- <location/>
- <source>Edit mode</source>
- <translation>Редакторе</translation>
- </message>
- <message>
- <location/>
- <source>Files</source>
- <translation>Файлы</translation>
- </message>
- <message>
- <location/>
- <source>Open file in:</source>
- <translation>Открыть файл в:</translation>
- </message>
<message>
<location/>
<source>Snapping</source>
@@ -14332,7 +15194,7 @@ to version control (%2)?</source>
<translation type="unfinished">ОтÑтуп от краÑ</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+87"/>
+ <location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+83"/>
<source>Qt Quick Designer</source>
<translation type="unfinished">Дизайнер Qt Quick</translation>
</message>
@@ -14374,23 +15236,27 @@ to version control (%2)?</source>
<comment>Default name for newly created states</comment>
<translation></translation>
</message>
- <message>
- <source>State%1</source>
- <translation type="obsolete">СоÑтоÑние%1</translation>
- </message>
</context>
<context>
<name>QmlDesigner::Internal::SubComponentManagerPrivate</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp" line="+307"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp" line="+309"/>
<source>QML Components</source>
<translation>Компоненты QML</translation>
</message>
</context>
+<context>
+ <name>QmlDesigner::InvalidArgumentException</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp" line="+60"/>
+ <source>Failed to create item of type %1</source>
+ <translation>Ðе удалоÑÑŒ Ñоздать Ñлемент типа %1</translation>
+ </message>
+</context>
<context>
<name>QmlDesigner::ItemLibrary</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp" line="+126"/>
+ <location filename="../../../src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp" line="+128"/>
<source>Library</source>
<comment>Title of library view</comment>
<translation>Библиотека</translation>
@@ -14417,24 +15283,15 @@ to version control (%2)?</source>
<context>
<name>QmlDesigner::NavigatorTreeModel</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp" line="+280"/>
- <source>Invalid id.
-Only alphanumeric characters and underscore allowed.
-Ids must begin with a lowercase letter.</source>
- <translation>Ðеверный идентификатор.
-ДопуÑтимы только цифры, буквы и знак подчёркиваниÑ.
-Идентификаторы должны начинатьÑÑ Ñ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¾Ð¹ буквы.</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Item id must be unique.</source>
- <translation>Идентификатор Ñлемента должен быть уникальным.</translation>
+ <location filename="../../../src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp" line="+279"/>
+ <source>Invalid Id</source>
+ <translation>Ðеверный идентификатор</translation>
</message>
</context>
<context>
<name>QmlDesigner::NavigatorWidget</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp" line="+60"/>
+ <location filename="../../../src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp" line="+61"/>
<source>Navigator</source>
<comment>Title of navigator view</comment>
<translation>Ðавигатор</translation>
@@ -14448,10 +15305,26 @@ Ids must begin with a lowercase letter.</source>
<translation>О модулÑÑ…</translation>
</message>
</context>
+<context>
+ <name>QmlDesigner::PropertyEditor</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp" line="+357"/>
+ <source>Invalid Id</source>
+ <translation>Ðеверный идентификатор</translation>
+ </message>
+</context>
+<context>
+ <name>QmlDesigner::QmlModelView</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp" line="+179"/>
+ <source>Invalid Id</source>
+ <translation type="unfinished">Ðеверный идентификатор</translation>
+ </message>
+</context>
<context>
<name>QmlDesigner::RewriterView</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/model/rewriterview.cpp" line="+88"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/model/rewriterview.cpp" line="+79"/>
<source>Error parsing</source>
<translation>Разбор ошибок</translation>
</message>
@@ -14511,47 +15384,47 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlJS::Check</name>
<message>
- <location filename="../../../src/libs/qmljs/qmljscheck.cpp" line="+43"/>
+ <location filename="../../../src/libs/qmljs/qmljscheck.cpp" line="+325"/>
<source>'%1' is not a valid property name</source>
<translation>"%1" не ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¼ именем ÑвойÑтва</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-114"/>
<source>unknown type</source>
<translation>неизвеÑтный тип</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-138"/>
+ <source>unknown value for enum</source>
+ <translation type="unfinished">неизвеÑтное значение Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‡Ð¸ÑлениÑ</translation>
+ </message>
+ <message>
+ <location line="+265"/>
<source>'%1' does not have members</source>
<translation>"%1" не Ñодержит членов</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+16"/>
<source>'%1' is not a member of '%2'</source>
<translation>"%1" не ÑвлÑетÑÑ Ñ‡Ð»ÐµÐ½Ð¾Ð¼ "%2"</translation>
</message>
<message>
- <location line="+1"/>
- <source>easing-curve name is not a string</source>
- <translation type="unfinished">название переходной кривой не ÑвлÑетÑÑ Ñтрокой</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>unknown easing-curve name</source>
- <translation type="unfinished">неизвеÑтное Ð¸Ð¼Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð½Ð¾Ð¹ кривой</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-277"/>
<source>value might be 'undefined'</source>
<translation>значение возможно не определено</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+2"/>
+ <source>enum value is not a string or number</source>
+ <translation type="unfinished">значение перечиÑÐ»ÐµÐ½Ð¸Ñ Ð½Ðµ Ñтрока или чиÑло</translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>numerical value expected</source>
<translation>требуетÑÑ Ñ‡Ð¸Ñловое значение</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+12"/>
<source>boolean value expected</source>
<translation>требуетÑÑ Ð±ÑƒÐ»ÐµÐ²Ð¾Ðµ значение</translation>
</message>
@@ -14561,7 +15434,7 @@ Ids must begin with a lowercase letter.</source>
<translation>требуетÑÑ Ñтроковое значение</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+25"/>
<source>not a valid color</source>
<translation>некорректный цвет</translation>
</message>
@@ -14571,7 +15444,7 @@ Ids must begin with a lowercase letter.</source>
<translation>требуетÑÑ Ñтрока привÑзки</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+93"/>
<location line="+11"/>
<source>expected id</source>
<translation>требуетÑÑ id</translation>
@@ -14579,18 +15452,18 @@ Ids must begin with a lowercase letter.</source>
<message>
<location line="-2"/>
<source>using string literals for ids is discouraged</source>
- <translation type="unfinished">не рекомендуетÑÑ Ð¸Ñпользовать Ñтроковые литералы в качеÑтве идентификаторов</translation>
+ <translation>не рекомендуетÑÑ Ð¸Ñпользовать Ñтроковые литералы в качеÑтве id</translation>
</message>
<message>
<location line="+7"/>
<source>ids must be lower case</source>
- <translation type="unfinished">идентификаторы должны быть в нижнем региÑтре</translation>
+ <translation>id должен быть в нижнем региÑтре</translation>
</message>
</context>
<context>
<name>QmlJS::Interpreter::QmlXmlReader</name>
<message>
- <location filename="../../../src/libs/qmljs/qmljsinterpreter.cpp" line="+338"/>
+ <location filename="../../../src/libs/qmljs/qmljsinterpreter.cpp" line="+344"/>
<source>The file is not module file.</source>
<translation>Файл не ÑвлÑетÑÑ Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¼.</translation>
</message>
@@ -14610,7 +15483,7 @@ Ids must begin with a lowercase letter.</source>
<translation>У <%1> нет корректного атрибута %2</translation>
</message>
<message>
- <location line="+1570"/>
+ <location line="+1549"/>
<source>%1: %2</source>
<translation></translation>
</message>
@@ -14618,7 +15491,7 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlJS::Link</name>
<message>
- <location filename="../../../src/libs/qmljs/qmljslink.cpp" line="+231"/>
+ <location filename="../../../src/libs/qmljs/qmljslink.cpp" line="+218"/>
<source>could not find file or directory</source>
<translation>не удалоÑÑŒ найти файл или каталог</translation>
</message>
@@ -14633,7 +15506,7 @@ Ids must begin with a lowercase letter.</source>
<translation>импорт пакета требует номер верÑии</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+47"/>
<source>package not found</source>
<translation>пакет не найден</translation>
</message>
@@ -14641,7 +15514,7 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlJSEditor::Internal::HoverHandler</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljshoverhandler.cpp" line="+78"/>
+ <location filename="../../../src/plugins/qmljseditor/qmljshoverhandler.cpp" line="+80"/>
<source>Unfiltered</source>
<translation type="unfinished">Ð’ÑÑ</translation>
</message>
@@ -14649,7 +15522,7 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlJSEditor::Internal::ModelManager</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljsmodelmanager.cpp" line="+131"/>
+ <location filename="../../../src/plugins/qmljseditor/qmljsmodelmanager.cpp" line="+134"/>
<source>Indexing</source>
<translation>ИндекÑациÑ</translation>
</message>
@@ -14706,7 +15579,7 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlJSEditor::Internal::QmlJSEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljseditorplugin.cpp" line="+107"/>
+ <location filename="../../../src/plugins/qmljseditor/qmljseditorplugin.cpp" line="+111"/>
<source>Creates a Qt QML file.</source>
<translation>Создание файла Qt QML.</translation>
</message>
@@ -14717,19 +15590,44 @@ Ids must begin with a lowercase letter.</source>
</message>
<message>
<location line="+15"/>
+ <source>Qt Quick</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Ctrl+Alt+R</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Follow Symbol Under Cursor</source>
<translation>Перейти к Ñимволу под курÑором</translation>
</message>
</context>
+<context>
+ <name>QmlJSEditor::Internal::QmlJSPreviewRunner</name>
+ <message>
+ <location filename="../../../src/plugins/qmljseditor/qmljspreviewrunner.cpp" line="+40"/>
+ <source>Failed to preview Qt Quick file</source>
+ <translation>Ðе удалоÑÑŒ выполнить предпроÑмотр файла Qt Quick</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not preview Qt Quick (QML) file. Reason:
+%1</source>
+ <translation>Ðе удалоÑÑŒ запуÑтить предпроÑмотр файла Qt Quick (QML). Причина:
+%1</translation>
+ </message>
+</context>
<context>
<name>QmlJSEditor::Internal::QmlJSTextEditor</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljseditor.cpp" line="+1249"/>
+ <location filename="../../../src/plugins/qmljseditor/qmljseditor.cpp" line="+1291"/>
<source><Select Symbol></source>
<translation><Выберите Ñимвол></translation>
</message>
<message>
- <location line="-398"/>
+ <location line="-424"/>
<source>Rename...</source>
<translation>Переименовать...</translation>
</message>
@@ -14744,7 +15642,7 @@ Ids must begin with a lowercase letter.</source>
<translation>ÐеиÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source>Rename id '%1'...</source>
<translation>Переименовать id '%1'...</translation>
</message>
@@ -14752,7 +15650,7 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlManager</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h" line="+48"/>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h" line="+52"/>
<source><Current File></source>
<translation><Текущий файл></translation>
</message>
@@ -14833,7 +15731,7 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlProjectManager::Internal::Manager</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectmanager.cpp" line="+75"/>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectmanager.cpp" line="+76"/>
<source>Failed opening project '%1': Project already open</source>
<translation>Ðе удалоÑÑŒ открыть проект "%1": проект уже открыт</translation>
</message>
@@ -14841,17 +15739,21 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlProjectManager::Internal::QmlProjectApplicationWizard</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp" line="+63"/>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp" line="+72"/>
<source>Qt QML Application</source>
<translation>Приложение Qt QML</translation>
</message>
<message>
<location line="+2"/>
- <source>Creates a Qt QML application.</source>
- <translation>Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt QML.</translation>
+ <source>Creates a Qt QML application project with a single QML file containing the main view.
+
+QML application projects are executed through the QML runtime and do not need to be built.</source>
+ <translation>Создание проекта Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt QML Ñ Ð¾Ð´Ð½Ð¸Ð¼ QML файлом, Ñодержащим главный вид.
+
+Приложение QML запуÑкаетÑÑ Ñредой иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML и не требует Ñборки.</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+67"/>
<source>File generated by QtCreator</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
@@ -14871,16 +15773,11 @@ Ids must begin with a lowercase letter.</source>
<extracomment>Comment added to generated .qmlproject file</extracomment>
<translation type="unfinished">СпиÑок каталогов модулей передаваемый Ñреде иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation>
</message>
- <message>
- <location line="+20"/>
- <source>The project %1 could not be opened.</source>
- <translation>Ðевозможно открыть проект %1.</translation>
- </message>
</context>
<context>
<name>QmlProjectManager::Internal::QmlProjectApplicationWizardDialog</name>
<message>
- <location line="-119"/>
+ <location line="-108"/>
<source>New QML Project</source>
<translation>Ðовый проект QML</translation>
</message>
@@ -14893,7 +15790,7 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlProjectManager::Internal::QmlProjectImportWizard</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp" line="+105"/>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp" line="+116"/>
<source>Import Existing Qt QML Directory</source>
<translation>Импорт ÑущеÑтвующего каталога Qt QML</translation>
</message>
@@ -14923,16 +15820,11 @@ Ids must begin with a lowercase letter.</source>
<extracomment>Comment added to generated .qmlproject file</extracomment>
<translation type="unfinished">СпиÑок каталогов модулей передаваемый Ñреде иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation>
</message>
- <message>
- <location line="+19"/>
- <source>The project %1 could not be opened.</source>
- <translation>Ðевозможно открыть проект %1.</translation>
- </message>
</context>
<context>
<name>QmlProjectManager::Internal::QmlProjectImportWizardDialog</name>
<message>
- <location line="-122"/>
+ <location line="-110"/>
<source>Import Existing Qt QML Directory</source>
<translation>Импорт ÑущеÑтвующего каталога Qt QML</translation>
</message>
@@ -14969,19 +15861,19 @@ Ids must begin with a lowercase letter.</source>
<name>QmlProjectManager::Internal::QmlRunConfiguration</name>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h" line="+36"/>
- <source>QML Runtime</source>
- <translation>Среда иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation>
+ <source>QML Viewer</source>
+ <translation>ПроÑмотр QML</translation>
</message>
</context>
<context>
<name>QmlProjectManager::Internal::QmlRunControl</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp" line="+91"/>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp" line="+92"/>
<source>Starting %1 %2</source>
<translation>ЗапуÑкаетÑÑ %1 %2</translation>
</message>
<message>
- <location line="+37"/>
+ <location line="+42"/>
<source>%1 exited with code %2</source>
<translation>%1 завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %2</translation>
</message>
@@ -14994,10 +15886,18 @@ Ids must begin with a lowercase letter.</source>
<translation>Выполнить</translation>
</message>
</context>
+<context>
+ <name>QmlProjectManager::Internal::QmlTaskManager</name>
+ <message>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmltaskmanager.cpp" line="+57"/>
+ <source>QML</source>
+ <translation></translation>
+ </message>
+</context>
<context>
<name>QmlProjectManager::QmlProject</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+102"/>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+103"/>
<source>Error while loading project file!</source>
<translation>Ошибка при загрузке файла проекта!</translation>
</message>
@@ -15005,20 +15905,20 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>QmlProjectManager::QmlProjectRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp" line="+93"/>
- <source>QML Runtime</source>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp" line="+102"/>
+ <source>QML Viewer</source>
<comment>QMLRunConfiguration display name.</comment>
- <translation>Среда иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation>
+ <translation type="unfinished">ПроÑмотр QML</translation>
</message>
<message>
- <location line="+112"/>
- <source>QML Runtime</source>
- <translation>Среда иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation>
+ <location line="+104"/>
+ <source>QML Viewer</source>
+ <translation type="unfinished">ПроÑмотр QML</translation>
</message>
<message>
<location line="+1"/>
- <source>QML Runtime arguments:</source>
- <translation>Параметры Ñреды иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML:</translation>
+ <source>QML Viewer arguments:</source>
+ <translation type="unfinished">Параметры проÑмотра QML:</translation>
</message>
<message>
<location line="+1"/>
@@ -15040,9 +15940,9 @@ Ids must begin with a lowercase letter.</source>
<name>QmlProjectManager::QmlTarget</name>
<message>
<location filename="../../../src/plugins/projectexplorer/userfileaccessor.cpp" line="+31"/>
- <source>QML Runtime</source>
- <comment>QML Runtime target display name</comment>
- <translation>Среда иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation>
+ <source>QML Viewer</source>
+ <comment>QML Viewer target display name</comment>
+ <translation type="unfinished">ПроÑмотр QML</translation>
</message>
</context>
<context>
@@ -15078,6 +15978,14 @@ Ids must begin with a lowercase letter.</source>
<translation>ПÑевдоним:</translation>
</message>
</context>
+<context>
+ <name>Qt Quick</name>
+ <message>
+ <location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+10"/>
+ <source>Qt Quick</source>
+ <translation></translation>
+ </message>
+</context>
<context>
<name>Qt4ProjectManager</name>
<message>
@@ -15092,43 +16000,98 @@ Ids must begin with a lowercase letter.</source>
</message>
<message>
<location line="+5"/>
- <source>Qt Application Project</source>
- <translation>Проект Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt</translation>
+ <source>Qt C++ Project</source>
+ <translation>Проект Qt С++</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::AbstractMaemoRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp" line="+114"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp" line="+78"/>
+ <source>No device configuration set for run configuration.</source>
+ <translation>Ðе выбрана ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑƒÑтройÑтва Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка.</translation>
+ </message>
+ <message>
+ <location line="+71"/>
<source>Deploying</source>
<translation>Развёртывание</translation>
</message>
<message>
- <location line="-7"/>
+ <location line="+14"/>
<source>Files to deploy: %1.</source>
<translation>Файлы Ð´Ð»Ñ ÑƒÑтановки: %1.</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+105"/>
<source>Deployment finished.</source>
<translation>Развёртывание завершено.</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-3"/>
<source>Deployment failed: %1</source>
<translation>Развёртывание не удалоÑÑŒ: %1</translation>
</message>
+ <message>
+ <location line="-178"/>
+ <source>Cleaning up remote leftovers first ...</source>
+ <translation>Сначала подчищаютÑÑ Ð²Ð½ÐµÑˆÐ½Ð¸Ðµ оÑтатки...</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Initial cleanup canceled by user.</source>
+ <translation>ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ñ‡Ð¸Ñтка отменена пользователем.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error running initial cleanup: %1.</source>
+ <translation>Ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾Ð¹ очиÑтки: %1.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Initial cleanup done.</source>
+ <translation>ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ñ‡Ð¸Ñтка выполнена.</translation>
+ </message>
+ <message>
+ <location line="+104"/>
+ <source>Starting remote application.</source>
+ <translation>ЗапуÑк внешней программы.</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Deployment canceled by user.</source>
+ <translation>УÑтановка отменена пользователем.</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Remote execution canceled due to user request.</source>
+ <translation>Внешнее выполнение отменено по запроÑу пользователÑ.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error running remote process: %1</source>
+ <translation>Ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ процеÑÑа: %1</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Finished running remote process.</source>
+ <translation>Завершено выполнение внешнего процеÑÑа.</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Remote Execution Failure</source>
+ <translation>Ðе удалоÑÑŒ запуÑтить удалённо</translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::BaseQt4ProjectWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/qtwizard.cpp" line="+221"/>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/qtwizard.cpp" line="+225"/>
<location line="+4"/>
<source>Modules</source>
<translation>Модули</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+26"/>
<source>Qt Versions</source>
<translation>Профили Qt</translation>
</message>
@@ -15269,13 +16232,12 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>Qt4ProjectManager::Internal::ClassList</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp" line="+48"/>
- <location line="+11"/>
+ <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp" line="+69"/>
<source><New class></source>
<translation><Ðовый клаÑÑ></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+74"/>
<source>Confirm Delete</source>
<translation>Подтверждение удалениÑ</translation>
</message>
@@ -15294,8 +16256,12 @@ Ids must begin with a lowercase letter.</source>
</message>
<message>
<location line="+1"/>
- <source>Creates a Qt console application.</source>
- <translation>Создание конÑольного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt.</translation>
+ <source>Creates a project containing a single main.cpp file with a stub implementation.
+
+Preselects a desktop Qt for building the application if available.</source>
+ <translation>Создание проекта, Ñодержащего один файл main.cpp Ñ Ð¿Ñ€Ð¾Ñтейшей реализацией.
+
+ВыбираетÑÑ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ Qt "ÐаÑтольный" Ð´Ð»Ñ Ñборки приложениÑ, еÑли он доÑтупен.</translation>
</message>
</context>
<context>
@@ -15376,6 +16342,11 @@ Ids must begin with a lowercase letter.</source>
<source>Specify the list of custom widgets and their properties.</source>
<translation>Укажите ÑпиÑок пользовательÑких виджетов и их ÑвойÑтв.</translation>
</message>
+ <message>
+ <location/>
+ <source>...</source>
+ <translation></translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::CustomWidgetWizard</name>
@@ -15430,8 +16401,8 @@ Ids must begin with a lowercase letter.</source>
</message>
<message>
<location line="+1"/>
- <source>Creates an empty Qt project.</source>
- <translation>Создание пуÑтого проекта Qt.</translation>
+ <source>Creates a qmake-based project without any files. This allows you to create an application without any default classes.</source>
+ <translation>Создание проекта без файлов под управлением qmake. Ðто позволÑет Ñоздать приложение без умолчальных клаÑÑов.</translation>
</message>
</context>
<context>
@@ -15484,60 +16455,38 @@ Ids must begin with a lowercase letter.</source>
<translation>Форма</translation>
</message>
<message>
- <source>Examples not installed</source>
- <translation type="obsolete">Примеры не уÑтановлены</translation>
- </message>
- <message>
- <source>Open</source>
- <translation type="obsolete">Открыть</translation>
- </message>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+67"/>
+ <location/>
<source>Tutorials</source>
<translation>Учебники</translation>
</message>
<message>
- <location line="+1"/>
- <source>Explore Qt Examples</source>
- <translation>Обзор примеров Qt</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location/>
<source>Did You Know?</source>
<translation>Знаете ли вы, что?</translation>
</message>
<message>
- <location line="+4"/>
- <source><b>Qt Creator - A quick tour</b></source>
- <translation><b>Краткий ÐºÑƒÑ€Ñ Ð¿Ð¾ Qt Creator</b></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>
+ <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+73"/>
+ <source>The Qt Creator User Interface</source>
+ <translation>Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Qt Creator</translation>
</message>
<message>
<location line="+2"/>
- <source>Building with qmake</source>
- <translation>Сборка Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ qmake</translation>
+ <source>Creating a Qt C++ Application</source>
+ <translation>Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt на С++</translation>
</message>
<message>
<location line="+2"/>
- <source>Writing test cases</source>
- <translation>Создание теÑтов</translation>
+ <source>Creating a Qt Quick Application</source>
+ <translation>Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt Quick</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+47"/>
+ <location line="+53"/>
<source>Choose an example...</source>
<translation>Выберите пример...</translation>
</message>
<message>
- <location line="+84"/>
+ <location line="+85"/>
<source>Copy Project to writable Location?</source>
<translation>Скопировать проект в каталог Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ на запиÑÑŒ?</translation>
</message>
@@ -15572,7 +16521,12 @@ Ids must begin with a lowercase letter.</source>
<translation>Указанный каталог уже ÑущеÑтвует. Укажите другой каталог.</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+49"/>
+ <source>New Project</source>
+ <translation>Ðовый проект</translation>
+ </message>
+ <message>
+ <location line="+24"/>
<location line="+7"/>
<source>Cmd</source>
<comment>Shortcut key</comment>
@@ -15593,72 +16547,72 @@ Ids must begin with a lowercase letter.</source>
<message>
<location line="+4"/>
<source>You can switch between Qt Creator's modes using <tt>Ctrl+number</tt>:<ul><li>1 - Welcome</li><li>2 - Edit</li><li>3 - Debug</li><li>4 - Projects</li><li>5 - Help</li></ul></source>
- <translation>Ð’Ñ‹ можете переключать режим Qt Creator, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <tt>Ctrl+чиÑло</tt>:<ul><li>1 - ПриветÑтвие</li><li>2 - Правка</li><li>3 - Отладка</li><li>4 - Проекты</li><li>5 - Справка</li></ul></translation>
+ <translation>Можно переключать режим Qt Creator, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <tt>Ctrl+чиÑло</tt>:<ul><li>1 - ПриветÑтвие</li><li>2 - Правка</li><li>3 - Отладка</li><li>4 - Проекты</li><li>5 - Справка</li></ul></translation>
</message>
<message>
<location line="+3"/>
<source>You can show and hide the side bar using <tt>%1+0<tt>.</source>
- <translation>Ð’Ñ‹ можете отображать и Ñкрывать боковую панель, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <tt>%1+0<tt>.</translation>
+ <translation>Можно отображать и Ñкрывать боковую панель, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <tt>%1+0<tt>.</translation>
</message>
<message>
<location line="+1"/>
<source>You can fine tune the <tt>Find</tt> function by selecting &quot;Whole Words&quot; or &quot;Case Sensitive&quot;. Simply click on the icons on the right end of the line edit.</source>
- <translation>Ð’Ñ‹ можете тонко наÑтроить функцию <tt>ПоиÑк</tt>, выбрав &quot;Слово целиком&quot; и/или &quot;Учитывать региÑÑ‚Ñ€&quot;. ПроÑто кликните на иконку Ñправа от редактируемой Ñтроки.</translation>
+ <translation>Можно тонко наÑтроить функцию <tt>ПоиÑк</tt>, выбрав &quot;Слово целиком&quot; и/или &quot;Учитывать региÑÑ‚Ñ€&quot;. ПроÑто кликните на иконку Ñправа от редактируемой Ñтроки.</translation>
</message>
<message>
<location line="+2"/>
<source>If you add <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">external libraries</a>, Qt Creator will automatically offer syntax highlighting and code completion.</source>
- <translation>ЕÑли вы добавите <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">внешние библиотеки</a>, то Qt Creator автоматичеÑки предложит подÑветку ÑинтакÑиÑа и дополнение кода.</translation>
+ <translation>ЕÑли добавить <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">внешние библиотеки</a>, то Qt Creator автоматичеÑки предложит подÑветку ÑинтакÑиÑа и дополнение кода.</translation>
</message>
<message>
<location line="+3"/>
<source>The code completion is CamelCase-aware. For example, to complete <tt>namespaceUri</tt> you can just type <tt>nU</tt> and hit <tt>Ctrl+Space</tt>.</source>
- <translation>Ðвтодополнение кода ориентировано на ВерблюжийРегиÑÑ‚Ñ€. Ðапример, чтобы получить <tt>namespaceUri</tt> вы можете проÑто ввеÑти <tt>nU</tt> и нажать <tt>Ctrl+Space</tt>.</translation>
+ <translation>Ðвтодополнение кода ориентировано на ВерблюжийРегиÑÑ‚Ñ€. Ðапример, чтобы получить <tt>namespaceUri</tt> можно проÑто ввеÑти <tt>nU</tt> и нажать <tt>Ctrl+Space</tt>.</translation>
</message>
<message>
<location line="+2"/>
<source>You can force code completion at any time using <tt>Ctrl+Space</tt>.</source>
- <translation>Вы можете в любой момент вызвать дополнение кода нажатием <tt>Ctrl+Space</tt>.</translation>
+ <translation>Можно в любой момент вызвать дополнение кода нажатием <tt>Ctrl+Space</tt>.</translation>
</message>
<message>
<location line="+1"/>
<source>You can start Qt Creator with a session by calling <tt>qtcreator &lt;sessionname&gt;</tt>.</source>
- <translation>Ð’Ñ‹ можете открыть ÑеÑÑию в Qt Creator, выполнив команду <tt>qtcreator &lt;sessionname&gt;</tt>.</translation>
+ <translation>Можно открыть ÑеÑÑию в Qt Creator, выполнив команду <tt>qtcreator &lt;sessionname&gt;</tt>.</translation>
</message>
<message>
<location line="+1"/>
<source>You can return to edit mode from any other mode at any time by hitting <tt>Escape</tt>.</source>
- <translation>Ð’Ñ‹ можете вернутьÑÑ Ð² режим Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· любого другого режима нажатием на <tt>Escape</tt>.</translation>
+ <translation>Можно вернутьÑÑ Ð² режим Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· любого другого режима нажатием на <tt>Escape</tt>.</translation>
</message>
<message>
<location line="+2"/>
<source>You can switch between the output pane by hitting <tt>%1+n</tt> where n is the number denoted on the buttons at the window bottom:<ul><li>1 - Build Issues</li><li>2 - Search Results</li><li>3 - Application Output</li><li>4 - Compile Output</li></ul></source>
- <translation>Ð’Ñ‹ можете переключать окно вывода, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <tt>%1+n</tt>, где n - чиÑло, указанное на кнопке внизу окна:<ul><li>1 - Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñборки</li><li>2 - Результаты поиÑка</li><li>3 - КонÑоль программы</li><li>4 - КонÑоль Ñборки</li></ul></translation>
+ <translation>Можно переключать окно вывода иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <tt>%1+n</tt>, где n - чиÑло, указанное на кнопке внизу окна:<ul><li>1 - Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñборки</li><li>2 - Результаты поиÑка</li><li>3 - КонÑоль программы</li><li>4 - КонÑоль Ñборки</li></ul></translation>
</message>
<message>
<location line="+4"/>
<source>You can quickly search methods, classes, help and more using the <a href="qthelp://com.nokia.qtcreator/doc/creator-navigation.html">Locator bar</a> (<tt>%1+K</tt>).</source>
- <translation>Ð’Ñ‹ можете оÑущеÑтвлÑÑ‚ÑŒ быÑтрый поиÑк методов, клаÑÑов, Ñправки и прочего, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <a href="qthelp://com.nokia.qtcreator/doc/creator-navigation.html">Панель поиÑка</a> (<tt>%1+K</tt>).</translation>
+ <translation>Можно оÑущеÑтвлÑÑ‚ÑŒ быÑтрый поиÑк методов, клаÑÑов, Ñправки и прочего, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <a href="qthelp://com.nokia.qtcreator/doc/creator-navigation.html">Панель поиÑка</a> (<tt>%1+K</tt>).</translation>
</message>
<message>
<location line="+2"/>
<source>You can add custom build steps in the <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings">build settings</a>.</source>
- <translation>Ð’Ñ‹ можете добавить ÑобÑтвенные Ñтапы Ñборки в <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings">наÑтройках Ñборки</a>.</translation>
+ <translation>Можно добавить ÑобÑтвенные Ñтапы Ñборки в <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings">наÑтройках Ñборки</a>.</translation>
</message>
<message>
<location line="+2"/>
<source>Within a session, you can add <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies">dependencies</a> between projects.</source>
- <translation>Ð’ пределах одной ÑеÑÑии вы можете добавлÑÑ‚ÑŒ <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies">завиÑимоÑти</a> проектов друг от друга.</translation>
+ <translation>Ð’ пределах одной ÑеÑÑии можно добавлÑÑ‚ÑŒ <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies">завиÑимоÑти</a> проектов друг от друга.</translation>
</message>
<message>
<location line="+2"/>
<source>You can set the preferred editor encoding for every project in <tt>Projects -> Editor Settings -> Default Encoding</tt>.</source>
- <translation>Ð’Ñ‹ можете уÑтановить предпочитаемую кодировку редактора Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ проекта в <tt>Проекты -> ÐаÑтройки редактора -> Кодировка по умолчанию</tt>.</translation>
+ <translation>Можно уÑтановить предпочитаемую кодировку редактора Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ проекта в <tt>Проекты -> ÐаÑтройки редактора -> Кодировка по умолчанию</tt>.</translation>
</message>
<message>
<location line="+1"/>
<source>You can use Qt Creator with a number of <a href="qthelp://com.nokia.qtcreator/doc/creator-version-control.html">revision control systems</a> such as Subversion, Perforce, CVS and Git.</source>
- <translation>Ð’Ñ‹ можете иÑпользовать Qt Creator Ñ <a href="qthelp://com.nokia.qtcreator/doc/creator-version-control.html">ÑиÑтемами ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ Ð²ÐµÑ€Ñий</a>, такими как Subversion, Perforce, CVS и Git.</translation>
+ <translation>Можно иÑпользовать Qt Creator Ñ <a href="qthelp://com.nokia.qtcreator/doc/creator-version-control.html">ÑиÑтемами ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ Ð²ÐµÑ€Ñий</a>, такими как Subversion, Perforce, CVS и Git.</translation>
</message>
<message>
<location line="+2"/>
@@ -15670,21 +16624,68 @@ Ids must begin with a lowercase letter.</source>
<source>Examples not installed...</source>
<translation>Примеры не уÑтановлены...</translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::GuiAppWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizard.cpp" line="+83"/>
- <source>Qt Gui Application</source>
- <translation>GUI приложение Qt</translation>
+ <location/>
+ <source>Create Project...</source>
+ <translation>Создать проект...</translation>
</message>
<message>
- <location line="+1"/>
- <source>Creates a Qt Gui Application with one form.</source>
- <translation>Создание графичеÑкого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt Ñ Ð¾Ð´Ð½Ð¾Ð¹ формой.</translation>
+ <location/>
+ <source>Explore Qt C++ Examples</source>
+ <translation>Примеры на Qt C++</translation>
</message>
<message>
- <location line="+157"/>
+ <location/>
+ <source>Explore Qt Quick Examples</source>
+ <translation>Примеры на Qt Quick</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Open Project...</source>
+ <translation>Открыть проект...</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::GnuPocS60DevicesWidget</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+328"/>
+ <source>Step 1 of 2: Choose GnuPoc folder</source>
+ <translation>Шаг 1 из 2: Выбор каталога GnuPoc</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Step 2 of 2: Choose Qt folder</source>
+ <translation>Шаг 2 из 2: Выбор каталога Qt</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Adding GnuPoc</source>
+ <translation>Добавление GnuPoc</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GnuPoc and Qt folders must not be identical.</source>
+ <translation>Каталоги GnuPoc и Qt не должны Ñовпадать.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::GuiAppWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizard.cpp" line="+83"/>
+ <source>Qt Gui Application</source>
+ <translation>GUI приложение Qt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a Qt application for the desktop. Includes a Qt Designer-based main window.
+
+Preselects a desktop Qt for building the application if available.</source>
+ <translation>Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt Ð´Ð»Ñ Ð½Ð°Ñтольных компьютеров. Включает оÑновное окно в виде формы дизайнера Qt.
+
+ВыбираетÑÑ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ Qt "ÐаÑтольный" Ð´Ð»Ñ Ñборки приложениÑ, еÑли он доÑтупен.</translation>
+ </message>
+ <message>
+ <location line="+162"/>
<source>The template file '%1' could not be opened for reading: %2</source>
<translation>Файл шаблона '%1' не может быть открыт Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ: %2</translation>
</message>
@@ -15711,8 +16712,8 @@ Ids must begin with a lowercase letter.</source>
</message>
<message>
<location line="+1"/>
- <source>Creates a Qt based C++ Library.</source>
- <translation>Создание библиотеки C++ на оÑнове Qt.</translation>
+ <source>Creates a C++ library based on qmake. This can be used to create:<ul><li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li><li>a shared or static C++ library for use with another project at linktime</li></ul>.</source>
+ <translation>Создание проекта C++ библиотеки под управлением qmake. Может иÑпользоватьÑÑ Ð´Ð»Ñ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸:<ul><li>разделÑÐµÐ¼Ð°Ñ C++ библиотека Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ через <tt>QPluginLoader</tt> (модуль)</li><li>разделÑÐµÐ¼Ð°Ñ Ð¸Ð»Ð¸ ÑтатичеÑÐºÐ°Ñ C++ библиотека Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº другому проекту на Ñтапе компоновки</li></ul>.</translation>
</message>
</context>
<context>
@@ -15774,20 +16775,25 @@ Did you start Qemu?</source>
<translation>
Qemu уже запущен?</translation>
</message>
+ <message>
+ <location line="+4"/>
+ <source>Qt version mismatch! Expected Qt on device: 4.6.2 or later.</source>
+ <translation>ÐеподходÑщий профиль Qt! ТребуетÑÑ Qt на уÑтройÑтве: 4.6.2 и выше.</translation>
+ </message>
<message>
<location line="+19"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>Device configuration test failed: Unexpected output:
%1</source>
<translation>Ошибка при проверке наÑтройки уÑтройÑтва: неожиданный результат:
%1</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Hardware architecture: %1
</source>
<translation>ÐÐ¿Ð¿Ð°Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð°Ñ€Ñ…Ð¸Ñ‚ÐµÐºÑ‚ÑƒÑ€Ð°: %1
@@ -15807,128 +16813,152 @@ Qemu уже запущен?</translation>
<translation>ÐаÑтройка уÑтройÑтва уÑпешно выполнена.
</translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoDebugRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp" line="+205"/>
- <source>Debugging failed: %1</source>
- <translation>Отладка не удалаÑÑŒ: %1</translation>
+ <location line="+4"/>
+ <source>No Qt packages installed.</source>
+ <translation>Пакеты Qt не уÑтановлены.</translation>
</message>
<message>
- <location line="+24"/>
- <source>Debugging failed, could not parse gdb server pid!</source>
- <translation>Отладка не удалаÑÑŒ, так как не удалоÑÑŒ определить PID Ñервера gdb!</translation>
+ <location line="+4"/>
+ <source>List of installed Qt packages:</source>
+ <translation>СпиÑок уÑтановленых пакетов Qt:</translation>
</message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::MaemoPackageContents</name>
<message>
- <location line="+20"/>
- <source>Stopping debugging operation ...</source>
- <translation>ОÑтановка отладки...</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp" line="+144"/>
+ <source>Local File Path</source>
+ <translation>Путь к локальному файлу</translation>
</message>
<message>
- <location line="+24"/>
- <source>Debugging finished.</source>
- <translation>Отладка завершена.</translation>
+ <location line="+0"/>
+ <source>Remote File Path</source>
+ <translation>Путь к удалённому файлу</translation>
</message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::MaemoGdbSettingsPage</name>
+ <name>Qt4ProjectManager::Internal::MaemoPackageCreationStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemogdbsettingspage.cpp" line="+122"/>
- <source>Maemo</source>
- <translation></translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp" line="+117"/>
+ <source>Creating package file ...</source>
+ <translation>Создание файла пакета...</translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoGdbWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemogdbwidget.ui"/>
- <source>Form</source>
- <translation>Форма</translation>
+ <location line="+3"/>
+ <source>Cannot open MADDE config file '%1'.</source>
+ <translation>Ðевозможно открыть конфигурационный файл MADDE "%1".</translation>
</message>
<message>
- <location/>
- <source>Gdb</source>
- <translation></translation>
+ <location line="+40"/>
+ <source>Packaging Error: Cannot open file '%1'.</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°: Ðевозможно открыть файл "%1".</translation>
</message>
<message>
- <location/>
- <source>Use MADDE gdb</source>
- <translation>ИÑпользовать MADDE gdb</translation>
+ <location line="+10"/>
+ <source>Packaging Error: Cannot write file '%1'.</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°: Ðевозможно запиÑать файл "%1".</translation>
</message>
<message>
- <location/>
- <source>Maemo ARM gdb location:</source>
- <translation>Размещение gdb Ð´Ð»Ñ Maemo ARM:</translation>
+ <location line="+19"/>
+ <source>Packaging Error: Could not create directory '%1'.</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°: Ðе удалоÑÑŒ Ñоздать каталог "%1".</translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoInteractiveSshConnection</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp" line="+110"/>
- <source>Could not start remote shell: %1</source>
- <translation>Ðу удалоÑÑŒ запуÑтить удалённую оболочку: %1</translation>
+ <location line="+5"/>
+ <source>Packaging Error: Could not replace file '%1'.</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°: Ðе удалоÑÑŒ перезапиÑать файл "%1".</translation>
</message>
<message>
- <location line="+15"/>
- <source>Error running command: %1</source>
- <translation>Ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹: %1</translation>
+ <location line="+6"/>
+ <source>Packaging Error: Could not copy '%1' to '%2'.</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°: Ðе удалоÑÑŒ Ñкопировать "%1" в "%2".</translation>
</message>
<message>
- <location line="+9"/>
- <source>SSH error: %1</source>
- <translation>Ошибка SSH: %1</translation>
+ <location line="+16"/>
+ <source>Package created.</source>
+ <translation>Пакет Ñоздан.</translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp" line="+164"/>
- <location line="+39"/>
- <source>Start Maemo Emulator</source>
- <translation>ЗапуÑтить ÑмулÑтор Maemo</translation>
+ <location line="+7"/>
+ <source>Package Creation: Running command '%1'.</source>
+ <translation>Создание пакета: Выполнение команды "%1".</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+7"/>
+ <source>Packaging failed.</source>
+ <translation>Ðе удалоÑÑŒ Ñоздать пакет.</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Packaging error: Could not start command '%1'. Reason: %2</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°: Ðе удалоÑÑŒ выполнить команду "%1" по причине: %2</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Packaging Error: Command '%1' timed out.</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°: ИÑтекло Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ "%1".</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Packaging Error: Command '%1' failed.</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°: Команда "%1" завершилаÑÑŒ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹.</translation>
</message>
<message>
<location line="+3"/>
- <source>Stop Maemo Emulator</source>
- <translation>ОÑтановить ÑмулÑтор Maemo</translation>
+ <source> Reason: %1</source>
+ <translation> Причина: %1</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Output was: </source>
+ <translation>Вывод: </translation>
</message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::MaemoRunConfiguration</name>
+ <name>Qt4ProjectManager::Internal::MaemoPackageCreationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp" line="+91"/>
- <source>%1 on Maemo device</source>
- <translation>%1 на уÑтройÑтве Ñ Maemo</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp" line="+87"/>
+ <source><b>Create Package:</b> </source>
+ <translation><b>Создать пакет:</b> </translation>
</message>
<message>
- <location line="+3"/>
- <source>MaemoRunConfiguration</source>
- <translation></translation>
+ <location line="+13"/>
+ <source>Choose a local file</source>
+ <translation>Выбор локального файла</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>File already in package</source>
+ <translation>Ðтот файл уже в пакете</translation>
</message>
<message>
- <location line="+322"/>
- <source>'%1' does not contain a valid Maemo simulator image.</source>
- <translation>"%1" не Ñодержит корректный образ ÑмулÑтора Maemo.</translation>
+ <location line="+1"/>
+ <source>You have already added this file.</source>
+ <translation>Ðтот файл уже был добавлен в пакет.</translation>
</message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::MaemoRunConfiguration</name>
<message>
- <location line="+41"/>
- <source>Simulator could not be found. Please check the Qt Version you are using and that a simulator image is already installed.</source>
- <translation>Ðе удалоÑÑŒ найти ÑмулÑтор. Проверьте иÑпользуемый профиль Qt и наличие уÑтановленного образа ÑмулÑтора.</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp" line="+78"/>
+ <source>New Maemo Run Configuration</source>
+ <translation>ÐÐ¾Ð²Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿ÑƒÑка Maemo</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::MaemoRunConfigurationFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp" line="+119"/>
- <source>%1 on Maemo Device</source>
- <translation>%1 на уÑтройÑтве Ñ Maemo</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp" line="+107"/>
+ <source>New Maemo Run Configuration</source>
+ <translation>ÐÐ¾Ð²Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿ÑƒÑка Maemo</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::MaemoRunConfigurationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp" line="+68"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp" line="+67"/>
<source>Run configuration name:</source>
<translation>Ðазвание конфигурации запуÑка:</translation>
</message>
@@ -15938,8 +16968,13 @@ Qemu уже запущен?</translation>
<translation><a href="%1">Управление конфигурациÑми уÑтройÑтв</a></translation>
</message>
<message>
- <location line="+4"/>
- <source>Device Configuration:</source>
+ <location line="+5"/>
+ <source><a href="%1">Set Debugger</a></source>
+ <translation><a href="%1">УÑтановить отладчик</a></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Device configuration:</source>
<translation>ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑƒÑтройÑтва:</translation>
</message>
<message>
@@ -15952,49 +16987,11 @@ Qemu уже запущен?</translation>
<source>Arguments:</source>
<translation>Параметры:</translation>
</message>
- <message>
- <location line="+7"/>
- <source><a href="%1">Set Maemo Debugger</a></source>
- <translation><a href="%1">УÑтановить отладчик Maemo</a></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Debugger:</source>
- <translation>Отладчик:</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Simulator:</source>
- <translation>ÐмулÑтор:</translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoRunControl</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp" line="-178"/>
- <source>Starting remote application.</source>
- <translation>ЗапуÑк внешней программы.</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Remote process stopped by user.</source>
- <translation>Внешний процеÑÑ Ð¾Ñтановлен пользователем.</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Remote process exited with error: %1</source>
- <translation>Внешний процеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹: %1</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Remote process finished successfully.</source>
- <translation>Внешний процеÑÑ ÑƒÑпешно завершилÑÑ.</translation>
- </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::MaemoRunControlFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp" line="+168"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp" line="+70"/>
<source>Run on device</source>
<translation>Выполнить на уÑтройÑтве</translation>
</message>
@@ -16003,87 +17000,94 @@ Qemu уже запущен?</translation>
<name>Qt4ProjectManager::Internal::MaemoSettingsPage</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp" line="+69"/>
- <source>Maemo Devices</source>
- <translation>УÑтройÑтва Maemo</translation>
+ <source>Maemo Device Configurations</source>
+ <translation>Конфигурации уÑтройÑтв Maemo</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::MaemoSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp" line="+346"/>
- <source>Choose public key file</source>
- <translation>Выберите файл открытого ключа</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp" line="+152"/>
+ <source>New Device Configuration %1</source>
+ <comment>Standard Configuration name with number</comment>
+ <translation>ÐÐ¾Ð²Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑƒÑтройÑтва %1</translation>
</message>
<message>
- <location line="+13"/>
- <source>Stop deploying</source>
- <translation>Прекратить уÑтановку</translation>
+ <location line="+190"/>
+ <source>Public Key Files(*.pub);;All Files (*)</source>
+ <translation>Файлы открытых ключей (*.pub);;Ð’Ñе файлы (*)</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+11"/>
+ <source>Could not read public key file '%1'.</source>
+ <translation>Ðе удалоÑÑŒ прочитать файл открытого ключа "%1".</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>Key deployment failed: %1</source>
<translation>Ðе удалоÑÑŒ уÑтановить ключ: %1</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+16"/>
+ <source>Deploy Public Key ...</source>
+ <translation>УÑтановить ключ...</translation>
+ </message>
+ <message>
+ <location line="-39"/>
+ <location line="+22"/>
<source>Deployment Failed</source>
<translation>УÑтановка не удалаÑÑŒ</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-33"/>
+ <source>Choose Public Key File</source>
+ <translation>Выбор файла открытого ключа</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Stop Deploying</source>
+ <translation>Прекратить уÑтановку</translation>
+ </message>
+ <message>
+ <location line="+15"/>
<source>Key was successfully deployed.</source>
<translation>Ключ был уÑпешно уÑтановлен.</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="-1"/>
<source>Deployment Succeeded</source>
<translation>УÑтановка выполнена</translation>
</message>
- <message>
- <location line="+14"/>
- <source>Deploy Key ...</source>
- <translation>УÑтановочный
-ключ...</translation>
- </message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::MaemoSftpConnection</name>
+ <name>Qt4ProjectManager::Internal::MaemoSshConfigDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp" line="+21"/>
- <source>Error setting up SFTP subsystem: %1</source>
- <translation>Ошибка наÑтройки подÑиÑтемы SFTP: %1</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.cpp" line="+124"/>
+ <source>Save Public Key File</source>
+ <translation>Сохранение файла открытого ключа</translation>
</message>
<message>
- <location line="+26"/>
- <source>Could not open file '%1'</source>
- <translation>Ðе удалоÑÑŒ открыть файл "%1"</translation>
+ <location line="+0"/>
+ <source>Save Private Key File</source>
+ <translation>Сохранение файла Ñекретного ключа</translation>
</message>
<message>
<location line="+13"/>
- <source>Could not copy local file '%1' to remote file '%2': %3</source>
- <translation>Ðе удалоÑÑŒ Ñкопировать локальный файл "%1" в "%2": %3</translation>
+ <source>Error writing file</source>
+ <translation>Ошибка запиÑи в файл</translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoSshConnection</name>
- <message>
- <location line="-109"/>
- <source>Could not connect to host</source>
- <translation>Ðу удалоÑÑŒ подключитьÑÑ Ðº узлу</translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoSshThread</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp" line="+69"/>
- <source>Error in cryptography backend: %1</source>
- <translation>Ошибка в криптографичеÑком модуле: %1</translation>
+ <location line="+1"/>
+ <source>Could not write file '%1':
+ %2</source>
+ <translation>Ðе удалоÑÑŒ запиÑать файл "%1":
+ %2</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::MakeStepFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+403"/>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+413"/>
<source>Make</source>
<translation>Сборка</translation>
</message>
@@ -16097,8 +17101,12 @@ Qemu уже запущен?</translation>
</message>
<message>
<location line="+1"/>
- <source>Creates a mobile Qt Gui Application with one form.</source>
- <translation>Создание мобильного графичеÑкого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt Ñ Ð¾Ð´Ð½Ð¾Ð¹ формой.</translation>
+ <source>Creates a Qt application optimized for mobile devices with a Qt Designer-based main window.
+
+Preselects Qt for Simulator and mobile targets if available</source>
+ <translation>Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt Ð´Ð»Ñ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ñ… уÑтройÑтв. Включает оÑновное окно в виде формы дизайнера Qt.
+
+ВыбираетÑÑ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ Qt Ð´Ð»Ñ ÑмулÑтора и мобильных целей, еÑли он доÑтупен</translation>
</message>
</context>
<context>
@@ -16122,12 +17130,12 @@ Qemu уже запущен?</translation>
<translation>Ðе удалоÑÑŒ открыть файл значка %1.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+106"/>
<source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
<translation>Создание неÑкольких библиотек виджетов (%1, %2) в одном проекте (%3) не поддерживаетÑÑ.</translation>
</message>
<message>
- <location line="+133"/>
+ <location line="+135"/>
<source>Cannot open %1: %2</source>
<translation>Ðе удалоÑÑŒ открыть %1: %2</translation>
</message>
@@ -16139,24 +17147,53 @@ Qemu уже запущен?</translation>
<source>Project setup</source>
<translation>ÐаÑтройка проекта</translation>
</message>
- <message>
- <location line="+52"/>
- <source>Targets</source>
- <translation>Цели</translation>
- </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::QMakeStepFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+514"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+486"/>
<source>qmake</source>
<translation>qmake</translation>
</message>
</context>
+<context>
+ <name>Qt4ProjectManager::Internal::QemuRuntimeManager</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp" line="+83"/>
+ <location line="+399"/>
+ <source>Start Maemo Emulator</source>
+ <translation>ЗапуÑтить ÑмулÑтор Maemo</translation>
+ </message>
+ <message>
+ <location line="-322"/>
+ <source>Qemu has been shut down, because you removed the corresponding Qt version.</source>
+ <translation>Qemu был завершён, так как был удалён ÑоответÑтвующий ему профиль Qt.</translation>
+ </message>
+ <message>
+ <location line="+279"/>
+ <source>Qemu failed to start: %1</source>
+ <translation>Qemu не удалоÑÑŒ запуÑтитьÑÑ: %1</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Qemu crashed</source>
+ <translation>Qemu завершилÑÑ ÐºÑ€Ð°Ñ…Ð¾Ð¼</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Qemu error</source>
+ <translation>Ошибка Qemu</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Stop Maemo Emulator</source>
+ <translation>ОÑтановить ÑмулÑтор Maemo</translation>
+ </message>
+</context>
<context>
<name>Qt4ProjectManager::Internal::Qt4BuildConfigurationFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4buildconfiguration.cpp" line="+569"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4buildconfiguration.cpp" line="+571"/>
<source>Using Qt Version "%1"</source>
<translation>ИÑпользуетÑÑ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ Qt "%1"</translation>
</message>
@@ -16209,13 +17246,14 @@ Qemu уже запущен?</translation>
<translation>Другие файлы</translation>
</message>
<message>
- <location line="+541"/>
+ <location line="+555"/>
<location line="+7"/>
+ <location line="+62"/>
<source>Failed!</source>
<translation>Ðе удалоÑÑŒ!</translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-69"/>
<source>Could not open the file for edit with SCC.</source>
<translation>Ðе удалоÑÑŒ открыть файл Ð´Ð»Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ SCC.</translation>
</message>
@@ -16230,7 +17268,12 @@ Qemu уже запущен?</translation>
<translation>ИмеютÑÑ Ð½ÐµÑохранённые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² файле проекта %1.</translation>
</message>
<message>
- <location line="+37"/>
+ <location line="+35"/>
+ <source>Could not write project file %1.</source>
+ <translation>Ðе удалоÑÑŒ запиÑать в файл проекта %1.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error while reading PRO file %1: %2</source>
<translation>Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ .PRO файла %1: %2</translation>
</message>
@@ -16238,13 +17281,13 @@ Qemu уже запущен?</translation>
<context>
<name>Qt4ProjectManager::Internal::Qt4ProFileNode</name>
<message>
- <location line="+227"/>
+ <location line="+229"/>
<location line="+5"/>
<source>Error while parsing file %1. Giving up.</source>
<translation>Ошибка разбора файла %1. Отмена.</translation>
</message>
<message>
- <location line="+477"/>
+ <location line="+479"/>
<source>Could not find .pro file for sub dir '%1' in '%2'</source>
<translation>Ðе удалоÑÑŒ найти .pro файл Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° '%1' в '%2'</translation>
</message>
@@ -16253,38 +17296,13 @@ Qemu уже запущен?</translation>
<name>Qt4ProjectManager::Internal::Qt4ProjectConfigWidget</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
- <source>Configuration Name:</source>
- <translation>Ðазвание конфигурации:</translation>
- </message>
- <message>
- <location/>
- <source>Qt Version:</source>
- <translation>Профиль Qt:</translation>
- </message>
- <message>
- <location/>
- <source>This Qt-Version is invalid.</source>
- <translation>Ðекорректный профиль Qt.</translation>
- </message>
- <message>
- <location/>
- <source>Shadow Build:</source>
- <translation>Ð¤Ð¾Ð½Ð¾Ð²Ð°Ñ Ñборка:</translation>
- </message>
- <message>
- <location/>
- <source>Build Directory:</source>
- <translation>Каталог Ñборки:</translation>
- </message>
- <message>
- <location/>
<source><a href="import">Import existing build</a></source>
<translation><a href="import">Импорт ÑущеÑтвующей Ñборки</a></translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+79"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+78"/>
<source>Shadow Build Directory</source>
- <translation>Каталог фоновой Ñборки</translation>
+ <translation>Каталог теневой Ñборки</translation>
</message>
<message>
<location line="+51"/>
@@ -16302,7 +17320,7 @@ Qemu уже запущен?</translation>
<translation>иÑпользуетÑÑ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ Qt: <b>%1</b><br>Ñ Ð¸Ð½Ñтрументарием <b>%2</b><br>Ñборка в <b>%3</b></translation>
</message>
<message>
- <location line="+196"/>
+ <location line="+218"/>
<source>Building in subdirectories of the source directory is not supported by qmake.</source>
<translation>Сборка в подкаталогах каталога иÑходников не поддерживаетÑÑ qmake.</translation>
</message>
@@ -16313,17 +17331,12 @@ Qemu уже запущен?</translation>
<translation>Ð’ %1 обнаружена неÑовмеÑÑ‚Ð¸Ð¼Ð°Ñ Ñборка. Она будет замещена.</translation>
</message>
<message>
- <location line="-186"/>
+ <location line="-197"/>
<source>General</source>
<translation>ОÑновное</translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
- <source>Tool Chain:</source>
- <translation>ИнÑтрументарий:</translation>
- </message>
- <message>
- <location/>
<source>Manage</source>
<translation>Управление</translation>
</message>
@@ -16332,11 +17345,41 @@ Qemu уже запущен?</translation>
<source>problemLabel</source>
<translation></translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+180"/>
+ <location/>
+ <source>Configuration name:</source>
+ <translation>Ðазвание конфигурации:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Qt version:</source>
+ <translation>Профиль Qt:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>This Qt version is invalid.</source>
+ <translation>Ðекорректный профиль Qt.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Tool chain:</source>
+ <translation>ИнÑтрументарий:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Shadow build:</source>
+ <translation>Ð¢ÐµÐ½ÐµÐ²Ð°Ñ Ñборка:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Build directory:</source>
+ <translation>Каталог Ñборки:</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+180"/>
<location line="+5"/>
<source>Run qmake</source>
<translation>Выполнить qmake</translation>
@@ -16347,7 +17390,7 @@ Qemu уже запущен?</translation>
<translation>Собрать</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Run qmake in %1</source>
<translation>Выполнить qmake в %1</translation>
</message>
@@ -16360,7 +17403,7 @@ Qemu уже запущен?</translation>
<context>
<name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+532"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+533"/>
<source>Clean Environment</source>
<translation>ЧиÑÑ‚Ð°Ñ Ñреда</translation>
</message>
@@ -16383,7 +17426,22 @@ Qemu уже запущен?</translation>
<context>
<name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
<message>
- <location line="-413"/>
+ <location line="-438"/>
+ <source>Select Working Directory</source>
+ <translation>Выбор рабочего каталога</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Working directory:</source>
+ <translation>Рабочий каталог:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Run in terminal</source>
+ <translation>ЗапуÑкать в терминале</translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Run Environment</source>
<translation>Среда выполнениÑ</translation>
</message>
@@ -16408,12 +17466,7 @@ Qemu уже запущен?</translation>
<translation>Параметры:</translation>
</message>
<message>
- <location line="+20"/>
- <source>Run in Terminal</source>
- <translation>ЗапуÑкать в терминале</translation>
- </message>
- <message>
- <location line="+23"/>
+ <location line="+43"/>
<source>Base environment for this runconfiguration:</source>
<translation>Ð‘Ð°Ð·Ð¾Ð²Ð°Ñ Ñреда Ð´Ð»Ñ Ñтой конфигурации Ñборки:</translation>
</message>
@@ -16428,23 +17481,13 @@ Qemu уже запущен?</translation>
<translation>Программа:</translation>
</message>
<message>
- <location line="+10"/>
- <source>Select the working directory</source>
- <translation>Выбор рабочего каталога</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+13"/>
<source>Reset to default</source>
<translatorcomment>"СброÑить к ÑоÑтоÑнию по умолчанию" - Ñлишком длинно</translatorcomment>
<translation>По умолчанию</translation>
</message>
<message>
- <location line="+7"/>
- <source>Working Directory:</source>
- <translation>Рабочий каталог:</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+14"/>
<source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
<translation>ИÑпользовать отладочные верÑии библиотек (DYLD_IMAGE_SUFFIX=_debug)</translation>
</message>
@@ -16456,7 +17499,7 @@ Qemu уже запущен?</translation>
<location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+61"/>
<source>Desktop</source>
<comment>Qt4 Desktop target display name</comment>
- <translation>Рабочий Ñтол</translation>
+ <translation>ÐаÑтольный компьютер</translation>
</message>
<message>
<location line="+4"/>
@@ -16491,7 +17534,13 @@ Qemu уже запущен?</translation>
<translation>Maemo</translation>
</message>
<message>
- <location line="+380"/>
+ <location line="+2"/>
+ <source>Qt Simulator</source>
+ <comment>Qt4 Simulator target display name</comment>
+ <translation>ÐмулÑтор Qt</translation>
+ </message>
+ <message>
+ <location line="+389"/>
<source><b>Device:</b> %1</source>
<translation><b>УÑтройÑтво:</b> %1</translation>
</message>
@@ -16509,7 +17558,7 @@ Qemu уже запущен?</translation>
<context>
<name>Qt4ProjectManager::Internal::Qt4TargetFactory</name>
<message>
- <location line="-260"/>
+ <location line="-267"/>
<source>Debug</source>
<translation>Отладка</translation>
</message>
@@ -16578,19 +17627,15 @@ Qemu уже запущен?</translation>
<translation><html><body><table><tr><td>Файл:</td><td><pre>%1</pre></td></tr><tr><td>Изменён:</td><td>%2</td></tr><tr><td>Размер:</td><td>%3 байт</td></tr></table></body></html></translation>
</message>
<message>
- <location line="+93"/>
+ <location line="+103"/>
<source>This Qt Version has a unknown toolchain.</source>
<translation>У Ñтого Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Qt неизвеÑтный инÑтрументарий.</translation>
</message>
- <message>
- <source>%1 does not specify a valid Qt installation</source>
- <translation type="obsolete">%1 не ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾ уÑтановленной Qt</translation>
- </message>
<message>
<location line="+44"/>
<source>Desktop</source>
<comment>Qt Version is meant for the desktop</comment>
- <translation>ÐаÑтольный компьютер</translation>
+ <translation>ÐаÑтольный</translation>
</message>
<message>
<location line="+3"/>
@@ -16604,11 +17649,17 @@ Qemu уже запущен?</translation>
<comment>Qt Version is meant for Maemo</comment>
<translation>Maemo</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>Qt Simulator</source>
+ <comment>Qt Version is meant for Qt Simulator</comment>
+ <translation>ÐмулÑтор Qt</translation>
+ </message>
<message>
<location line="+2"/>
<source>unkown</source>
<comment>No idea what this Qt Version is meant for!</comment>
- <translation type="unfinished">неизвеÑтнаÑ</translation>
+ <translation>неизвеÑтнаÑ</translation>
</message>
<message>
<location line="+1"/>
@@ -16621,11 +17672,6 @@ Qemu уже запущен?</translation>
<name>Qt4ProjectManager::Internal::QtVersionManager</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.ui"/>
- <source>Qt versions</source>
- <translation>Профили Qt</translation>
- </message>
- <message>
- <location/>
<source>+</source>
<translation>+</translation>
</message>
@@ -16644,16 +17690,6 @@ Qemu уже запущен?</translation>
<source>Debugging Helper</source>
<translation>Помощник отладчика</translation>
</message>
- <message>
- <location/>
- <source>Version Name:</source>
- <translation>Ðазвание верÑии:</translation>
- </message>
- <message>
- <location/>
- <source>MinGW Directory:</source>
- <translation>Каталог MinGW:</translation>
- </message>
<message>
<location/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
@@ -16667,11 +17703,6 @@ p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Ðе удалоÑÑŒ определить верÑию MSVC.</span></p></body></html></translation>
</message>
- <message>
- <location/>
- <source>Debugging Helper:</source>
- <translation>Помощник отладчика:</translation>
- </message>
<message>
<location/>
<source>Show &Log</source>
@@ -16689,51 +17720,58 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <source>Carbide Directory:</source>
- <translation>Каталог Carbide:</translation>
+ <source>qmake Location</source>
+ <translation>Размещение qmake</translation>
</message>
<message>
<location/>
- <source>CSL/GCCE Directory:</source>
- <translation>Каталог CSL/GCCE:</translation>
+ <source>Toolchain:</source>
+ <translation>ИнÑтрументарий:</translation>
</message>
<message>
<location/>
- <source>qmake Location</source>
- <translation>Размещение qmake</translation>
+ <source>Version name:</source>
+ <translation>Ðазвание верÑии:</translation>
</message>
<message>
<location/>
- <source>qmake Location:</source>
+ <source>qmake location:</source>
<translation>Размещение qmake:</translation>
</message>
<message>
<location/>
- <source>Toolchain:</source>
- <translation>ИнÑтрументарий:</translation>
+ <source>MinGW directory:</source>
+ <translation>Каталог MinGW:</translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::QtWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/qtwizard.cpp" line="-127"/>
- <source>The project %1 could not be opened.</source>
- <translation>Ðевозможно открыть проект %1.</translation>
+ <location/>
+ <source>CSL/GCCE directory:</source>
+ <translation>Каталог CSL/GCCE:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Carbide directory:</source>
+ <translation>Каталог Carbide:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Debugging helper:</source>
+ <translation>Помощник отладчика:</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60CreatePackageStep</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp" line="+74"/>
- <source>Create sis Package</source>
- <comment>Create sis package build step name</comment>
- <translation>Создание пакета sis</translation>
+ <source>Create SIS Package</source>
+ <comment>Create SIS package build step name</comment>
+ <translation>Создание пакета SIS</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60CreatePackageStepConfigWidget</name>
<message>
- <location line="+196"/>
+ <location line="+198"/>
<source>self-signed</source>
<translation>ÑамоподпиÑанного</translation>
</message>
@@ -16744,16 +17782,16 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+4"/>
- <source><b>Create sis Package:</b> %1</source>
- <translation><b>Создание пакета sis:</b> %1</translation>
+ <source><b>Create SIS Package:</b> %1</source>
+ <translation><b>Создание пакета SIS:</b> %1</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60CreatePackageStepFactory</name>
<message>
- <location line="-53"/>
- <source>Create sis Package</source>
- <translation>Создание пакета sis</translation>
+ <location line="-55"/>
+ <source>Create SIS Package</source>
+ <translation>Создание пакета SIS</translation>
</message>
</context>
<context>
@@ -16787,7 +17825,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+905"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+911"/>
<source>Launching debugger...</source>
<translation>ЗапуÑкаетÑÑ Ð¾Ñ‚Ð»Ð°Ð´Ñ‡Ð¸Ðº...</translation>
</message>
@@ -16805,7 +17843,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfiguration</name>
<message>
- <location line="-761"/>
+ <location line="-767"/>
<source>QtS60DeviceRunConfiguration</source>
<translation>QtS60DeviceRunConfiguration</translation>
</message>
@@ -16837,12 +17875,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+1"/>
- <source>Install File:</source>
+ <source>Installation file:</source>
<translation>УÑтановочный файл:</translation>
</message>
<message>
<location line="+19"/>
- <source>Device on Serial Port:</source>
+ <source>Device on serial port:</source>
<translation>ПоÑледовательный порт уÑтройÑтва:</translation>
</message>
<message>
@@ -16864,7 +17902,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+450"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+456"/>
<source>Could not start application: %1</source>
<translation>Ðе удалоÑÑŒ запуÑтить приложение: %1</translation>
</message>
@@ -16887,14 +17925,14 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunControlBase</name>
<message>
- <location line="-165"/>
+ <location line="-170"/>
<source>Could not connect to phone on port '%1': %2
Check if the phone is connected and App TRK is running.</source>
<translation>Ðе удалоÑÑŒ подключитьÑÑ Ðº телефону через порт "%1": %2
УбедитеÑÑŒ, что телефон подключён, и на нём работает App TRK.</translation>
</message>
<message>
- <location line="-125"/>
+ <location line="-126"/>
<source>There is no device plugged in.</source>
<translation>УÑтройÑтво не подключено.</translation>
</message>
@@ -16934,7 +17972,7 @@ Check if the phone is connected and App TRK is running.</source>
<translation>Удаление Ñтарого пакета "%1"</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Package file not found</source>
<translation>Ðе найден файл пакета</translation>
</message>
@@ -16972,7 +18010,7 @@ Deploying application to '%2'...</source>
</message>
<message>
<location line="+5"/>
- <source>Copying install file...</source>
+ <source>Copying installation file...</source>
<translation>Копирование уÑтановочного файла...</translation>
</message>
<message>
@@ -17001,7 +18039,7 @@ Deploying application to '%2'...</source>
<translation>Отменено.</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>The device '%1' has been disconnected</source>
<translation>УÑтройÑтво "%1" было отключено</translation>
</message>
@@ -17009,7 +18047,7 @@ Deploying application to '%2'...</source>
<context>
<name>Qt4ProjectManager::Internal::S60Devices::Device</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devices.cpp" line="+69"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devices.cpp" line="+90"/>
<source>Id:</source>
<translation>Id:</translation>
</message>
@@ -17035,29 +18073,50 @@ Deploying application to '%2'...</source>
</message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::S60DevicesPreferencePane</name>
+ <name>Qt4ProjectManager::Internal::S60DevicesBaseWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui"/>
- <source>Form</source>
- <translation>Форма</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-246"/>
+ <source>Default</source>
+ <translation>По умолчанию</translation>
</message>
<message>
- <location/>
+ <location line="+1"/>
<source>SDK Location</source>
<translation>Размещение SDK</translation>
</message>
<message>
- <location/>
+ <location line="+1"/>
<source>Qt Location</source>
<translation>Размещение Qt</translation>
</message>
+ <message>
+ <location line="+157"/>
+ <source>Choose Qt folder</source>
+ <translation>Выбор каталога Qt</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::S60DevicesModel</name>
+ <message>
+ <location line="-122"/>
+ <source>No Qt installed</source>
+ <translation>Qt не уÑтановлена</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::S60DevicesPreferencePane</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui"/>
+ <source>Form</source>
+ <translation>Форма</translation>
+ </message>
<message>
<location/>
<source>Refresh</source>
<translation>Обновить</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+119"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+240"/>
<source>S60 SDKs</source>
<translation>SDK Ð´Ð»Ñ S60</translation>
</message>
@@ -17066,13 +18125,20 @@ Deploying application to '%2'...</source>
<source>Error</source>
<translation>Ошибка</translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::S60DevicesWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-46"/>
- <source>No Qt installed</source>
- <translation>Qt не уÑтановлена</translation>
+ <location/>
+ <source>Add</source>
+ <translation>Добавить</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Change Qt version</source>
+ <translation>Сменить профиль Qt</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Удалить</translation>
</message>
</context>
<context>
@@ -17130,7 +18196,7 @@ Deploying application to '%2'...</source>
<context>
<name>Qt4ProjectManager::Internal::S60Manager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+117"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+116"/>
<source>Run in Emulator</source>
<translation>Выполнить на ÑмулÑторе</translation>
</message>
@@ -17148,51 +18214,80 @@ Deploying application to '%2'...</source>
<context>
<name>Qt4ProjectManager::Internal::TargetSetupPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp" line="+50"/>
- <source>Set up targets for your project</source>
- <translation type="unfinished">ÐаÑтройка целей проекта</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.ui"/>
<source>Qt Creator can set up the following targets:</source>
<translation>Qt Creator может наÑтроить Ñледующие цели:</translation>
</message>
<message>
- <location line="+9"/>
+ <location/>
<source>Qt Version</source>
<translation>Профиль Qt</translation>
</message>
<message>
- <location line="+0"/>
+ <location/>
<source>Status</source>
<translation>СоÑтоÑние</translation>
</message>
<message>
- <location line="+0"/>
- <source>Directory</source>
- <translation>Каталог</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp" line="+423"/>
+ <source>No builds found</source>
+ <translation>Сборки не найдены</translation>
</message>
<message>
- <location line="+5"/>
- <source>Scan for builds</source>
- <translation type="unfinished">ПоиÑк Ñборок</translation>
+ <location line="+1"/>
+ <source>No builds for project file "%1" were found in the folder "%2".</source>
+ <comment>%1: pro-file, %2: directory that was checked.</comment>
+ <translation>Сборки Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° проекта "%1" не были найдены в каталоге "%2".</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source><b>Error:</b> </source>
+ <comment>Severity is Task::Error</comment>
+ <translation><b>Ошибка:</b> </translation>
</message>
<message>
<location line="+4"/>
- <source>Directory to import builds from</source>
- <translation type="unfinished">Каталог импорта Ñборок</translation>
+ <source><b>Warning:</b> </source>
+ <comment>Severity is Task::Warning</comment>
+ <translation><b>Предупреждение:</b> </translation>
</message>
<message>
- <location line="+83"/>
+ <location line="-165"/>
+ <source>Qt Creator can set up the following targets for project <b>%1</b>:</source>
+ <comment>%1: Project name</comment>
+ <translation type="unfinished">Qt Creator позволÑет наÑтроить Ñледующие цели Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð° <b>%1</b>:</translation>
+ </message>
+ <message>
+ <location line="+107"/>
+ <source>Choose a directory to scan for additional shadow builds</source>
+ <translation>Выбор директории Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка дополнительных теневых Ñборок</translation>
+ </message>
+ <message>
+ <location line="-245"/>
<source>Import</source>
<comment>Is this an import of an existing build or a new one?</comment>
- <translation type="unfinished">ИмпортируемаÑ</translation>
+ <translation>ИмпортируемаÑ</translation>
</message>
<message>
<location line="+1"/>
<source>New</source>
<comment>Is this an import of an existing build or a new one?</comment>
- <translation type="unfinished">ÐоваÑ</translation>
+ <translation>ÐоваÑ</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.ui"/>
+ <source>Setup targets for your project</source>
+ <translation>ÐаÑтройте цели вашего проекта</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Build Directory</source>
+ <translation>Каталог Ñборки</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Import Existing Shadow Build...</source>
+ <translation>Импорт каталога теневой Ñборки...</translation>
</message>
</context>
<context>
@@ -17204,8 +18299,8 @@ Deploying application to '%2'...</source>
</message>
<message>
<location line="+1"/>
- <source>Creates a Qt Unit Test.</source>
- <translation>Создание юнит теÑта Qt.</translation>
+ <source>Creates a QTestLib-based unit test for a feature or a class. Unit tests allow you to verify that the code is fit for use and that there are no regressions.</source>
+ <translation>Создание юнит теÑта оÑнованного на QTestLib Ð´Ð»Ñ ÐºÐ»Ð°ÑÑа или ÑвойÑтва. Юнит теÑÑ‚Ñ‹ позволÑÑŽÑ‚ проверÑÑ‚ÑŒ код на ÑоответÑтвие целÑм и отÑутÑтвие регреÑÑий.</translation>
</message>
</context>
<context>
@@ -17287,7 +18382,7 @@ Deploying application to '%2'...</source>
<context>
<name>Qt4ProjectManager::MakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="-320"/>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="-330"/>
<source>Make</source>
<comment>Qt4 MakeStep display name.</comment>
<translation>Сборка</translation>
@@ -17301,11 +18396,7 @@ Deploying application to '%2'...</source>
<context>
<name>Qt4ProjectManager::MakeStepConfigWidget</name>
<message>
- <source><b>Make Step:</b> %1 not found in the environment.</source>
- <translation type="obsolete"><b>Ðтап Ñборки:</b>программа %1 не найдена.</translation>
- </message>
- <message>
- <location line="+126"/>
+ <location line="+136"/>
<source><b>Make:</b> %1 not found in the environment.</source>
<translation><b>Сборка:</b>программа %1 не найдена.</translation>
</message>
@@ -17323,44 +18414,15 @@ Deploying application to '%2'...</source>
<context>
<name>Qt4ProjectManager::QMakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="-431"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="-405"/>
<source>qmake</source>
<comment>QMakeStep display name.</comment>
<translation>qmake</translation>
</message>
<message>
- <location line="+57"/>
- <source><font color="#ff0000">Qt version <b>%1</b> is invalid. Set a valid Qt Version in Preferences </font>
-</source>
- <translation><font color="#ff0000">Профиль Qt <b>%1</b> некорректный. Выберите корректный профиль Qt в Параметрах </font>
-</translation>
- </message>
- <message>
- <location line="+3"/>
- <source><font color="#ff0000">Qt version <b>%1</b> is invalid. Set valid Qt Version in Tools/Options </b></font>
-</source>
- <translation><font color="#ff0000">Профиль Qt <b>%1</b> некорректный. Выберите корректный профиль Qt в ИнÑтрументах/ÐаÑтройках </font>
-</translation>
- </message>
- <message>
- <location line="+62"/>
- <source>The Symbian SDK and the project sources must reside on the same drive.</source>
- <translation>Symbian SDK и иÑходные файлы проекта должны раÑполагатьÑÑ Ð½Ð° одном диÑке.</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>The Symbian SDK was not found for Qt version %1.</source>
- <translation>Ðе найден Symbian SDK Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Qt %1.</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>The "Open C/C++ plugin" is not installed in the Symbian SDK or the Symbian SDK path is misconfigured for Qt version %1.</source>
- <translation>У Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Qt %1 путь к Symbian SDK неверен или в него не уÑтановлен "Open C/C++ plugin".</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>The Symbian toolchain does not handle special characters in a project path well.</source>
- <translation>ИнÑтрументарий Symbian не ÑпоÑобен обрабатывать Ñпециальные Ñимволы в пути проекта.</translation>
+ <location line="+120"/>
+ <source><font color="#0000ff">Configuration is faulty, please check the Build Issues view for details.</font></source>
+ <translation><font color="#0000ff">ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ¸Ñправна. Окно "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñборки" Ñодержит подробную информацию.</font></translation>
</message>
<message>
<location line="+6"/>
@@ -17397,15 +18459,30 @@ Deploying application to '%2'...</source>
<context>
<name>Qt4ProjectManager::Qt4Project</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+794"/>
- <source>Evaluate</source>
- <translation>ВычиÑлить</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+797"/>
+ <source>Evaluating</source>
+ <translation>ВычиÑление</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::QtVersion</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+647"/>
+ <source>The Qt version is invalid: %1</source>
+ <extracomment>%1: Reason for being invalid</extracomment>
+ <translation>Ðекорректный профиль Qt: %1</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>The qmake command "%1" was not found or is not executable.</source>
+ <extracomment>%1: Path to qmake executable</extracomment>
+ <translation>Ðе удалоÑÑŒ найти программу qmake "%1" или она неиÑполнÑема.</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+383"/>
+ <location line="-261"/>
<source><not found></source>
<translation><не найдена></translation>
</message>
@@ -17966,7 +19043,7 @@ Deploying application to '%2'...</source>
<context>
<name>QtVersion</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+848"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+913"/>
<source>No qmake path set</source>
<translation>Путь к qmake не указан</translation>
</message>
@@ -17986,36 +19063,82 @@ Deploying application to '%2'...</source>
<translation>Ðе удалоÑÑŒ определить путь к утилитам Qt. Может путь к qmake неверен?</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+128"/>
<source>The Qt Version has no toolchain.</source>
<translation>У Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Qt нет инÑтрументариÑ.</translation>
</message>
</context>
<context>
- <name>RegExp::Internal::RegExpWindow</name>
+ <name>RectangleColorGroupBox</name>
<message>
- <location filename="../../../src/plugins/regexp/regexpwindow.cpp" line="+46"/>
- <source>&Pattern:</source>
- <translation>&Шаблон:</translation>
+ <location filename="../qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml" line="+7"/>
+ <source>Colors</source>
+ <translation type="unfinished">Цвета</translation>
</message>
<message>
- <location line="+1"/>
- <source>&Escaped Pattern:</source>
- <translation>Ðкран&ированный шаблон:</translation>
+ <location line="+43"/>
+ <source>Stops</source>
+ <translation type="unfinished">Опорные точки</translation>
</message>
<message>
<location line="+1"/>
- <source>&Pattern Syntax:</source>
- <translation>&Правила шаблона:</translation>
+ <source>Gradient Stops</source>
+ <translation type="unfinished">Опорные точки градиента</translation>
</message>
<message>
- <location line="+1"/>
- <source>&Text:</source>
- <translation>&ТекÑÑ‚:</translation>
+ <location line="+14"/>
+ <source>Rectangle</source>
+ <translation type="unfinished">ПрÑмоугольник</translation>
</message>
<message>
- <location line="+4"/>
- <source>Case &Sensitive</source>
+ <location line="+45"/>
+ <source>Border</source>
+ <translation type="unfinished">Рамка</translation>
+ </message>
+</context>
+<context>
+ <name>RectangleSpecifics</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml" line="+21"/>
+ <source>Rectangle</source>
+ <translation type="unfinished">ПрÑмоугольник</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Radius</source>
+ <translation type="unfinished">РадиуÑ</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Border</source>
+ <translation type="unfinished">Рамка</translation>
+ </message>
+</context>
+<context>
+ <name>RegExp::Internal::RegExpWindow</name>
+ <message>
+ <location filename="../../../src/plugins/regexp/regexpwindow.cpp" line="+46"/>
+ <source>&Pattern:</source>
+ <translation>&Шаблон:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Escaped Pattern:</source>
+ <translation>Ðкран&ированный шаблон:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Pattern Syntax:</source>
+ <translation>&Правила шаблона:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Text:</source>
+ <translation>&ТекÑÑ‚:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Case &Sensitive</source>
<translation>Учитывать &региÑÑ‚Ñ€</translation>
</message>
<message>
@@ -18098,8 +19221,8 @@ Deploying application to '%2'...</source>
<name>ResourceEditor::Internal::ResourceEditorPlugin</name>
<message>
<location filename="../../../src/plugins/resourceeditor/resourceeditorplugin.cpp" line="+78"/>
- <source>Creates a Qt Resource file (.qrc).</source>
- <translation>Создание файла реÑурÑов Qt (.qrc).</translation>
+ <source>Creates a Qt Resource file (.qrc) that you can add to a Qt C++ project.</source>
+ <translation>Создание файла реÑурÑов Qt (.qrc) Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² проект Qt C++.</translation>
</message>
<message>
<location line="+1"/>
@@ -18120,7 +19243,7 @@ Deploying application to '%2'...</source>
<context>
<name>ResourceEditor::Internal::ResourceEditorW</name>
<message>
- <location filename="../../../src/plugins/resourceeditor/resourceeditorw.cpp" line="+117"/>
+ <location filename="../../../src/plugins/resourceeditor/resourceeditorw.cpp" line="+116"/>
<source>untitled</source>
<translation>безымÑнный</translation>
</message>
@@ -18164,7 +19287,7 @@ Deploying application to '%2'...</source>
<context>
<name>SharedTools::QrcEditor</name>
<message>
- <location filename="../../../src/shared/qrceditor/qrceditor.cpp" line="+57"/>
+ <location filename="../../../src/shared/qrceditor/qrceditor.cpp" line="+58"/>
<source>Add Files</source>
<translation>Добавить файлы</translation>
</message>
@@ -18174,12 +19297,7 @@ Deploying application to '%2'...</source>
<translation>Добавить приÑтавку</translation>
</message>
<message>
- <location line="+156"/>
- <source>Invalid file</source>
- <translation>Ðекорректный файл</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+159"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
@@ -18194,9 +19312,14 @@ Deploying application to '%2'...</source>
<translation>Прервать</translation>
</message>
<message>
- <location line="+2"/>
- <source>The file %1 is not in a subdirectory of the resource file. Continuing will result in an invalid resource file.</source>
- <translation>Файл %1 не найден в подкаталоге реÑурÑного файла. ЕÑли продолжить, будет Ñоздан некорректный файл реÑурÑов.</translation>
+ <location line="-9"/>
+ <source>Invalid file location</source>
+ <translation>Ðеверное размещение файла</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>The file %1 is not in a subdirectory of the resource file. You now have the option to copy this file to a valid location.</source>
+ <translation type="unfinished">Файл %1 не ÑвлÑетÑÑ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼ файла реÑурÑов. ЕÑÑ‚ÑŒ возможноÑÑ‚ÑŒ Ñкопировать его в верное меÑтоположение.</translation>
</message>
<message>
<location line="+15"/>
@@ -18227,7 +19350,7 @@ Deploying application to '%2'...</source>
<context>
<name>SharedTools::ResourceView</name>
<message>
- <location filename="../../../src/shared/qrceditor/resourceview.cpp" line="+362"/>
+ <location filename="../../../src/shared/qrceditor/resourceview.cpp" line="+355"/>
<source>Add Files...</source>
<translation>Добавить файлы...</translation>
</message>
@@ -18321,6 +19444,87 @@ Deploying application to '%2'...</source>
<translation>Фрагменты</translation>
</message>
</context>
+<context>
+ <name>SshKeyGenerator</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/ssh/sshkeygenerator.cpp" line="+21"/>
+ <source>Error creating temporary files.</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ñ… файлов.</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Error generating keys: %1</source>
+ <translation>Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÐ»ÑŽÑ‡ÐµÐ¹: %1</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <location line="+8"/>
+ <source>Error reading temporary files.</source>
+ <translation>Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ñ… файлов.</translation>
+ </message>
+</context>
+<context>
+ <name>StandardTextColorGroupBox</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml" line="+11"/>
+ <source>Color</source>
+ <translation type="unfinished">Цвет</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Text</source>
+ <translation type="unfinished">ТекÑÑ‚</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Style</source>
+ <translation type="unfinished">Стиль</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Selection</source>
+ <translation type="unfinished">Выделение</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Selected</source>
+ <translation type="unfinished">Выделено</translation>
+ </message>
+</context>
+<context>
+ <name>StandardTextGroupBox</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml" line="+7"/>
+ <location line="+9"/>
+ <source>Text</source>
+ <translation type="unfinished">ТекÑÑ‚</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Wrap Mode</source>
+ <translation type="unfinished">Режим переноÑа</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Aliasing</source>
+ <translation type="unfinished">СтупенчатоÑÑ‚ÑŒ</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Smooth</source>
+ <translation type="unfinished">Гладкий</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>Alignment</source>
+ <translation type="unfinished">Выравнивание</translation>
+ </message>
+</context>
<context>
<name>StartExternalDialog</name>
<message>
@@ -18344,6 +19548,54 @@ Deploying application to '%2'...</source>
<translation>ОÑтанов на 'main':</translation>
</message>
</context>
+<context>
+ <name>StartExternalQmlDialog</name>
+ <message>
+ <location filename="../../../src/plugins/qmlinspector/startexternalqmldialog.ui"/>
+ <source>Debugging address:</source>
+ <translation>ÐÐ´Ñ€ÐµÑ Ð¾Ñ‚Ð»Ð°Ð´Ñ‡Ð¸ÐºÐ°:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Debugging port:</source>
+ <translation>Порт отладчика:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>127.0.0.1</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Project:</source>
+ <translation>Проект:</translation>
+ </message>
+ <message>
+ <location/>
+ <source><No project></source>
+ <translation><Ðе указан></translation>
+ </message>
+ <message>
+ <location/>
+ <source>To switch languages while debugging, go to Debug->Language menu.</source>
+ <translation>Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñзыков при отладке, перейдите в меню Отладка->Язык.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Start Simultaneous QML and C++ Debugging </source>
+ <translation>ЗапуÑк одновременной отладки C++ и QML</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Viewer path:</source>
+ <translation>Программа проÑмотра:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Viewer arguments:</source>
+ <translation>Параметры программы:</translation>
+ </message>
+</context>
<context>
<name>StartRemoteDialog</name>
<message>
@@ -18384,15 +19636,15 @@ Deploying application to '%2'...</source>
<message>
<location/>
<source>Sysroot:</source>
- <translation type="unfinished">СиÑтемный корень:</translation>
+ <translation>СиÑтемный корень:</translation>
</message>
</context>
<context>
<name>Subversion::Internal::CheckoutWizard</name>
<message>
<location filename="../../../src/plugins/subversion/checkoutwizard.cpp" line="+56"/>
- <source>Checks out a project from a Subversion repository.</source>
- <translation>Извлечение проекта из хранилища Subversion.</translation>
+ <source>Checks out a Subversion repository and tries to load the contained project.</source>
+ <translation>Извлечение хранилища Subversion Ñ Ð¿Ð¾Ñледующей попыткой загрузки ÑодержащегоÑÑ Ñ‚Ð°Ð¼ проекта.</translation>
</message>
<message>
<location line="+5"/>
@@ -18422,19 +19674,9 @@ Deploying application to '%2'...</source>
<name>Subversion::Internal::SettingsPage</name>
<message>
<location filename="../../../src/plugins/subversion/settingspage.ui"/>
- <source>Subversion Command:</source>
- <translation>Команда Subversion:</translation>
- </message>
- <message>
- <location/>
<source>Authentication</source>
<translation>ÐвторизациÑ</translation>
</message>
- <message>
- <location/>
- <source>User name:</source>
- <translation>Пользователь:</translation>
- </message>
<message>
<location/>
<source>Password:</source>
@@ -18480,6 +19722,16 @@ Deploying application to '%2'...</source>
<source>Log count:</source>
<translation>КоличеÑтво отображаемых запиÑей иÑтории фикÑаций:</translation>
</message>
+ <message>
+ <location/>
+ <source>Subversion command:</source>
+ <translation>Команда Subversion:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Username:</source>
+ <translation type="unfinished">Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:</translation>
+ </message>
</context>
<context>
<name>Subversion::Internal::SettingsPageWidget</name>
@@ -18500,7 +19752,7 @@ Deploying application to '%2'...</source>
<context>
<name>Subversion::Internal::SubversionPlugin</name>
<message>
- <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+293"/>
+ <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+302"/>
<source>&Subversion</source>
<translation>&Subversion</translation>
</message>
@@ -18540,12 +19792,12 @@ Deploying application to '%2'...</source>
<translation>Alt+S,Alt+D</translation>
</message>
<message>
- <location line="+104"/>
+ <location line="+124"/>
<source>Commit All Files</source>
<translation>ФикÑировать вÑе файлы</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-90"/>
<source>Commit Current File</source>
<translation>ФикÑировать текущий файл</translation>
</message>
@@ -18580,12 +19832,42 @@ Deploying application to '%2'...</source>
<translation>ÐÐ½Ð½Ð¾Ñ‚Ð°Ñ†Ð¸Ñ "%1" (annotate)</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+77"/>
+ <source>Commit Project</source>
+ <translation>ФикÑировать проект</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Commit Project "%1"</source>
+ <translation>ФикÑировать проект "%1"</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Diff Repository</source>
+ <translation type="unfinished">Сравнить вÑÑ‘</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Repository Status</source>
+ <translation type="unfinished">СоÑтоÑние хранилища</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Log Repository</source>
+ <translation type="unfinished">ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ð°</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Update Repository</source>
+ <translation>Обновить вÑÑ‘</translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Describe...</source>
<translation>ОпиÑать (describe)...</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-62"/>
<source>Project Status</source>
<translation>СоÑтоÑние проекта</translation>
</message>
@@ -18640,12 +19922,7 @@ Deploying application to '%2'...</source>
<translation>Обновить проект "%1"</translation>
</message>
<message>
- <location line="+9"/>
- <source>Repository Log</source>
- <translation>ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ð°</translation>
- </message>
- <message>
- <location line="+18"/>
+ <location line="+52"/>
<source>Revert Repository...</source>
<translation>Откатить вÑе изменениÑ...</translation>
</message>
@@ -18670,7 +19947,7 @@ Deploying application to '%2'...</source>
<translation>&Вернуть</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+27"/>
<source>Closing Subversion Editor</source>
<translation>Закрытие редактора Subversion</translation>
</message>
@@ -18685,7 +19962,7 @@ Deploying application to '%2'...</source>
<translation>Сообщение о фикÑации Ñодержит ошибки. ФикÑировать изменение?</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+131"/>
<source>Revert repository</source>
<translation>Откатить вÑе изменениÑ</translation>
</message>
@@ -18705,7 +19982,7 @@ Deploying application to '%2'...</source>
<translation>Файл был изменён. Желаете откатить его изменениÑ?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+60"/>
<source>Another commit is currently being executed.</source>
<translation>Ð’ данный момент уже идёт Ð´Ñ€ÑƒÐ³Ð°Ñ Ñ„Ð¸ÐºÑациÑ.</translation>
</message>
@@ -18720,7 +19997,7 @@ Deploying application to '%2'...</source>
<translation>Ðе удаётÑÑ Ñоздать временный файл: %1</translation>
</message>
<message>
- <location line="+223"/>
+ <location line="+257"/>
<source>Describe</source>
<translation>ОпиÑание</translation>
</message>
@@ -18730,20 +20007,26 @@ Deploying application to '%2'...</source>
<translation>Ðомер ревизии:</translation>
</message>
<message>
- <location line="+37"/>
+ <location line="+33"/>
+ <source>Executing in %1: %2 %3
+</source>
+ <translation type="unfinished">ВыполнÑетÑÑ Ð² %1: %2 %3
+</translation>
+ </message>
+ <message>
+ <location line="+14"/>
<source>No subversion executable specified!</source>
<translation>ИÑполнÑемый файл Subversion не указан!</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-15"/>
<source>Executing: %1 %2
</source>
- <extracomment>Executing: <executable> <arguments></extracomment>
<translation>ВыполнÑетÑÑ: %1 %2
</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+57"/>
<source>The process terminated with exit code %1.</source>
<translation>ПроцеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %1.</translation>
</message>
@@ -18771,6 +20054,34 @@ Deploying application to '%2'...</source>
<translation>ФикÑÐ°Ñ†Ð¸Ñ Subversion</translation>
</message>
</context>
+<context>
+ <name>Switches</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/Switches.qml" line="+21"/>
+ <source>special properties</source>
+ <translation type="unfinished">Ñпециальные ÑвойÑтва</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>layout and geometry</source>
+ <translation type="unfinished">компоновка и геометриÑ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Geometry</source>
+ <translation type="unfinished">ГеометриÑ</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>advanced properties</source>
+ <translation type="unfinished">дополнительные ÑвойÑтва</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Advanced</source>
+ <translation type="unfinished">Дополнительно</translation>
+ </message>
+</context>
<context>
<name>SymbolGroup</name>
<message>
@@ -18787,10 +20098,23 @@ Deploying application to '%2'...</source>
<translation>Цели</translation>
</message>
</context>
+<context>
+ <name>TextEditSpecifics</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml" line="+24"/>
+ <source>Text Edit</source>
+ <translation type="unfinished">ТекÑтовый редактор</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Format</source>
+ <translation type="unfinished">Формат</translation>
+ </message>
+</context>
<context>
<name>TextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/texteditorconstants.h" line="+111"/>
+ <location filename="../../../src/plugins/texteditor/texteditorconstants.h" line="+127"/>
<source>Text Editor</source>
<translation>ТекÑтовый редактор</translation>
</message>
@@ -18798,7 +20122,7 @@ Deploying application to '%2'...</source>
<context>
<name>TextEditor::BaseFileFind</name>
<message>
- <location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+154"/>
+ <location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+155"/>
<location line="+21"/>
<source>%1 found</source>
<translation>%1 найдено</translation>
@@ -18806,18 +20130,18 @@ Deploying application to '%2'...</source>
<message>
<location line="+12"/>
<source>List of comma separated wildcard filters</source>
- <translation type="unfinished">СпиÑок шаблонов (Ñ Ñимволами-заменителÑми), разделенных запÑтой</translation>
+ <translation>СпиÑок маÑок, разделённых запÑтой</translation>
</message>
<message>
<location line="+27"/>
- <source>Use Regular E&xpressions</source>
+ <source>Use regular e&xpressions</source>
<translation>ИÑпользовать регул&Ñрные выражениÑ</translation>
</message>
</context>
<context>
<name>TextEditor::BaseTextDocument</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+161"/>
+ <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+237"/>
<source>untitled</source>
<translation>безымÑнный</translation>
</message>
@@ -18830,12 +20154,12 @@ Deploying application to '%2'...</source>
<context>
<name>TextEditor::BaseTextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+276"/>
+ <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+275"/>
<source>Print Document</source>
<translation>Печать документа</translation>
</message>
<message>
- <location line="+314"/>
+ <location line="+252"/>
<source><b>Error:</b> Could not decode "%1" with "%2"-encoding. Editing not possible.</source>
<translation><b>Ошибка:</b> Ðе удалоÑÑŒ преобразовать "%1" в кодировку "%2". Редактирование невозможно.</translation>
</message>
@@ -18848,7 +20172,7 @@ Deploying application to '%2'...</source>
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+5180"/>
+ <location line="+4824"/>
<source>Line: %1, Col: %2</source>
<translation>Строка: %1, Столбец: %2</translation>
</message>
@@ -18877,13 +20201,8 @@ Deploying application to '%2'...</source>
</message>
<message>
<location/>
- <source>In leading white space</source>
- <translation>Перед текÑтом</translation>
- </message>
- <message>
- <location/>
- <source>Storage</source>
- <translation>Сохранение</translation>
+ <source>Storage</source>
+ <translation>Сохранение</translation>
</message>
<message>
<location/>
@@ -18970,14 +20289,6 @@ Deploying application to '%2'...</source>
<source>Enable scroll &wheel zooming</source>
<translation>Включить маÑштабирование &колёÑиком</translation>
</message>
- <message>
- <source>Braces will be flush with indented block, except first indent level.</source>
- <translation type="obsolete">Скобки будут выравниватьÑÑ Ð² пределах Ñтруктурного блока, за иÑключением первого ÑƒÑ€Ð¾Ð²Ð½Ñ Ð¾Ñ‚Ñтупов.</translation>
- </message>
- <message>
- <source>Indent brace&s</source>
- <translation type="obsolete">Выравнивать &Ñкобки</translation>
- </message>
<message>
<location/>
<source>Automatically determine based on the nearest indented line (previous line preferred over next line)</source>
@@ -19008,6 +20319,11 @@ Deploying application to '%2'...</source>
<source>GNU Style</source>
<translation>Стиль GNU</translation>
</message>
+ <message>
+ <location/>
+ <source>In Leading White Space</source>
+ <translation>Перед текÑтом</translation>
+ </message>
</context>
<context>
<name>TextEditor::DisplaySettingsPage</name>
@@ -19076,22 +20392,27 @@ Deploying application to '%2'...</source>
<source>Auto-fold first &comment</source>
<translation>С&ворачивать первый комментарий</translation>
</message>
+ <message>
+ <location/>
+ <source>Center &cursor on scroll</source>
+ <translation type="unfinished">&Центрировать курÑор при прокрутке</translation>
+ </message>
</context>
<context>
<name>TextEditor::FontSettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+320"/>
+ <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+312"/>
<source>Font && Colors</source>
<translation>Шрифт и цвета</translation>
</message>
<message>
- <location line="+139"/>
+ <location line="+140"/>
<source>Copy Color Scheme</source>
<translation>Копировать цветовую Ñхему</translation>
</message>
<message>
<location line="+1"/>
- <source>Color Scheme name:</source>
+ <source>Color scheme name:</source>
<translation>Ðазвание цветовой Ñхемы:</translation>
</message>
<message>
@@ -19212,7 +20533,7 @@ The following encodings are likely to fit:</source>
<context>
<name>TextEditor::Internal::FindInFiles</name>
<message>
- <location filename="../../../src/plugins/texteditor/findinfiles.cpp" line="+56"/>
+ <location filename="../../../src/plugins/texteditor/findinfiles.cpp" line="+57"/>
<source>Files on File System</source>
<translation>Файлы в ÑиÑтеме</translation>
</message>
@@ -19232,7 +20553,7 @@ The following encodings are likely to fit:</source>
<translation>Ш&аблон:</translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+21"/>
<source>Directory to search</source>
<translation>Каталог поиÑка</translation>
</message>
@@ -19306,6 +20627,49 @@ The following encodings are likely to fit:</source>
<translation>Строка %1</translation>
</message>
</context>
+<context>
+ <name>TextEditor::Internal::TextEditorPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+94"/>
+ <source>Creates a text file. The default file extension is <tt>.txt</tt>. You can specify a different extension as part of the filename.</source>
+ <translation>Создание текÑтового файла. РаÑширение по умолчанию - <tt>.txt</tt>. Можно указать другое раÑширение, как чаÑÑ‚ÑŒ имени файла.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Text File</source>
+ <translation>ТекÑтовый файл</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>General</source>
+ <translation>ОÑновное</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Triggers a completion in this scope</source>
+ <translation>Переключение Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð² Ñтой облаÑти</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Ctrl+Space</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Meta+Space</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Triggers a quick fix in this scope</source>
+ <translation>Переключает быÑтрое дополнение в Ñтой облаÑти</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Alt+Return</source>
+ <translation></translation>
+ </message>
+</context>
<context>
<name>TextEditor::TextEditorActionHandler</name>
<message>
@@ -19332,17 +20696,17 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+I</source>
- <translation>Ctrl+I</translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
<source>Meta</source>
- <translation>Meta</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>Ctrl</source>
- <translation>Ctrl</translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -19367,17 +20731,17 @@ The following encodings are likely to fit:</source>
<message>
<location line="-20"/>
<source>%1+E, R</source>
- <translation>%1+E, R</translation>
+ <translation></translation>
</message>
<message>
<location line="+9"/>
<source>%1+E, %2+V</source>
- <translation>%1+E, %2+V</translation>
+ <translation></translation>
</message>
<message>
<location line="+14"/>
<source>%1+E, %2+W</source>
- <translation>%1+E, %2+W</translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
@@ -19387,7 +20751,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+/</source>
- <translation>Ctrl+/</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -19397,7 +20761,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Shift+Del</source>
- <translation>Shift+Del</translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -19412,7 +20776,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+<</source>
- <translation>Ctrl+<</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -19422,7 +20786,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+></source>
- <translation>Ctrl+></translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -19437,7 +20801,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl++</source>
- <translation>Ctrl++</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -19447,7 +20811,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+-</source>
- <translation>Ctrl+-</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -19455,12 +20819,12 @@ The following encodings are likely to fit:</source>
<translation>ВоÑÑтановить размер шрифта</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Ctrl+0</source>
- <translation>Ctrl+0</translation>
+ <translation></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Go to Block Start</source>
<translation>Перейти в начало блока</translation>
</message>
@@ -19480,24 +20844,104 @@ The following encodings are likely to fit:</source>
<translation>Перейти в конец блока Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="+43"/>
+ <source>Goto Line Start</source>
+ <translation>Перейти в начало Ñтроки</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Line End</source>
+ <translation>Перейти в конец Ñтроки</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Line</source>
+ <translation>Перейти на Ñледующую Ñтроку</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Line</source>
+ <translation>Перейти на предыдущую Ñтроку</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Character</source>
+ <translation>Перейти на предыдущий Ñимвол</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Character</source>
+ <translation>Перейти на Ñледующий Ñимвол</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Word</source>
+ <translation>Перейти на предыдущее Ñлово</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Word</source>
+ <translation>Перейти на Ñледующее Ñлово</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Goto Line Start With Selection</source>
+ <translation>Перейти в начало Ñтроки Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Line End With Selection</source>
+ <translation>Перейти в конец Ñтроки Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Line With Selection</source>
+ <translation>Перейти на Ñледующую Ñтроку Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Line With Selection</source>
+ <translation>Перейти на предыдущую Ñтроку Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Character With Selection</source>
+ <translation>Перейти на предыдущий Ñимвол Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Character With Selection</source>
+ <translation>Перейти на Ñледующий Ñимвол Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Word With Selection</source>
+ <translation>Перейти на предыдущее Ñлово Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Word With Selection</source>
+ <translation>Перейти на Ñледующее Ñлово Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼</translation>
+ </message>
+ <message>
+ <location line="-104"/>
<source>Ctrl+[</source>
- <translation>Ctrl+[</translation>
+ <translation></translation>
</message>
<message>
<location line="+6"/>
<source>Ctrl+]</source>
- <translation>Ctrl+]</translation>
+ <translation></translation>
</message>
<message>
<location line="+6"/>
<source>Ctrl+{</source>
- <translation>Ctrl+{</translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
<source>Ctrl+}</source>
- <translation>Ctrl+}</translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -19507,7 +20951,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+U</source>
- <translation>Ctrl+U</translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -19522,7 +20966,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+Shift+Up</source>
- <translation>Ctrl+Shift+Up</translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -19532,7 +20976,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+Shift+Down</source>
- <translation>Ctrl+Shift+Down</translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -19542,7 +20986,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+Alt+Up</source>
- <translation>Ctrl+Alt+Up</translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -19552,7 +20996,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+Alt+Down</source>
- <translation>Ctrl+Alt+Down</translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -19562,61 +21006,18 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Ctrl+J</source>
- <translation>Ctrl+J</translation>
+ <translation></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+147"/>
<source><line number></source>
<translation><номер Ñтроки></translation>
</message>
</context>
-<context>
- <name>TextEditor::TextEditorPlugin</name>
- <message>
- <location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+94"/>
- <source>Creates a text file (.txt).</source>
- <translation>СоздаÑÑ‚ текÑтовый файл (.txt).</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Text File</source>
- <translation>ТекÑтовый файл</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>General</source>
- <translation>ОÑновное</translation>
- </message>
- <message>
- <location line="+26"/>
- <source>Triggers a completion in this scope</source>
- <translation>Переключение Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð² Ñтой облаÑти</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Ctrl+Space</source>
- <translation></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Meta+Space</source>
- <translation></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Triggers a quick fix in this scope</source>
- <translation>Переключает быÑтрое дополнение в Ñтой облаÑти</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Alt+Return</source>
- <translation></translation>
- </message>
-</context>
<context>
<name>TextEditor::TextEditorSettings</name>
<message>
- <location filename="../../../src/plugins/texteditor/texteditorsettings.cpp" line="+65"/>
+ <location filename="../../../src/plugins/texteditor/texteditorsettings.cpp" line="+103"/>
<source>Text</source>
<translation>ТекÑÑ‚</translation>
</message>
@@ -19756,62 +21157,120 @@ The following encodings are likely to fit:</source>
<translation>Сравнение: размещение</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+10"/>
<source>Behavior</source>
<translation>Поведение</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
<source>Display</source>
<translation>Вид</translation>
</message>
</context>
+<context>
+ <name>TextInputGroupBox</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml" line="+7"/>
+ <source>Text Input</source>
+ <translation type="unfinished">ТекÑтовый ввод</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Input Mask</source>
+ <translation type="unfinished">МаÑка ввода</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Echo Mode</source>
+ <translation type="unfinished">Режим Ñха</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Pass. Char</source>
+ <translation type="unfinished">Символ паролÑ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Password Character</source>
+ <translation type="unfinished">Символ паролÑ</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Flags</source>
+ <translation type="unfinished">Флаги</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Read Only</source>
+ <translation type="unfinished">Только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cursor Visible</source>
+ <translation type="unfinished">КурÑор виден</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Focus On Press</source>
+ <translation type="unfinished">Выбирать при нажатии</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Auto Scroll</source>
+ <translation type="unfinished">Прокручивать автоматичеÑки</translation>
+ </message>
+</context>
<context>
<name>ToolChain</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/toolchain.cpp" line="+126"/>
+ <location filename="../../../src/plugins/projectexplorer/toolchain.cpp" line="+132"/>
<source>GCC</source>
- <translation>GCC</translation>
+ <translation></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+2"/>
+ <source>Intel C++ Compiler (Linux)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Microsoft Visual C++</source>
- <translation>Microsoft Visual C++</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>Windows CE</source>
- <translation>Windows CE</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>WINSCW</source>
- <translation>WINSCW</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>GCCE</source>
- <translation>GCCE</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>GCCE/GnuPoc</source>
- <translation>GCCE/GnuPoc</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>RVCT (ARMV6)/GnuPoc</source>
- <translation>RVCT (ARMV6)/GnuPoc</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>RVCT (ARMV5)</source>
- <translation>RVCT (ARMV5)</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>RVCT (ARMV6)</source>
- <translation>RVCT (ARMV6)</translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
@@ -19863,29 +21322,98 @@ The following encodings are likely to fit:</source>
</message>
</context>
<context>
- <name>TrkOptions</name>
+ <name>Transformation</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/trkoptions.cpp" line="+91"/>
- <source>No Symbian gdb executable specified.</source>
- <translation>Ðе указан иÑполнÑемый файл gdb Ð´Ð»Ñ Symbian.</translation>
+ <location filename="../qmldesigner/propertyeditor/Qt/Transformation.qml" line="+6"/>
+ <source>Transformation</source>
+ <translation type="unfinished">Преобразование</translation>
</message>
<message>
- <location line="+5"/>
- <source>The Symbian gdb executable '%1' could not be found in the search path.</source>
- <translation>Ðе удалоÑÑŒ найти иÑполнÑемый файл gdb Ð´Ð»Ñ Symbian '%1'.</translation>
+ <location line="+9"/>
+ <source>Origin</source>
+ <translation type="unfinished">Ðачало</translation>
</message>
-</context>
-<context>
- <name>Utils::CheckableMessageBox</name>
<message>
- <location filename="../../../src/libs/utils/checkablemessagebox.ui"/>
- <source>Dialog</source>
- <translation>Dialog</translation>
+ <location line="+20"/>
+ <source>Top Left</source>
+ <translation type="unfinished">Верхний левый</translation>
</message>
<message>
- <location/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
+ <location line="+1"/>
+ <source>Top</source>
+ <translation type="unfinished">Верхний</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Top Right</source>
+ <translation type="unfinished">Верхний правый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Left</source>
+ <translation type="unfinished">Левый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Center</source>
+ <translation type="unfinished">Центральный</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Right</source>
+ <translation type="unfinished">Правый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bottom Left</source>
+ <translation type="unfinished">Ðижний левый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bottom</source>
+ <translation type="unfinished">Ðижний</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bottom Right</source>
+ <translation type="unfinished">Ðижний правый</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Scale</source>
+ <translation type="unfinished">МаÑштаб</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Rotation</source>
+ <translation type="unfinished">Вращение</translation>
+ </message>
+</context>
+<context>
+ <name>Type</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/Type.qml" line="+7"/>
+ <location line="+7"/>
+ <source>Type</source>
+ <translation>Тип</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Id</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
+ <name>Utils::CheckableMessageBox</name>
+ <message>
+ <location filename="../../../src/libs/utils/checkablemessagebox.ui"/>
+ <source>Dialog</source>
+ <translation>Dialog</translation>
+ </message>
+ <message>
+ <location/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
</message>
<message>
<location/>
@@ -19977,11 +21505,24 @@ The following encodings are likely to fit:</source>
<context>
<name>Utils::DetailsButton</name>
<message>
- <location filename="../../../src/libs/utils/detailsbutton.cpp" line="+136"/>
+ <location filename="../../../src/libs/utils/detailsbutton.cpp" line="+68"/>
<source>Details</source>
<translation>Подробнее</translation>
</message>
</context>
+<context>
+ <name>Utils::FancyMainWindow</name>
+ <message>
+ <location filename="../../../src/libs/utils/fancymainwindow.cpp" line="+63"/>
+ <source>Locked</source>
+ <translation>ЗафикÑировано</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Reset to Default Layout</source>
+ <translation>СброÑить в иÑходное ÑоÑтоÑние</translation>
+ </message>
+</context>
<context>
<name>Utils::FileNameValidatingLineEdit</name>
<message>
@@ -20051,15 +21592,20 @@ The following encodings are likely to fit:</source>
<context>
<name>Utils::FilterLineEdit</name>
<message>
- <location filename="../../../src/libs/utils/filterlineedit.cpp" line="+40"/>
- <source>Type to filter</source>
- <translation>Введите Ð´Ð»Ñ Ð¾Ñ‚Ð±Ð¾Ñ€Ð°</translation>
+ <location filename="../../../src/libs/utils/filterlineedit.cpp" line="+39"/>
+ <source>Filter</source>
+ <translation>Фильтр</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear text</source>
+ <translation>ОчиÑтить текÑÑ‚</translation>
</message>
</context>
<context>
<name>Utils::LinearProgressWidget</name>
<message>
- <location filename="../../../src/libs/utils/wizard.cpp" line="+125"/>
+ <location filename="../../../src/libs/utils/wizard.cpp" line="+126"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -20161,12 +21707,12 @@ The following encodings are likely to fit:</source>
</message>
<message>
<location line="+123"/>
- <source>Choose a directory</source>
+ <source>Choose Directory</source>
<translation>Выбор каталога</translation>
</message>
<message>
<location line="+6"/>
- <source>Choose a file</source>
+ <source>Choose File</source>
<translation>Выбор файла</translation>
</message>
<message>
@@ -20209,7 +21755,7 @@ The following encodings are likely to fit:</source>
</message>
<message>
<location line="+1"/>
- <source>Delete line</source>
+ <source>Delete Line</source>
<translation>Удалить Ñтроку</translation>
</message>
<message>
@@ -20472,7 +22018,7 @@ The following encodings are likely to fit:</source>
<translation>Редактор фикÑаций Subversion</translation>
</message>
<message>
- <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="-903"/>
+ <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="-986"/>
<source>Subversion Command Log Editor</source>
<translation>Редактор журнала команд Subversion</translation>
</message>
@@ -20496,15 +22042,19 @@ The following encodings are likely to fit:</source>
<name>VCSBase</name>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbaseconstants.h" line="+39"/>
- <location line="+4"/>
<source>Version Control</source>
<translation>Контроль верÑий</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="+3"/>
<source>Common</source>
<translation>Общее</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>Project from Version Control</source>
+ <translation>Проект из ÑиÑтемы ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ Ð²ÐµÑ€Ñий</translation>
+ </message>
</context>
<context>
<name>VCSBase::BaseCheckoutWizard</name>
@@ -20559,11 +22109,6 @@ The following encodings are likely to fit:</source>
</context>
<context>
<name>VCSBase::CleanDialog</name>
- <message>
- <location filename="../../../src/plugins/vcsbase/cleandialog.ui"/>
- <source>Clean repository</source>
- <translation>ОчиÑтить хранилище</translation>
- </message>
<message>
<location filename="../../../src/plugins/vcsbase/cleandialog.cpp" line="+68"/>
<source>The directory %1 could not be deleted.</source>
@@ -20618,6 +22163,11 @@ The following encodings are likely to fit:</source>
<source>Cleaning %1</source>
<translation>ОчиÑтка %1</translation>
</message>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/cleandialog.ui"/>
+ <source>Clean Repository</source>
+ <translation>ОчиÑтить хранилище</translation>
+ </message>
</context>
<context>
<name>VCSBase::Internal::CheckoutProgressWizardPage</name>
@@ -20724,7 +22274,7 @@ The following encodings are likely to fit:</source>
<translation>Копировать "%1"</translation>
</message>
<message>
- <location line="+213"/>
+ <location line="+218"/>
<source>Describe change %1</source>
<translation>ОпиÑать изменение %1</translation>
</message>
@@ -20750,7 +22300,7 @@ The following encodings are likely to fit:</source>
<context>
<name>VCSBase::VCSBasePlugin</name>
<message>
- <location filename="../../../src/plugins/vcsbase/vcsbaseplugin.cpp" line="+536"/>
+ <location filename="../../../src/plugins/vcsbase/vcsbaseplugin.cpp" line="+540"/>
<source>Version Control</source>
<translation>Контроль верÑий</translation>
</message>
@@ -20761,7 +22311,7 @@ The following encodings are likely to fit:</source>
</message>
<message>
<location line="+20"/>
- <source>Choose repository directory</source>
+ <source>Choose Repository Directory</source>
<translation>Выберите каталог хранилища</translation>
</message>
<message>
@@ -20798,7 +22348,7 @@ The following encodings are likely to fit:</source>
<context>
<name>VCSBase::VCSBaseSubmitEditor</name>
<message>
- <location filename="../../../src/plugins/vcsbase/vcsbasesubmiteditor.cpp" line="+141"/>
+ <location filename="../../../src/plugins/vcsbase/vcsbasesubmiteditor.cpp" line="+142"/>
<source>Check message</source>
<translation>Проверие Ñообщение</translation>
</message>
@@ -20853,51 +22403,6 @@ The following encodings are likely to fit:</source>
<translation>Скрипт проверки вернул код %1.</translation>
</message>
</context>
-<context>
- <name>VCSBaseSettingsPage</name>
- <message>
- <location filename="../../../src/plugins/vcsbase/vcsbasesettingspage.ui"/>
- <source>Wrap submit message at:</source>
- <translation>Ограничить длину Ñтроки до:</translation>
- </message>
- <message>
- <location/>
- <source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source>
- <translation>Программа, которой передаётÑÑ Ñ„Ð°Ð¹Ð» ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ фикÑации в качеÑтве первого аргумента. Она должна завершитьÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ неравным нулю и Ñообщением в Ñтандартный поток ошибок в Ñлучае Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¸.</translation>
- </message>
- <message>
- <location/>
- <source>Submit message check script:</source>
- <translation>Скрипт проверки Ñообщений:</translation>
- </message>
- <message>
- <location/>
- <source>A file listing user names and email addresses in a 4-column mailmap format:
-name <email> alias <email></source>
- <translation>Файл ÑпиÑка пользователей и их email в 4-Ñ… Ñтолбцовом формате mailmap:
-Ð¸Ð¼Ñ <email> Ð°Ð»Ð¸Ð°Ñ <email></translation>
- </message>
- <message>
- <location/>
- <source>User/alias configuration file:</source>
- <translation>Файл наÑтройки пользователей:</translation>
- </message>
- <message>
- <location/>
- <source>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</source>
- <translation>ПроÑтой файл, Ñодержащий Ñтроки типа "Reviewed-By:", которые будут добавлены ниже редактора ÑообщениÑ.</translation>
- </message>
- <message>
- <location/>
- <source>User fields configuration file:</source>
- <translation>Файл наÑтройки полей:</translation>
- </message>
- <message>
- <location/>
- <source> characters</source>
- <translation> Ñимвола(ов)</translation>
- </message>
-</context>
<context>
<name>VCSManager</name>
<message>
@@ -20943,23 +22448,18 @@ Note: This might remove the local file.</source>
<message>
<location/>
<source>Patch 1</source>
- <translation>Patch 1</translation>
+ <translation></translation>
</message>
<message>
<location/>
<source>Patch 2</source>
- <translation>Patch 2</translation>
+ <translation></translation>
</message>
<message>
<location/>
<source>Protocol:</source>
<translation>Протокол:</translation>
</message>
- <message>
- <location/>
- <source>Parts to send to server</source>
- <translation>ЧаÑти Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ на Ñервер</translation>
- </message>
<message>
<location/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
@@ -20973,13 +22473,60 @@ p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">&lt;Комментарий&gt;</span></p></body></html></translation>
</message>
+ <message>
+ <location/>
+ <source>Parts to Send to Server</source>
+ <translation>ЧаÑти Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ на Ñервер</translation>
+ </message>
+</context>
+<context>
+ <name>Visibility</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/Visibility.qml" line="+6"/>
+ <location line="+9"/>
+ <source>Visibility</source>
+ <translation type="unfinished">ВидимоÑÑ‚ÑŒ</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Is visible</source>
+ <translation type="unfinished">Виден</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Clip</source>
+ <translation type="unfinished">Обрезка</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Opacity</source>
+ <translation type="unfinished">ÐепрозрачноÑÑ‚ÑŒ</translation>
+ </message>
+</context>
+<context>
+ <name>WebViewSpecifics</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml" line="+18"/>
+ <source>WebView</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Preferred Width</source>
+ <translation type="unfinished">Ð–ÐµÐ»Ð°ÐµÐ¼Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð°</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Page Height</source>
+ <translation type="unfinished">Ð’Ñ‹Ñота Ñтраницы</translation>
+ </message>
</context>
<context>
<name>Welcome::Internal::CommunityWelcomePage</name>
<message>
<location filename="../../../src/plugins/welcome/communitywelcomepage.h" line="+49"/>
- <source>Community</source>
- <translation>СообщеÑтво</translation>
+ <source>News && Support</source>
+ <translation>ÐовоÑти и поддержка</translation>
</message>
</context>
<context>
@@ -20990,70 +22537,65 @@ p, li { white-space: pre-wrap; }
<translation>Форма</translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+48"/>
+ <location/>
<source>News From the Qt Labs</source>
<translation>ÐовоÑти от Qt Labs</translation>
</message>
<message>
- <location line="+1"/>
- <source>Qt Websites</source>
- <translation>Ð’ÑбÑайты Qt</translation>
+ <location/>
+ <source>Qt Support Sites</source>
+ <translation>Сайты поддержки Qt</translation>
</message>
<message>
- <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>
+ <location/>
+ <source>Qt Links</source>
+ <translation>СÑылки Qt</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+46"/>
+ <source><b>Forum Nokia</b><br /><font color='gray'>Mobile Application Support</font></source>
+ <translation><b>Форум Nokia</b><br /><font color='gray'>Поддержка по мобильным приложениÑм</font></translation>
</message>
<message>
<location line="+3"/>
- <source>Qt Home</source>
- <translation>ДомашнÑÑ Ñтраница Qt</translation>
+ <source><b>Qt LGPL Support</b><br /><font color='gray'>Buy commercial Qt support</font></source>
+ <translation><b>Поддержка Qt LGPL</b><br /><font color='gray'>Купить коммерчеÑкую поддержку Qt</font></translation>
</message>
<message>
- <location line="+1"/>
- <source>Qt Labs</source>
- <translation>Qt Labs</translation>
+ <location line="+3"/>
+ <source><b>Qt Centre</b><br /><font color='gray'>Community based Qt support</font></source>
+ <translation><b>Центр Qt</b><br /><font color='gray'>Поддержка Qt Ñилами ÑообщеÑтва</font></translation>
</message>
<message>
- <location line="+1"/>
- <source>Qt Git Hosting</source>
- <translation>Размещение хранилищ Qt</translation>
+ <location line="+6"/>
+ <source><b>Qt Home</b><br /><font color='gray'>Qt by Nokia on the web</font></source>
+ <translation><b>ДомашнÑÑ Ñтраница Qt</b><br /><font color='gray'>Qt от Nokia в Ñети</font></translation>
</message>
<message>
- <location line="+1"/>
- <source>Qt Centre</source>
- <translation>Qt Centre</translation>
+ <location line="+3"/>
+ <source><b>Qt Git Hosting</b><br /><font color='gray'>Participate in Qt development</font></source>
+ <translation><b>Размещение Git хранилищ Qt</b><br /><font color='gray'>УчаÑтие в разработке Qt</font></translation>
</message>
<message>
- <location line="+1"/>
- <source>Qt Apps</source>
- <translation>Qt Apps</translation>
+ <location line="+3"/>
+ <source><b>Qt Apps</b><br /><font color='gray'>Find free Qt-based apps</font></source>
+ <translation><b>ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt</b><br /><font color='gray'>ПоиÑк Ñвободных приложений на оÑнове Qt</font></translation>
</message>
<message>
- <location line="+1"/>
- <source>Qt for Symbian at Forum Nokia</source>
- <translation>Qt Ð´Ð»Ñ Symbian на форуме Nokia</translation>
+ <location line="+34"/>
+ <source>http://labs.trolltech.com/blogs/feed</source>
+ <translation>http://labs.trolltech.com/blogs/feed</translation>
</message>
</context>
<context>
<name>Welcome::WelcomeMode</name>
<message>
- <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+109"/>
+ <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+128"/>
<source>Welcome</source>
<translation>Ðачало</translation>
</message>
<message>
<location filename="../../../src/plugins/welcome/welcomemode.ui"/>
- <source>#gradientWidget {
- background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
-}</source>
- <translation>#gradientWidget {
- background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
-}</translation>
- </message>
- <message>
- <location/>
<source>#headerFrame {
border-image: url(:/welcome/images/center_frame_header.png) 0;
border-width: 0;
@@ -21089,7 +22631,7 @@ p, li { white-space: pre-wrap; }
<translation>Ðе модуль QmlDesigner.</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/pluginmanager/widgetpluginpath.cpp" line="-133"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp" line="-133"/>
<source>Failed to create instance of file '%1': %2</source>
<translation>Ðе удалоÑÑŒ Ñоздать ÑкземплÑÑ€ файла "%1": %2</translation>
</message>
@@ -21104,6 +22646,14 @@ p, li { white-space: pre-wrap; }
<translation>Файл "%1" не ÑвлÑетÑÑ Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¼ QmlDesigner.</translation>
</message>
</context>
+<context>
+ <name>emptyPane</name>
+ <message>
+ <location filename="../qmldesigner/propertyeditor/Qt/emptyPane.qml" line="+38"/>
+ <source>none or multiple items selected</source>
+ <translation type="unfinished">ничего не выбрано или выбрано неÑколько Ñлементов</translation>
+ </message>
+</context>
<context>
<name>mainClass</name>
<message>
@@ -21269,7 +22819,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>trk::Launcher</name>
<message>
- <location filename="../../../src/shared/symbianutils/launcher.cpp" line="+492"/>
+ <location filename="../../../src/shared/symbianutils/launcher.cpp" line="+506"/>
<source>Cannot open remote file '%1': %2</source>
<translation>Ðевозможно открыть внешний файл "%1": %2</translation>
</message>
@@ -21354,609 +22904,4 @@ p, li { white-space: pre-wrap; }
<translation>Подключение к %1...</translation>
</message>
</context>
-<context>
- <name>MaemoSshConfigDialog</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.ui"/>
- <source>SSH Key Configuration</source>
- <translation>ÐаÑтройка ключа SSH</translation>
- </message>
- <message>
- <location/>
- <source>Use key from location:</source>
- <translation>ИÑпользовать внешний ключ:</translation>
- </message>
- <message>
- <location/>
- <source>Private key file:</source>
- <translation>Файл Ñекретного ключа:</translation>
- </message>
- <message>
- <location/>
- <source>Generate SSH Key</source>
- <translation>Создать ключ SSH</translation>
- </message>
- <message>
- <location/>
- <source>Deploy Public Key</source>
- <translation type="unfinished">УÑтановить открытый</translation>
- </message>
- <message>
- <location/>
- <source>Close</source>
- <translation>Закрыть</translation>
- </message>
-</context>
-<context>
- <name>BorderImageSpecifics</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml" line="+17"/>
- <source>Image</source>
- <translation>Изображение</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Source</source>
- <translation type="unfinished">ИÑточник</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Source Size</source>
- <translation type="unfinished">Размер иÑточника</translation>
- </message>
- <message>
- <location line="+35"/>
- <source>Left</source>
- <translation type="unfinished">Левый</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Right</source>
- <translation type="unfinished">Правый</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Top</source>
- <translation type="unfinished">Верхний</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Bottom</source>
- <translation type="unfinished">Ðижний</translation>
- </message>
-</context>
-<context>
- <name>ExpressionEditor</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/ExpressionEditor.qml" line="+51"/>
- <source>Expression</source>
- <translation>Выражение</translation>
- </message>
-</context>
-<context>
- <name>Extended</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/Extended.qml" line="+5"/>
- <source>Effect</source>
- <translation>Ðффект</translation>
- </message>
- <message>
- <location line="+71"/>
- <location line="+70"/>
- <source>Blur Radius:</source>
- <translation type="unfinished">Ð Ð°Ð´Ð¸ÑƒÑ Ñ€Ð°Ð·Ð¼Ð°Ð·Ñ‹Ð²Ð°Ð½Ð¸Ñ:</translation>
- </message>
- <message>
- <location line="-18"/>
- <source>Pixel Size:</source>
- <translation>Размер пикÑелÑ:</translation>
- </message>
- <message>
- <location line="+41"/>
- <source>x Offset: </source>
- <translation type="unfinished">Смещение по x: </translation>
- </message>
- <message>
- <location line="+11"/>
- <source>y Offset: </source>
- <translation type="unfinished">Смещение по y: </translation>
- </message>
-</context>
-<context>
- <name>ExtendedFunctionButton</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml" line="+64"/>
- <source>Reset</source>
- <translation>СброÑить</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Set Expression</source>
- <translation type="unfinished">УÑтановить выражение</translation>
- </message>
-</context>
-<context>
- <name>FontGroupBox</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/FontGroupBox.qml" line="+6"/>
- <location line="+9"/>
- <source>Font</source>
- <translation>Шрифт</translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Size</source>
- <translation>Размер</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Font Style</source>
- <translation>Ðачертание</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Bold</source>
- <translation>Жирный</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Italic</source>
- <translation>КурÑив</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Style</source>
- <translation type="unfinished">Стиль</translation>
- </message>
-</context>
-<context>
- <name>Geometry</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/Geometry.qml" line="+8"/>
- <source>Geometry</source>
- <translation>ГеометриÑ</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Position</source>
- <translation>Положение</translation>
- </message>
- <message>
- <location line="+39"/>
- <source>Size</source>
- <translation>Размер</translation>
- </message>
-</context>
-<context>
- <name>ImageSpecifics</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/ImageSpecifics.qml" line="+20"/>
- <source>Image</source>
- <translation>Изображение</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Source</source>
- <translation type="unfinished">ИÑточник</translation>
- </message>
- <message>
- <location line="+19"/>
- <source>Fill Mode</source>
- <translation type="unfinished">Режим заливки</translation>
- </message>
- <message>
- <location line="+18"/>
- <source>Aliasing</source>
- <translation type="unfinished">СтупенчатоÑÑ‚ÑŒ</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Smooth</source>
- <translation type="unfinished">Гладкий</translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Source Size</source>
- <translation type="unfinished">Размер иÑточника</translation>
- </message>
- <message>
- <location line="+35"/>
- <source>Painted Size</source>
- <translation type="unfinished">Размер риÑованиÑ</translation>
- </message>
-</context>
-<context>
- <name>Layout</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/Layout.qml" line="+7"/>
- <source>Layout</source>
- <translation type="unfinished">Компоновка</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Anchors</source>
- <translation type="unfinished">ПривÑзки</translation>
- </message>
- <message>
- <location line="+32"/>
- <location line="+49"/>
- <location line="+48"/>
- <location line="+47"/>
- <location line="+47"/>
- <location line="+47"/>
- <source>Target</source>
- <translation type="unfinished">Цель</translation>
- </message>
- <message>
- <location line="-220"/>
- <location line="+48"/>
- <location line="+47"/>
- <location line="+47"/>
- <location line="+47"/>
- <location line="+47"/>
- <source>Margin</source>
- <translation type="unfinished">ОтÑтуп</translation>
- </message>
-</context>
-<context>
- <name>Modifiers</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/Modifiers.qml" line="+6"/>
- <source>Manipulation</source>
- <translation>Управление</translation>
- </message>
- <message>
- <location line="+118"/>
- <source>Rotation</source>
- <translation>Вращение</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>z</source>
- <translation></translation>
- </message>
-</context>
-<context>
- <name>RectangleColorGroupBox</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml" line="+7"/>
- <source>Colors</source>
- <translation>Цвета</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Rectangle</source>
- <translation>ПрÑмоугольник</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Border</source>
- <translation>Рамка</translation>
- </message>
-</context>
-<context>
- <name>RectangleSpecifics</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml" line="+20"/>
- <source>Rectangle</source>
- <translation>ПрÑмоугольник</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Radius</source>
- <translation>РадиуÑ</translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Border</source>
- <translation>Рамка</translation>
- </message>
-</context>
-<context>
- <name>StandardTextColorGroupBox</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml" line="+11"/>
- <source>Color</source>
- <translation>Цвет</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Text</source>
- <translation>ТекÑÑ‚</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Style</source>
- <translation>Стиль</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Selection</source>
- <translation>Выделение</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Selected</source>
- <translation>Выделено</translation>
- </message>
-</context>
-<context>
- <name>StandardTextGroupBox</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml" line="+7"/>
- <location line="+10"/>
- <source>Text</source>
- <translation>ТекÑÑ‚</translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Is Wrapping</source>
- <translation type="unfinished">ПереноÑитÑÑ</translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Alignment</source>
- <translation>Выравнивание</translation>
- </message>
-</context>
-<context>
- <name>Switches</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/Switches.qml" line="+38"/>
- <source>layout and geometry</source>
- <translation type="unfinished">компоновка и геометриÑ</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Geometry</source>
- <translation>ГеометриÑ</translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Advanced</source>
- <translation type="unfinished">Дополнительно</translation>
- </message>
-</context>
-<context>
- <name>TextEditSpecifics</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml" line="+25"/>
- <source>Text Edit</source>
- <translation>ТекÑтовый редактор</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Format</source>
- <translation>Формат</translation>
- </message>
-</context>
-<context>
- <name>TextInputGroupBox</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml" line="+7"/>
- <source>Text Input</source>
- <translation type="unfinished">ТекÑтовый ввод</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Flags</source>
- <translation>Флаги</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Read Only</source>
- <translation>Только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ</translation>
- </message>
- <message>
- <location line="+18"/>
- <source>Cursor Visible</source>
- <translation type="unfinished">КурÑор виден</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Focus On Press</source>
- <translation type="unfinished">Выбирать при нажатии</translation>
- </message>
-</context>
-<context>
- <name>Transformation</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/Transformation.qml" line="+6"/>
- <source>Transformation</source>
- <translation type="unfinished">Преобразование</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Origin</source>
- <translation type="unfinished">Ðачало</translation>
- </message>
- <message>
- <location line="+23"/>
- <source>Scale</source>
- <translation type="unfinished">МаÑштаб</translation>
- </message>
- <message>
- <location line="+32"/>
- <source>Rotation</source>
- <translation type="unfinished">Вращение</translation>
- </message>
-</context>
-<context>
- <name>Type</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/Type.qml" line="+7"/>
- <location line="+7"/>
- <source>Type</source>
- <translation>Тип</translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Id</source>
- <translation type="unfinished">Id</translation>
- </message>
-</context>
-<context>
- <name>Visibility</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/Visibility.qml" line="+6"/>
- <location line="+9"/>
- <source>Visibility</source>
- <translation>ВидимоÑÑ‚ÑŒ</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Is visible</source>
- <translation type="unfinished">Виден</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Clip</source>
- <translation type="unfinished">Обрезка</translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Opacity</source>
- <translation type="unfinished">ÐепрозрачноÑÑ‚ÑŒ</translation>
- </message>
-</context>
-<context>
- <name>WebViewSpecifics</name>
- <message>
- <location filename="../qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml" line="+18"/>
- <source>WebView</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+21"/>
- <source>Preferred Width</source>
- <translation type="unfinished">Ð–ÐµÐ»Ð°ÐµÐ¼Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð°</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Page Height</source>
- <translation type="unfinished">Ð’Ñ‹Ñота Ñтраницы</translation>
- </message>
-</context>
-<context>
- <name>GdbChooserWidget</name>
- <message>
- <location filename="../../../src/plugins/debugger/gdb/gdbchooserwidget.cpp" line="+106"/>
- <source>Unable to run '%1': %2</source>
- <translation>Ðе удалоÑÑŒ запуÑтить "%1": %2</translation>
- </message>
-</context>
-<context>
- <name>Debugger::Internal::GdbChooserWidget</name>
- <message>
- <location line="+43"/>
- <source>Binary</source>
- <translation>Программа</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Toolchains</source>
- <translation>ИнÑтрументарий</translation>
- </message>
- <message>
- <location line="+186"/>
- <source>Duplicate binary</source>
- <translation type="unfinished">Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>The binary '%1' already exists.</source>
- <translation type="unfinished">Программа "%1" уже приÑутÑтвует.</translation>
- </message>
-</context>
-<context>
- <name>Debugger::Internal::ToolChainSelectorWidget</name>
- <message>
- <location line="+83"/>
- <source>Desktop/General</source>
- <translation type="unfinished">ÐаÑтольный/Стандартный</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Symbian</source>
- <translation></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Maemo</source>
- <translation></translation>
- </message>
-</context>
-<context>
- <name>Debugger::Internal::BinaryToolChainDialog</name>
- <message>
- <location line="+101"/>
- <source>Select binary and toolchains</source>
- <translation type="unfinished">Выбор программы и инÑтрументариÑ</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Gdb binary</source>
- <translation type="unfinished">Программа gdb</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Path:</source>
- <translation>Путь:</translation>
- </message>
-</context>
-<context>
- <name>QmlDesigner::ComponentView</name>
- <message>
- <location filename="../../../src/plugins/qmldesigner/components/integration/componentview.cpp" line="+75"/>
- <source>whole document</source>
- <translation>документ полноÑтью</translation>
- </message>
-</context>
-<context>
- <name>FileWidget</name>
- <message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp" line="+102"/>
- <source>Open File</source>
- <translation>Открытие файла</translation>
- </message>
-</context>
-<context>
- <name>Qt Quick</name>
- <message>
- <location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+10"/>
- <source>Qt Quick</source>
- <translation></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoPackageCreationWidget</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp" line="+69"/>
- <source>Package Creation</source>
- <translation>Создание пакета</translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::MaemoSshConfigDialog</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.cpp" line="+93"/>
- <source>Stop deploying</source>
- <translation>Прекратить уÑтановку</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Key deployment failed: %1</source>
- <translation>Ðе удалоÑÑŒ уÑтановить ключ: %1</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Key was successfully deployed.</source>
- <translation>Ключ уÑпешно уÑтановлен.</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Deploy Public Key</source>
- <translation type="unfinished">УÑтановить открытый</translation>
- </message>
-</context>
</TS>
diff --git a/src/app/main.cpp b/src/app/main.cpp
index af205c30fbdcf36979c4a9c4f35147d647f674e2..efbbd311deb7bda77f59331cc9d88179b61afe5e 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -173,7 +173,8 @@ int main(int argc, char **argv)
// increase the number of file that can be opened in Qt Creator.
struct rlimit rl;
getrlimit(RLIMIT_NOFILE, &rl);
- rl.rlim_cur = rl.rlim_max;
+
+ rl.rlim_cur = qMin((rlim_t)OPEN_MAX, rl.rlim_max);
setrlimit(RLIMIT_NOFILE, &rl);
#endif
diff --git a/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp b/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp
index 0663301200bd112aca591445cb9f361581521bf9..61d325634eb0243251c9aeb2da2808ef56c882be 100644
--- a/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp
+++ b/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp
@@ -108,10 +108,11 @@ bool Ne7sshSftp::handleData (Botan::SecureVector<Botan::byte>& packet)
commBuffer.addVector (sftpBuffer);
mainBuffer.addVector (sftpBuffer);
- len = mainBuffer.getInt();
+ if (mainBuffer.length() < sizeof(uint32)
+ || mainBuffer.getInt() > mainBuffer.length())
+ return true;
- if (len > mainBuffer.length()) return true;
- else commBuffer.clear();
+ commBuffer.clear();
_cmd = mainBuffer.getByte();
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index 76a77ac395460cc095865d7c5a68543e4d6f112b..a32cd10c9fc4309d0940e80458261d72868f84e2 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -1494,6 +1494,20 @@ void Context::setProperty(const ObjectValue *object, const QString &name, const
_properties[object].insert(name, value);
}
+QString Context::defaultPropertyName(const ObjectValue *object)
+{
+ for (const ObjectValue *o = object; o; o = o->prototype(this)) {
+ if (const ASTObjectValue *astObjValue = dynamic_cast<const ASTObjectValue *>(o)) {
+ QString defaultProperty = astObjValue->defaultPropertyName();
+ if (!defaultProperty.isEmpty())
+ return defaultProperty;
+ } else if (const QmlObjectValue *qmlValue = dynamic_cast<const QmlObjectValue *>(o)) {
+ return qmlValue->defaultPropertyName();
+ }
+ }
+ return QString();
+}
+
bool Context::documentImportsPlugins(const QmlJS::Document *doc) const
{
return _documentsImportingPlugins.contains(doc->fileName());
@@ -2800,7 +2814,7 @@ ASTObjectValue::ASTObjectValue(UiQualifiedId *typeName,
UiObjectInitializer *initializer,
const QmlJS::Document *doc,
Engine *engine)
- : ObjectValue(engine), _typeName(typeName), _initializer(initializer), _doc(doc)
+ : ObjectValue(engine), _typeName(typeName), _initializer(initializer), _doc(doc), _defaultPropertyRef(0)
{
if (_initializer) {
for (UiObjectMemberList *it = _initializer->members; it; it = it->next) {
@@ -2809,6 +2823,8 @@ ASTObjectValue::ASTObjectValue(UiQualifiedId *typeName,
if (def->type == UiPublicMember::Property && def->name && def->memberType) {
ASTPropertyReference *ref = new ASTPropertyReference(def, _doc, engine);
_properties.append(ref);
+ if (def->defaultToken.isValid())
+ _defaultPropertyRef = ref;
} else if (def->type == UiPublicMember::Signal && def->name) {
ASTSignalReference *ref = new ASTSignalReference(def, _doc, engine);
_signals.append(ref);
@@ -2846,6 +2862,16 @@ void ASTObjectValue::processMembers(MemberProcessor *processor) const
ObjectValue::processMembers(processor);
}
+QString ASTObjectValue::defaultPropertyName() const
+{
+ if (_defaultPropertyRef) {
+ UiPublicMember *prop = _defaultPropertyRef->ast();
+ if (prop && prop->name)
+ return prop->name->asString();
+ }
+ return QString();
+}
+
ASTVariableReference::ASTVariableReference(VariableDeclaration *ast, Engine *engine)
: Reference(engine), _ast(ast)
{
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index ba2ee534ab78f43c4aeea7a0309240b10779c485..50254fda99c696047ba60641cec1b50df3fb899b 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -297,6 +297,8 @@ public:
const Value *property(const ObjectValue *object, const QString &name) const;
void setProperty(const ObjectValue *object, const QString &name, const Value *value);
+ QString defaultPropertyName(const ObjectValue *object);
+
bool documentImportsPlugins(const Document *doc) const;
void setDocumentImportsPlugins(const Document *doc);
@@ -817,6 +819,7 @@ class QMLJS_EXPORT ASTObjectValue: public ObjectValue
const Document *_doc;
QList<ASTPropertyReference *> _properties;
QList<ASTSignalReference *> _signals;
+ ASTPropertyReference *_defaultPropertyRef;
public:
ASTObjectValue(AST::UiQualifiedId *typeName,
@@ -827,6 +830,8 @@ public:
bool getSourceLocation(QString *fileName, int *line, int *column) const;
virtual void processMembers(MemberProcessor *processor) const;
+
+ QString defaultPropertyName() const;
};
} } // end of namespace QmlJS::Interpreter
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 6c8bfc9bdde47514a12aefae7da535b6eb81e5f4..1d6c2900a4efce5d048fd36a81c1203cc492de8f 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -275,7 +275,9 @@ public:
if (type == TypePermissions) {
emit changed();
} else {
- open(m_fileName);
+ emit aboutToReload();
+ if (open(m_fileName))
+ emit reloaded();
}
}
diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h
index efa2211dd305803b05ff9ccbec588911cb7b938f..aeb800a8b9f52405b7ff6fe529a62a6b5a792369 100644
--- a/src/plugins/bookmarks/bookmark.h
+++ b/src/plugins/bookmarks/bookmark.h
@@ -48,7 +48,7 @@ class Bookmark : public TextEditor::BaseTextMark
{
Q_OBJECT
public:
- Bookmark(const QString& fileName, int lineNumber, BookmarkManager *manager);
+ Bookmark(const QString &fileName, int lineNumber, BookmarkManager *manager);
QIcon icon() const;
diff --git a/src/plugins/coreplugin/ifile.h b/src/plugins/coreplugin/ifile.h
index 42da335a92a7344a671f671d778369d98ff3f1c5..6042ee51994d0430f638ca2286e975c747aaa3a1 100644
--- a/src/plugins/coreplugin/ifile.h
+++ b/src/plugins/coreplugin/ifile.h
@@ -93,6 +93,9 @@ public:
signals:
void changed();
+
+ void aboutToReload();
+ void reloaded();
};
} // namespace Core
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index bd4754c2aa17e193ac730fbcc571cf7e714cd6b0..4135d0b6ccdc5af8d708e160009f185006c96bd7 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -221,23 +221,24 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
}
}
+ if (m_helpEngineNeedsSetup
+ && m_helpEngine->registeredDocumentations().count() > 0) {
+ m_helpEngine->setupData();
+ m_helpEngineNeedsSetup = false;
+ }
+ QMap<QString, QUrl> helpLinks;
+
if (m_toolTip.isEmpty()) {
foreach (const Document::Include &incl, doc->includes()) {
if (incl.line() == lineNumber) {
m_toolTip = QDir::toNativeSeparators(incl.fileName());
m_helpId = QFileInfo(incl.fileName()).fileName();
+ helpLinks = m_helpEngine->linksForIdentifier(m_helpId);
break;
}
}
}
- if (m_helpEngineNeedsSetup
- && m_helpEngine->registeredDocumentations().count() > 0) {
- m_helpEngine->setupData();
- m_helpEngineNeedsSetup = false;
- }
-
- QMap<QString, QUrl> helpLinks;
if (m_helpId.isEmpty()) {
// Move to the end of a qualified name
bool stop = false;
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 8a3f2e150fecab8d74ee1a69898c7dcfa38509d7..76f522580c83f60442f68adc7662e0c5ca708e81 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -1078,8 +1078,11 @@ void DebuggerManager::startNewDebugger(const DebuggerStartParametersPtr &sp)
const unsigned engineCapabilities = d->m_engine->debuggerCapabilities();
theDebuggerAction(OperateByInstruction)
->setEnabled(engineCapabilities & DisassemblerCapability);
- d->m_actions.reverseDirectionAction
- ->setEnabled(engineCapabilities & ReverseSteppingCapability);
+
+ const bool canReverse = (engineCapabilities & ReverseSteppingCapability)
+ && theDebuggerBoolSetting(EnableReverseDebugging);
+ d->m_actions.reverseDirectionAction->setChecked(false);
+ d->m_actions.reverseDirectionAction->setEnabled(canReverse);
}
void DebuggerManager::startFailed()
@@ -1101,6 +1104,7 @@ void DebuggerManager::cleanupViews()
d->m_sourceFilesWindow->removeAll();
d->m_disassemblerViewAgent.cleanup();
d->m_actions.reverseDirectionAction->setChecked(false);
+ d->m_actions.reverseDirectionAction->setEnabled(false);
hideDebuggerToolTip();
// FIXME: Move to plugin?
diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp
index e65499686e2f551fc022eec9165a23c0ee534587..df75bc9a4b82786f17dc04c65280746de02abbbb 100644
--- a/src/plugins/debugger/debuggeroutputwindow.cpp
+++ b/src/plugins/debugger/debuggeroutputwindow.cpp
@@ -335,6 +335,9 @@ public slots:
QString needle2 = QLatin1Char('>') + needle;
QTextCursor cursor(document());
do {
+ cursor = document()->find(needle, cursor);
+ if (cursor.isNull())
+ break; // Not found.
const QString line = cursor.block().text();
if (line.startsWith(needle) || line.startsWith(needle2)) {
setFocus();
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 275771a22d5c7ff60c60a598a9e2241c4a32dddf..0ef2503bc3ad3de79edbd7a9bac16056932f9727 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1539,8 +1539,8 @@ void DebuggerPlugin::enableReverseDebuggingTriggered(const QVariant &value)
{
QTC_ASSERT(m_reverseToolButton, return);
m_reverseToolButton->setVisible(value.toBool());
- if (!value.toBool())
- m_manager->debuggerManagerActions().reverseDirectionAction->setChecked(false);
+ m_manager->debuggerManagerActions().reverseDirectionAction->setChecked(false);
+ m_manager->debuggerManagerActions().reverseDirectionAction->setEnabled(value.toBool());
}
void DebuggerPlugin::toggleBreakpoint()
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 309f1c656b308900e1d34be29de4b644269a3654..c5fb4b3c76cbe3c673632fa528e2015deecc2c7f 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1892,6 +1892,7 @@ void GdbEngine::executeStepI()
void GdbEngine::executeStepOut()
{
QTC_ASSERT(state() == InferiorStopped, qDebug() << state());
+ postCommand("-stack-select-frame 0");
setTokenBarrier();
setState(InferiorRunningRequested);
showStatusMessage(tr("Finish function requested..."), 5000);
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 51e45335f0a8b712c14b7357f0138cf98fafa4f0..7ac310084526e1990cc7d588001b652b337fe3d2 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -281,6 +281,15 @@ void FormEditorW::fullInit()
initDesignerSubWindows();
m_integration = new QtCreatorIntegration(m_formeditor, this);
m_formeditor->setIntegration(m_integration);
+ // Connect Qt Designer help request to HelpManager.
+ // TODO: Use Core::HelpManager once it has been introduced.
+ foreach(QObject *object, ExtensionSystem::PluginManager::instance()->allObjects()) {
+ if (!qstrcmp(object->metaObject()->className(), "Help::HelpManager")) {
+ connect(m_integration, SIGNAL(creatorHelpRequested(QString)),
+ object, SLOT(handleHelpRequest(QString)));
+ break;
+ }
+ }
/**
* This will initialize our TabOrder, Signals and slots and Buddy editors.
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index ce5594e2fe99195d102b89fa6df58c94cda7ce95..e176010a7af8c04488324b82e4b13db434500f53 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -142,7 +142,9 @@ void FormWindowFile::reload(ReloadFlag flag, ChangeType type)
if (type == TypePermissions) {
emit changed();
} else {
+ emit aboutToReload();
emit reload(m_fileName);
+ emit reloaded();
}
}
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 13182575d9cc4168aa1fc3fb6b58640beae18c9b..18f5b19916eb4655e2652e1d33241aa1ffb5990c 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -94,6 +94,14 @@ QtCreatorIntegration::QtCreatorIntegration(QDesignerFormEditorInterface *core, F
setSlotNavigationEnabled(true);
connect(this, SIGNAL(navigateToSlot(QString, QString, QStringList)),
this, SLOT(slotNavigateToSlot(QString, QString, QStringList)));
+ connect(this, SIGNAL(helpRequested(QString,QString)),
+ this, SLOT(slotDesignerHelpRequested(QString,QString)));
+}
+
+void QtCreatorIntegration::slotDesignerHelpRequested(const QString &manual, const QString &document)
+{
+ // Pass on as URL.
+ emit creatorHelpRequested(QString::fromLatin1("qthelp://com.trolltech.%1/qdoc/%2").arg(manual, document));
}
void QtCreatorIntegration::updateSelection()
diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h
index 138858286fd110dc3dcb58cf3bf13e73e5346046..c667ea8504de9ccf59f1d749af1a2dff9fb109e6 100644
--- a/src/plugins/designer/qtcreatorintegration.h
+++ b/src/plugins/designer/qtcreatorintegration.h
@@ -46,12 +46,18 @@ public:
QWidget *containerWindow(QWidget *widget) const;
- bool supportsToSlotNavigation() { return true; };
+ bool supportsToSlotNavigation() { return true; }
+
+signals:
+ void creatorHelpRequested(const QString &url);
public slots:
void updateSelection();
+
private slots:
void slotNavigateToSlot(const QString &objectName, const QString &signalSignature, const QStringList ¶meterNames);
+ void slotDesignerHelpRequested(const QString &manual, const QString &document);
+
private:
bool navigateToSlot(const QString &objectName,
const QString &signalSignature,
diff --git a/src/plugins/help/helpmanager.h b/src/plugins/help/helpmanager.h
index 39f2c939ea1042435b0afaba44d12dbaf33a629c..18a36bcd08af90fa0ab0370a68d66ded1da187d9 100644
--- a/src/plugins/help/helpmanager.h
+++ b/src/plugins/help/helpmanager.h
@@ -57,8 +57,6 @@ public:
void setupGuiHelpEngine();
bool guiEngineNeedsUpdate() const;
- void handleHelpRequest(const QString &url);
-
void verifyDocumenation();
void registerDocumentation(const QStringList &fileNames);
void unregisterDocumentation(const QStringList &nameSpaces);
@@ -69,6 +67,9 @@ public:
static BookmarkManager& bookmarkManager();
+public slots:
+ void handleHelpRequest(const QString &url);
+
signals:
void helpRequested(const QUrl &url);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 58e942904ce6400e3cff9586514893368bfe6f5e..7f55ddd0d5c236afaca4c17b11b0273499732cc0 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -852,8 +852,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url)
// local help not installed, resort to external web help
QString urlPrefix = QLatin1String("http://doc.trolltech.com/");
if (url.authority() == QLatin1String("com.nokia.qtcreator")) {
- urlPrefix.append(QString::fromLatin1("qtcreator-%1.%2")
- .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));
+ urlPrefix.append(QString::fromLatin1("qtcreator"));
} else {
urlPrefix.append(QLatin1String("latest"));
}
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 156d5ce9f8fdcc2318b33179812838df5862559f..c8bbb792ed5df86389b85071f81b3374fdd81593 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -35,21 +35,28 @@ SUBDIRS = plugin_coreplugin \
plugin_mercurial \
debugger/dumper.pro
-contains(QT_CONFIG, declarative) {
-
- SUBDIRS += plugin_qmlprojectmanager
-
- include(private_headers.pri)
- exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
- SUBDIRS += plugin_qmldesigner \
- plugin_qmlinspector
- } else {
- warning()
- warning("QmlDesigner and QmlInspector plugins have been disabled")
- warning("The plugins depend on on private headers from QtDeclarative module.")
- warning("To enable them, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
- warning()
- }
+SUPPORT_QT_QML = $$(QTCREATOR_WITH_QML)
+
+!isEmpty(SUPPORT_QT_QML) {
+ message("Adding support for Qt/QML projects.")
+ DEFINES += QTCREATOR_WITH_QML
+
+ contains(QT_CONFIG, declarative) {
+
+ SUBDIRS += plugin_qmlprojectmanager
+
+ include(private_headers.pri)
+ exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
+ SUBDIRS += plugin_qmldesigner \
+ plugin_qmlinspector
+ } else {
+ warning()
+ warning("QmlDesigner and QmlInspector plugins have been disabled")
+ warning("The plugins depend on on private headers from QtDeclarative module.")
+ warning("To enable them, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
+ warning()
+ }
+ }
}
plugin_coreplugin.subdir = coreplugin
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
index 4e0f19c4b5648140e96a1b5ef6a2e99c4b554a0b..ee55ff4edd9a1885d3d47caaefc4c5f7a1fb547c 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
@@ -314,7 +314,7 @@ void DragTool::move(QPointF scenePos)
/* if (event->modifiers().testFlag(Qt::ControlModifier) != view()->isSnapButtonChecked())
useSnapping = MoveManipulator::UseSnapping;*/
- m_moveManipulator.update(scenePos, useSnapping);
+ m_moveManipulator.update(scenePos, useSnapping, MoveManipulator::UseBaseState);
}
diff --git a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
index 0237c40ded1cf921da3b5c1bd9f108eb71b84a14..9385ef83b73d9fcbb0a63becf0eb0f9bddcdc18c 100644
--- a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
@@ -148,7 +148,7 @@ FormEditorItem* ItemCreatorTool::calculateContainer(const QPointF &point)
QList<QGraphicsItem *> list = scene()->items(point);
foreach (QGraphicsItem *item, list) {
FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item);
- if (formEditorItem && formEditorItem->isContainer())
+ if (formEditorItem)
return formEditorItem;
}
return 0;
diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
index 80449c8778d817a30c024089c1d3045a237a4528..b318a3037f2bf7882c8dec054f24fb4bb1f0fa43 100644
--- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
@@ -200,7 +200,7 @@ QList<QRectF> MoveManipulator::tanslatedBoundingRects(const QList<QRectF> &bound
/*
/brief updates the position of the items.
*/
-void MoveManipulator::update(const QPointF& updatePoint, Snapping useSnapping)
+void MoveManipulator::update(const QPointF& updatePoint, Snapping useSnapping, State stateToBeManipulated)
{
deleteSnapLines(); //Since they position is changed and the item is moved the snapping lines are
//are obsolete. The new updated snapping lines (color and visibility) will be
@@ -226,36 +226,41 @@ void MoveManipulator::update(const QPointF& updatePoint, Snapping useSnapping)
foreach (FormEditorItem* item, m_itemList) {
QPointF positionInContainerSpace(m_beginPositionHash.value(item) + offsetVector);
- QmlAnchors anchors(item->qmlItemNode().anchors());
- if (anchors.instanceHasAnchor(AnchorLine::Top)) {
- anchors.setMargin(AnchorLine::Top, m_beginTopMarginHash.value(item) + offsetVector.y());
- }
+ // don't support anchors for base state because it is not needed by the droptool
+ if (stateToBeManipulated == UseActualState) {
+ QmlAnchors anchors(item->qmlItemNode().anchors());
- if (anchors.instanceHasAnchor(AnchorLine::Left)) {
- anchors.setMargin(AnchorLine::Left, m_beginLeftMarginHash.value(item) + offsetVector.x());
- }
+ if (anchors.instanceHasAnchor(AnchorLine::Top)) {
+ anchors.setMargin(AnchorLine::Top, m_beginTopMarginHash.value(item) + offsetVector.y());
+ }
- if (anchors.instanceHasAnchor(AnchorLine::Bottom)) {
- anchors.setMargin(AnchorLine::Bottom, m_beginBottomMarginHash.value(item) - offsetVector.y());
- }
-
- if (anchors.instanceHasAnchor(AnchorLine::Right)) {
- anchors.setMargin(AnchorLine::Right, m_beginRightMarginHash.value(item) - offsetVector.x());
- }
+ if (anchors.instanceHasAnchor(AnchorLine::Left)) {
+ anchors.setMargin(AnchorLine::Left, m_beginLeftMarginHash.value(item) + offsetVector.x());
+ }
- if (anchors.instanceHasAnchor(AnchorLine::HorizontalCenter)) {
- anchors.setMargin(AnchorLine::HorizontalCenter, m_beginHorizontalCenterHash.value(item) + offsetVector.x());
- }
+ if (anchors.instanceHasAnchor(AnchorLine::Bottom)) {
+ anchors.setMargin(AnchorLine::Bottom, m_beginBottomMarginHash.value(item) - offsetVector.y());
+ }
- if (anchors.instanceHasAnchor(AnchorLine::VerticalCenter)) {
- anchors.setMargin(AnchorLine::VerticalCenter, m_beginVerticalCenterHash.value(item) + offsetVector.y());
- }
+ if (anchors.instanceHasAnchor(AnchorLine::Right)) {
+ anchors.setMargin(AnchorLine::Right, m_beginRightMarginHash.value(item) - offsetVector.x());
+ }
- item->qmlItemNode().setPosition(positionInContainerSpace);
- }
+ if (anchors.instanceHasAnchor(AnchorLine::HorizontalCenter)) {
+ anchors.setMargin(AnchorLine::HorizontalCenter, m_beginHorizontalCenterHash.value(item) + offsetVector.x());
+ }
+ if (anchors.instanceHasAnchor(AnchorLine::VerticalCenter)) {
+ anchors.setMargin(AnchorLine::VerticalCenter, m_beginVerticalCenterHash.value(item) + offsetVector.y());
+ }
+ item->qmlItemNode().setPosition(positionInContainerSpace);
+ } else {
+ item->qmlItemNode().modelNode().variantProperty("x").setValue(qRound(positionInContainerSpace.x()));
+ item->qmlItemNode().modelNode().variantProperty("y").setValue(qRound(positionInContainerSpace.y()));
+ }
+ }
}
}
diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.h b/src/plugins/qmldesigner/components/formeditor/movemanipulator.h
index eb6fb221ea613717002d9920717df481f62805dd..976a4e71ac02a92ae61f170f1066403b33b00cc8 100644
--- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.h
+++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.h
@@ -57,13 +57,18 @@ public:
NoSnapping
};
+ enum State {
+ UseActualState,
+ UseBaseState
+ };
+
MoveManipulator(LayerItem *layerItem, FormEditorView *view);
~MoveManipulator();
void setItems(const QList<FormEditorItem*> &itemList);
void setItem(FormEditorItem* item);
void begin(const QPointF& beginPoint);
- void update(const QPointF& updatePoint, Snapping useSnapping);
+ void update(const QPointF& updatePoint, Snapping useSnapping, State stateToBeManipulated = UseActualState);
void reparentTo(FormEditorItem *newParent);
void end(const QPointF& endPoint);
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
index 653c53bd93a0083707dbc3f75ae1f056cf5a4584..5d2aef73b255edc6c7c2d2cc26a0d14ad9852e77 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
@@ -90,12 +90,12 @@ void MoveTool::mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
m_resizeIndicator.hide();
FormEditorItem *containerItem = containerFormEditorItem(itemList, m_movingItems);
- if (containerItem &&
- containerItem != m_movingItems.first()->parentItem() &&
- view()->currentState().isBaseState() &&
- !event->modifiers().testFlag(Qt::ShiftModifier)) {
-
- m_moveManipulator.reparentTo(containerItem);
+ if (containerItem
+ && view()->currentState().isBaseState()) {
+ if (containerItem != m_movingItems.first()->parentItem()
+ && event->modifiers().testFlag(Qt::ShiftModifier)) {
+ m_moveManipulator.reparentTo(containerItem);
+ }
}
bool shouldSnapping = view()->widget()->snappingAction()->isChecked();
@@ -313,9 +313,7 @@ FormEditorItem* MoveTool::containerFormEditorItem(const QList<QGraphicsItem*> &i
if (formEditorItem
&& !selectedItemList.contains(formEditorItem)
&& isNotAncestorOfItemInList(formEditorItem, selectedItemList))
- if (formEditorItem->isContainer()) {
return formEditorItem;
- }
}
diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index cd206cf97e89c006ee54c810b614708095c3ec17..641c1cd5744056e263e7e699df99cda53c3be92e 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -78,7 +78,7 @@ public:
virtual ~Model();
- static Model *create(QString type, int major = 4, int minor = 6);
+ static Model *create(QString type, int major = 4, int minor = 7);
Model *masterModel() const;
void setMasterModel(Model *model);
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index a16740cda0e16a97e4d0b1e9622adce433246ddc..e370dd396d3b0ca14feb20c9bb4d361b24817ef8 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -68,14 +68,16 @@ public:
void clear();
void initialize();
+ void loadPlugins(QDeclarativeEngine *engine);
void parseQmlTypes();
void parseNonQmlTypes();
void parseValueTypes();
- void parseNonQmlClassRecursively(const QMetaObject *qMetaObject, int majorVersion, int minorVersion);
+ void parseNonQmlClassRecursively(const QMetaObject *qMetaObject);
void parseProperties(NodeMetaInfo &nodeMetaInfo, const QMetaObject *qMetaObject) const;
void parseClassInfo(NodeMetaInfo &nodeMetaInfo, const QMetaObject *qMetaObject) const;
- QString typeName(const QMetaObject *qMetaObject) const;
+ QList<QDeclarativeType*> qmlTypes();
+ void typeInfo(const QMetaObject *qMetaObject, QString *typeName, int *majorVersion = 0, int *minorVersion = 0) const;
void parseXmlFiles();
@@ -112,6 +114,7 @@ void MetaInfoPrivate::initialize()
QDeclarativeEngine engine;
Q_UNUSED(engine);
+ loadPlugins(&engine);
parseQmlTypes();
parseNonQmlTypes();
parseXmlFiles();
@@ -120,7 +123,26 @@ void MetaInfoPrivate::initialize()
m_isInitialized = true;
}
+void MetaInfoPrivate::loadPlugins(QDeclarativeEngine *engine)
+{
+ // hack to load plugins
+ QDeclarativeComponent pluginComponent(engine, 0);
+
+ QStringList pluginList;
+ pluginList += "import Qt 4.7";
+ pluginList += "import org.webkit 1.0";
+
+ // load maybe useful plugins
+ pluginList += "import Qt.labs.folderlistmodel 1.0";
+ pluginList += "import Qt.labs.gestures 1.0";
+ pluginList += "import Qt.multimedia 4.7";
+ pluginList += "import Qt.labs.particles 1.0";
+
+ QString componentString = QString("%1\n Item {}\n").arg(pluginList.join("\n"));
+
+ pluginComponent.setData(componentString.toLatin1(), QUrl());
+}
void MetaInfoPrivate::parseProperties(NodeMetaInfo &nodeMetaInfo, const QMetaObject *qMetaObject) const
{
@@ -187,48 +209,83 @@ void MetaInfoPrivate::parseClassInfo(NodeMetaInfo &nodeMetaInfo, const QMetaObje
}
}
-void MetaInfoPrivate::parseNonQmlClassRecursively(const QMetaObject *qMetaObject, int majorVersion, int minorVersion)
+void MetaInfoPrivate::parseNonQmlClassRecursively(const QMetaObject *qMetaObject)
{
Q_ASSERT_X(qMetaObject, Q_FUNC_INFO, "invalid QMetaObject");
- const QString className = qMetaObject->className();
- if (className.isEmpty()) {
+ QString typeName;
+ int majorVersion = -1;
+ int minorVersion = -1;
+ typeInfo(qMetaObject, &typeName, &majorVersion, &minorVersion);
+
+ if (typeName.isEmpty()) {
qWarning() << "Meta type system: Registered class has no name.";
return;
}
- if (!m_q->hasNodeMetaInfo(typeName(qMetaObject), majorVersion, minorVersion)) {
- NodeMetaInfo nodeMetaInfo(*m_q);
- nodeMetaInfo.setType(typeName(qMetaObject), majorVersion, minorVersion);
- parseProperties(nodeMetaInfo, qMetaObject);
- parseClassInfo(nodeMetaInfo, qMetaObject);
+ NodeMetaInfo existingInfo = m_q->nodeMetaInfo(typeName, majorVersion, minorVersion);
+ if (existingInfo.isValid()
+ && existingInfo.majorVersion() == majorVersion
+ && existingInfo.minorVersion() == minorVersion) {
+ return;
+ }
- if (debug)
- qDebug() << "adding non qml type" << nodeMetaInfo.typeName() << nodeMetaInfo.majorVersion() << nodeMetaInfo.minorVersion() << ", parent type" << typeName(qMetaObject->superClass());
- if (qMetaObject->superClass())
- nodeMetaInfo.setSuperClass(typeName(qMetaObject->superClass()));
+ NodeMetaInfo nodeMetaInfo(*m_q);
+ nodeMetaInfo.setType(typeName, majorVersion, minorVersion);
+ parseProperties(nodeMetaInfo, qMetaObject);
+ parseClassInfo(nodeMetaInfo, qMetaObject);
- m_q->addNodeInfo(nodeMetaInfo);
- }
+ QString superTypeName;
+ int superTypeMajorVersion = -1;
+ int superTypeMinorVersion = -1;
- if (const QMetaObject *superClass = qMetaObject->superClass()) {
- parseNonQmlClassRecursively(superClass, majorVersion, minorVersion);
+ if (qMetaObject->superClass()) {
+ typeInfo(qMetaObject->superClass(), &superTypeName, &superTypeMajorVersion, &superTypeMinorVersion);
+ nodeMetaInfo.setSuperClass(superTypeName, superTypeMajorVersion, superTypeMinorVersion);
}
+ if (debug)
+ qDebug() << "adding non qml type" << nodeMetaInfo.typeName() << nodeMetaInfo.majorVersion() << nodeMetaInfo.minorVersion()
+ << ", parent type" << superTypeName << superTypeMajorVersion << superTypeMinorVersion;
+
+ m_q->addNodeInfo(nodeMetaInfo);
+
+ if (const QMetaObject *superClass = qMetaObject->superClass())
+ parseNonQmlClassRecursively(superClass);
}
+QList<QDeclarativeType*> MetaInfoPrivate::qmlTypes()
+{
+ QList<QDeclarativeType*> list;
+ foreach (QDeclarativeType *type, QDeclarativeMetaType::qmlTypes()) {
+ if (!type->qmlTypeName().startsWith("Bauhaus/")
+ && !type->qmlTypeName().startsWith("QmlProject/"))
+ list += type;
+ }
+ return list;
+}
-QString MetaInfoPrivate::typeName(const QMetaObject *qMetaObject) const
+void MetaInfoPrivate::typeInfo(const QMetaObject *qMetaObject, QString *typeName, int *majorVersion, int *minorVersion) const
{
+ Q_ASSERT(typeName);
+
if (!qMetaObject)
- return QString();
- QString className = qMetaObject->className();
- if (QDeclarativeType *qmlType = QDeclarativeMetaType::qmlType(qMetaObject)) {
- QString qmlClassName(qmlType->qmlTypeName());
- if (!qmlClassName.isEmpty())
- className = qmlType->qmlTypeName(); // Ensure that we always use the qml name,
- // if available.
+ return;
+
+ *typeName = qMetaObject->className();
+ int majVersion = -1;
+ int minVersion = -1;
+ QDeclarativeType *qmlType = QDeclarativeMetaType::qmlType(qMetaObject);
+ if (qmlType) {
+ if (!qmlType->qmlTypeName().isEmpty()) {
+ *typeName = qmlType->qmlTypeName();
+ majVersion = qmlType->majorVersion();
+ minVersion = qmlType->minorVersion();
+ }
}
- return className;
+ if (majorVersion)
+ *majorVersion = majVersion;
+ if (minorVersion)
+ *minorVersion = minVersion;
}
void MetaInfoPrivate::parseValueTypes()
@@ -291,12 +348,12 @@ void MetaInfoPrivate::parseValueTypes()
void MetaInfoPrivate::parseQmlTypes()
{
- foreach (QDeclarativeType *qmlType, QDeclarativeMetaType::qmlTypes()) {
+ foreach (QDeclarativeType *qmlType, qmlTypes()) {
const QString qtTypeName(qmlType->typeName());
const QString qmlTypeName(qmlType->qmlTypeName());
m_QtTypesToQmlTypes.insert(qtTypeName, qmlTypeName);
}
- foreach (QDeclarativeType *qmlType, QDeclarativeMetaType::qmlTypes()) {
+ foreach (QDeclarativeType *qmlType, qmlTypes()) {
const QMetaObject *qMetaObject = qmlType->metaObject();
// parseQmlTypes is called iteratively e.g. when plugins are loaded
@@ -307,32 +364,42 @@ void MetaInfoPrivate::parseQmlTypes()
nodeMetaInfo.setType(qmlType->qmlTypeName(), qmlType->majorVersion(), qmlType->minorVersion());
parseProperties(nodeMetaInfo, qMetaObject);
- parseClassInfo(nodeMetaInfo, qMetaObject);
-
- QString superTypeName = typeName(qMetaObject->superClass());
if (qmlType->baseMetaObject() != qMetaObject) {
// type is declared with Q_DECLARE_EXTENDED_TYPE
- // also parse properties of original type
parseProperties(nodeMetaInfo, qmlType->baseMetaObject());
- superTypeName = typeName(qmlType->baseMetaObject()->superClass());
}
- nodeMetaInfo.setSuperClass(superTypeName);
+ parseClassInfo(nodeMetaInfo, qMetaObject);
+
+ QString superTypeName;
+ int superTypeMajorVersion = -1;
+ int superTypeMinorVersion = -1;
+ if (const QMetaObject *superClassObject = qmlType->baseMetaObject()->superClass())
+ typeInfo(superClassObject, &superTypeName, &superTypeMajorVersion, &superTypeMinorVersion);
+
+ if (!superTypeName.isEmpty())
+ nodeMetaInfo.setSuperClass(superTypeName, superTypeMajorVersion, superTypeMinorVersion);
+
+ if (debug) {
+ qDebug() << "adding qml type" << nodeMetaInfo.typeName() << nodeMetaInfo.majorVersion() << nodeMetaInfo.minorVersion()
+ << ", super class" << superTypeName << superTypeMajorVersion << superTypeMinorVersion;
+ }
- if (debug)
- qDebug() << "adding qml type" << nodeMetaInfo.typeName() << nodeMetaInfo.majorVersion() << nodeMetaInfo.minorVersion() << "super class" << superTypeName;
m_q->addNodeInfo(nodeMetaInfo);
}
}
void MetaInfoPrivate::parseNonQmlTypes()
{
- foreach (QDeclarativeType *qmlType, QDeclarativeMetaType::qmlTypes()) {
- if (!qmlType->qmlTypeName().contains("Bauhaus"))
- parseNonQmlClassRecursively(qmlType->metaObject(), qmlType->majorVersion(), qmlType->minorVersion());
+ foreach (QDeclarativeType *qmlType, qmlTypes()) {
+ if (qmlType->qmlTypeName().startsWith("Bauhaus/")
+ || qmlType->qmlTypeName().startsWith("QmlProject/"))
+ continue;
+ if (qmlType->metaObject()->superClass())
+ parseNonQmlClassRecursively(qmlType->metaObject()->superClass());
}
- parseNonQmlClassRecursively(&QDeclarativeAnchors::staticMetaObject, -1, -1);
+ parseNonQmlClassRecursively(&QDeclarativeAnchors::staticMetaObject);
}
@@ -417,12 +484,14 @@ MetaInfo& MetaInfo::operator=(const MetaInfo &other)
bool MetaInfo::hasNodeMetaInfo(const QString &typeName, int majorVersion, int minorVersion) const
{
foreach (const NodeMetaInfo &info, m_p->m_nodeMetaInfoHash.values(typeName)) {
- if (info.availableInVersion(majorVersion, minorVersion)) {
+ if (info.availableInVersion(majorVersion, minorVersion)) { {
return true;
}
+ }
}
if (!isGlobal())
return global().hasNodeMetaInfo(typeName);
+
return false;
}
@@ -431,16 +500,21 @@ bool MetaInfo::hasNodeMetaInfo(const QString &typeName, int majorVersion, int mi
*/
NodeMetaInfo MetaInfo::nodeMetaInfo(const QString &typeName, int majorVersion, int minorVersion) const
{
+ NodeMetaInfo returnInfo;
foreach (const NodeMetaInfo &info, m_p->m_nodeMetaInfoHash.values(typeName)) {
- // todo: The order for different types for different versions is random here.
if (info.availableInVersion(majorVersion, minorVersion)) {
- return info;
+ if (!returnInfo.isValid()
+ || returnInfo.majorVersion() < info.majorVersion()
+ || (returnInfo.majorVersion() == info.minorVersion()
+ && returnInfo.minorVersion() < info.minorVersion()))
+ returnInfo = info;
}
}
- if (!isGlobal())
+ if (!returnInfo.isValid()
+ && !isGlobal())
return global().nodeMetaInfo(typeName);
- return NodeMetaInfo();
+ return returnInfo;
}
QString MetaInfo::fromQtTypes(const QString &type) const
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index d3590ce02580ba8922419dd6acadd8e1ab35b145..cf5dd941500fe2514b8c864c8e862d2b9380e768 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -210,12 +210,13 @@ public:
int &minorVersion, QString &defaultPropertyName)
{
const Interpreter::ObjectValue *value = m_context->lookupType(m_doc.data(), astTypeNode);
+ defaultPropertyName = m_context->defaultPropertyName(value);
+
const Interpreter::QmlObjectValue * qmlValue = dynamic_cast<const Interpreter::QmlObjectValue *>(value);
if (qmlValue) {
typeName = qmlValue->packageName() + QLatin1String("/") + qmlValue->className();
majorVersion = qmlValue->majorVersion();
minorVersion = qmlValue->minorVersion();
- defaultPropertyName = qmlValue->defaultPropertyName();
} else if (value) {
for (UiQualifiedId *iter = astTypeNode; iter; iter = iter->next)
if (!iter->next && iter->name)
diff --git a/src/plugins/qmlprojectmanager/fileformat/filesystemwatcher.cpp b/src/plugins/qmlprojectmanager/fileformat/filesystemwatcher.cpp
index 1f898ff48f5d857fc93c6df7dc5ac77980c9d1f1..eb4b79f1a83986b7e4c4270db8bab771e0eb2a7c 100644
--- a/src/plugins/qmlprojectmanager/fileformat/filesystemwatcher.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/filesystemwatcher.cpp
@@ -72,6 +72,19 @@ void FileSystemWatcher::addFile(const QString &file)
addFiles(QStringList(file));
}
+
+#ifdef Q_OS_MAC
+
+// Returns upper limit of file handles that can be opened by this process at once. Exceeding it will probably result in crashes!
+static rlim_t getFileLimit()
+{
+ struct rlimit rl;
+ getrlimit(RLIMIT_NOFILE, &rl);
+ return rl.rlim_cur;
+}
+
+#endif
+
void FileSystemWatcher::addFiles(const QStringList &files)
{
QStringList toAdd;
@@ -84,6 +97,17 @@ void FileSystemWatcher::addFiles(const QStringList &files)
qWarning() << "FileSystemWatcher: File" << file << "is already being watched";
continue;
}
+
+#ifdef Q_OS_MAC
+ static rlim_t maxFileOpen = getFileLimit();
+ // We're potentially watching a _lot_ of directories. This might crash qtcreator when we hit the upper limit.
+ // Heuristic is therefore: Don't use more than half of the file handles available in this watcher
+ if ((rlim_t)m_directories.size() + (rlim_t)m_files.size() > maxFileOpen / 2) {
+ qWarning() << "File" << file << "is not watched: Too many file handles are already open (max is" << maxFileOpen;
+ break;
+ }
+#endif
+
m_files.append(file);
const int count = ++m_fileCount[file];
@@ -149,6 +173,17 @@ void FileSystemWatcher::addDirectories(const QStringList &directories)
qWarning() << "Directory" << directory << "is already being watched";
continue;
}
+
+#ifdef Q_OS_MAC
+ static rlim_t maxFileOpen = getFileLimit();
+ // We're potentially watching a _lot_ of directories. This might crash qtcreator when we hit the upper limit.
+ // Heuristic is therefore: Don't use more than half of the file handles available in this watcher
+ if ((rlim_t)m_directories.size() + (rlim_t)m_files.size() > maxFileOpen / 2) {
+ qWarning() << "Directory" << directory << "is not watched: Too many file handles are already open (max is" << maxFileOpen;
+ break;
+ }
+#endif
+
m_directories.append(directory);
const int count = ++m_directoryCount[directory];
diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml b/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml
index eb444a0e409fffa360eec61082a2a8ee03775e90..1730d1ffc0c3c94b3dd7e3835dd1700cb5ca9804 100644
--- a/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml
+++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml
@@ -10,6 +10,11 @@
<comment>Qt Project include file</comment>
<glob pattern="*.pri"/>
</mime-type>
+ <mime-type type="application/vnd.nokia.qt.qmakeprofeaturefile">
+ <sub-class-of type="text/plain"/>
+ <comment>Qt Project feature file</comment>
+ <glob pattern="*.prf"/>
+ </mime-type>
<mime-type type="application/x-linguist">
<sub-class-of type="application/xml"/>
<comment>message catalog</comment>
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index 58a25be523875582dc96e98b94bef1f9b2ae3c00..b08bb5ba3923e0aa52e4b7691c1d99d112ba8136 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -66,16 +66,27 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
ui(new Ui::GettingStartedWelcomePageWidget)
{
ui->setupUi(this);
+
+#ifndef QTCREATOR_WITH_QML
+ ui->demosExamplesFrameQml->hide();
+#endif
+
ui->didYouKnowTextBrowser->viewport()->setAutoFillBackground(false);
connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&)));
ui->tutorialTreeWidget->addItem(tr("The Qt Creator User Interface"),
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html"));
+ ui->tutorialTreeWidget->addItem(tr("Building and Running an Example"),
+ QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-build-example-application.html?view=split"));
ui->tutorialTreeWidget->addItem(tr("Creating a Qt C++ Application"),
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-writing-program.html?view=split"));
+ ui->tutorialTreeWidget->addItem(tr("Creating a Mobile Application"),
+ QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-mobile-example?view=split"));
+#ifdef QTCREATOR_WITH_QML
ui->tutorialTreeWidget->addItem(tr("Creating a Qt Quick Application"),
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-qml-application.html?view=split"));
+#endif
srand(QDateTime::currentDateTime().toTime_t());
QStringList tips = tipsOfTheDay();
@@ -175,8 +186,6 @@ void GettingStartedWelcomePageWidget::updateQmlExamples(const QString &examplePa
const QString &sourcePath)
{
ui->qmlExamplesButton->setText(tr("Choose an example..."));
- QMenu *menu = new QMenu(ui->qmlExamplesButton);
- ui->qmlExamplesButton->setMenu(menu);
QStringList roots;
roots << (examplePath + QLatin1String("/declarative"))
@@ -197,14 +206,20 @@ void GettingStartedWelcomePageWidget::updateQmlExamples(const QString &examplePa
exampleProjects.insert(fileName, exampleProject);
}
}
- QMapIterator<QString, QString> it(exampleProjects);
- while (it.hasNext()) {
- it.next();
- QAction *exampleAction = menu->addAction(it.key());
- connect(exampleAction, SIGNAL(triggered()), SLOT(slotOpenExample()));
- exampleAction->setProperty(ExamplePathPropertyName, it.value());
- // FIXME once we have help for QML examples
- // exampleAction->setProperty(HelpPathPropertyName, helpPath);
+
+ if (!exampleProjects.isEmpty()) {
+ QMenu *menu = new QMenu(ui->qmlExamplesButton);
+ ui->qmlExamplesButton->setMenu(menu);
+
+ QMapIterator<QString, QString> it(exampleProjects);
+ while (it.hasNext()) {
+ it.next();
+ QAction *exampleAction = menu->addAction(it.key());
+ connect(exampleAction, SIGNAL(triggered()), SLOT(slotOpenExample()));
+ exampleAction->setProperty(ExamplePathPropertyName, it.value());
+ // FIXME once we have help for QML examples
+ // exampleAction->setProperty(HelpPathPropertyName, helpPath);
+ }
}
ui->qmlExamplesButton->setEnabled(!exampleProjects.isEmpty());
@@ -380,15 +395,11 @@ QStringList GettingStartedWelcomePageWidget::tipsOfTheDay()
tr("Ctrl", "Shortcut key");
#endif
-
- tips.append(tr("You can switch between Qt Creator's modes using <tt>Ctrl+number</tt>:<ul>"
- "<li>1 - Welcome</li><li>2 - Edit</li><li>3 - Debug</li><li>4 - Projects</li><li>5 - Help</li></ul>"));
//:%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)
tips.append(tr("You can show and hide the side bar using <tt>%1+0<tt>.").arg(altShortcut));
tips.append(tr("You can fine tune the <tt>Find</tt> function by selecting "Whole Words" "
"or "Case Sensitive". Simply click on the icons on the right end of the line edit."));
- tips.append(tr("If you add <a href=\"qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html\""
- ">external libraries</a>, Qt Creator will automatically offer syntax highlighting "
+ tips.append(tr("If you add external libraries to your project, Qt Creator will automatically offer syntax highlighting "
"and code completion."));
tips.append(tr("The code completion is CamelCase-aware. For example, to complete <tt>namespaceUri</tt> "
"you can just type <tt>nU</tt> and hit <tt>Ctrl+Space</tt>."));
@@ -403,9 +414,9 @@ QStringList GettingStartedWelcomePageWidget::tipsOfTheDay()
tips.append(tr("You can quickly search methods, classes, help and more using the "
"<a href=\"qthelp://com.nokia.qtcreator/doc/creator-navigation.html\">Locator bar</a> (<tt>%1+K</tt>).").arg(ctrlShortcut));
tips.append(tr("You can add custom build steps in the "
- "<a href=\"qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings\">build settings</a>."));
+ "<a href=\"qthelp://com.nokia.qtcreator/doc/creator-build-settings.html\">build settings</a>."));
tips.append(tr("Within a session, you can add "
- "<a href=\"qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies\">dependencies</a> between projects."));
+ "<a href=\"qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html\">dependencies</a> between projects."));
tips.append(tr("You can set the preferred editor encoding for every project in <tt>Projects -> Editor Settings -> Default Encoding</tt>."));
tips.append(tr("You can use Qt Creator with a number of <a href=\"qthelp://com.nokia.qtcreator/doc/creator-version-control.html\">"
"revision control systems</a> such as Subversion, Perforce, CVS and Git."));
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
index 9f03d493557ab5546e66d5c78e71cd75d7d3fe7c..833f644622ad3e637961544bd2769891ec35fc9e 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
@@ -119,7 +119,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QFrame" name="demosExamplesFrame_2">
+ <widget class="QFrame" name="demosExamplesFrameQml">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
@@ -137,7 +137,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="Utils::WelcomeModeLabel" name="demoTitleLabel_2">
+ <widget class="Utils::WelcomeModeLabel" name="demoTitleLabeldemosExamplesFrameQml">
<property name="text">
<string>Explore Qt Quick Examples</string>
</property>
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index d4937b98318c30c9ef598a44c24e54b2980dded0..0fabec8677bf22bfab2cf990fcd5e6a08ff599a2 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -47,7 +47,8 @@ using namespace Qt4ProjectManager::Internal;
ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::TextEditorActionHandler *handler) :
m_mimeTypes(QStringList() << QLatin1String(Qt4ProjectManager::Constants::PROFILE_MIMETYPE)
- << QLatin1String(Qt4ProjectManager::Constants::PROINCLUDEFILE_MIMETYPE)),
+ << QLatin1String(Qt4ProjectManager::Constants::PROINCLUDEFILE_MIMETYPE)
+ << QLatin1String(Qt4ProjectManager::Constants::PROFEATUREFILE_MIMETYPE)),
m_manager(manager),
m_actionHandler(handler)
{
@@ -56,6 +57,8 @@ ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::Text
QLatin1String("pro"));
iconProvider->registerIconOverlayForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"),
QLatin1String("pri"));
+ iconProvider->registerIconOverlayForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"),
+ QLatin1String("prf"));
}
ProFileEditorFactory::~ProFileEditorFactory()
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 6ad65dc56cb5d2f03b0ba1083a3fb05ea6e241d9..ae4df4907de4d4d3fc1d213002de449846d7c2c6 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -48,6 +48,7 @@ const char * const PROFILE_EDITOR_ID = "Qt4.proFileEditor";
const char * const PROFILE_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", ".pro File Editor");
const char * const PROFILE_MIMETYPE = "application/vnd.nokia.qt.qmakeprofile";
const char * const PROINCLUDEFILE_MIMETYPE = "application/vnd.nokia.qt.qmakeproincludefile";
+const char * const PROFEATUREFILE_MIMETYPE = "application/vnd.nokia.qt.qmakeprofeaturefile";
const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
const char * const FORM_MIMETYPE = "application/x-designer";
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 5ac8bd97e635b99bd9b23f1dfd6b404e1a5abb5d..9977bd8660a9f91e6a65613b9566babcb861fd05 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -209,7 +209,9 @@ void ResourceEditorFile::reload(ReloadFlag flag, ChangeType type)
if (type == TypePermissions) {
emit changed();
} else {
- m_parent->open(m_parent->m_resourceEditor->fileName());
+ emit aboutToReload();
+ if (m_parent->open(m_parent->m_resourceEditor->fileName()))
+ emit reloaded();
}
}
diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index 25406e98e06a88fd26ebb6a7675da38e3d4aa3c9..be2214d7fca7cc5ae21a8f8c63c0d3ece9a32e34 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -132,7 +132,7 @@ BaseTextDocument::BaseTextDocument()
m_fileIsReadOnly = false;
m_isBinaryData = false;
m_codec = QTextCodec::codecForLocale();
- QSettings* settings = Core::ICore::instance()->settings();
+ QSettings *settings = Core::ICore::instance()->settings();
if (QTextCodec *candidate = QTextCodec::codecForName(
settings->value(QLatin1String("General/DefaultFileEncoding")).toByteArray()))
m_codec = candidate;
@@ -142,12 +142,8 @@ BaseTextDocument::BaseTextDocument()
BaseTextDocument::~BaseTextDocument()
{
- QTextBlock block = m_document->begin();
- while (block.isValid()) {
- if (TextBlockUserData *data = static_cast<TextBlockUserData *>(block.userData()))
- data->documentClosing();
- block = block.next();
- }
+ documentClosing();
+
delete m_document;
m_document = 0;
}
@@ -332,6 +328,8 @@ void BaseTextDocument::reload(QTextCodec *codec)
void BaseTextDocument::reload()
{
emit aboutToReload();
+ documentClosing(); // removes text marks non-permanently
+
if (open(m_fileName))
emit reloaded();
}
@@ -381,9 +379,8 @@ void BaseTextDocument::cleanWhitespace(const QTextCursor &cursor)
copyCursor.endEditBlock();
}
-void BaseTextDocument::cleanWhitespace(QTextCursor& cursor, bool cleanIndentation, bool inEntireDocument)
+void BaseTextDocument::cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument)
{
-
BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(m_document->documentLayout());
QTextBlock block = m_document->findBlock(cursor.selectionStart());
@@ -431,3 +428,13 @@ void BaseTextDocument::ensureFinalNewLine(QTextCursor& cursor)
cursor.insertText(QLatin1String("\n"));
}
}
+
+void BaseTextDocument::documentClosing()
+{
+ QTextBlock block = m_document->begin();
+ while (block.isValid()) {
+ if (TextBlockUserData *data = static_cast<TextBlockUserData *>(block.userData()))
+ data->documentClosing();
+ block = block.next();
+ }
+}
diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/basetextdocument.h
index 07f32b7c25bb19b18ba1f894153c750098d6fe33..7447d8167d58ab20af09f49c966dc35ff581b465 100644
--- a/src/plugins/texteditor/basetextdocument.h
+++ b/src/plugins/texteditor/basetextdocument.h
@@ -76,7 +76,7 @@ public:
inline const StorageSettings &storageSettings() const { return m_storageSettings; }
inline const TabSettings &tabSettings() const { return m_tabSettings; }
- DocumentMarker *documentMarker() const {return m_documentMarker; }
+ DocumentMarker *documentMarker() const { return m_documentMarker; }
//IFile
virtual bool save(const QString &fileName = QString());
@@ -117,8 +117,6 @@ public:
signals:
void titleChanged(QString title);
- void aboutToReload();
- void reloaded();
private:
QString m_fileName;
@@ -151,6 +149,7 @@ private:
void cleanWhitespace(QTextCursor& cursor, bool cleanIndentation, bool inEntireDocument);
void ensureFinalNewLine(QTextCursor& cursor);
+ void documentClosing();
};
} // namespace TextEditor
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 681653a6b5db46826f89784d34babc93bc867ff1..71a78dd3a8c1dbbc2a27255e36cb097dd7c51887 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -2015,8 +2015,8 @@ QTextBlock BaseTextEditor::foldedBlockAt(const QPoint &pos, QRect *box) const
{
QPointF offset(contentOffset());
QTextBlock block = firstVisibleBlock();
- int top = (int)blockBoundingGeometry(block).translated(offset).top();
- int bottom = top + (int)blockBoundingRect(block).height();
+ qreal top = blockBoundingGeometry(block).translated(offset).top();
+ qreal bottom = top + blockBoundingRect(block).height();
int viewportHeight = viewport()->height();
@@ -2050,7 +2050,7 @@ QTextBlock BaseTextEditor::foldedBlockAt(const QPoint &pos, QRect *box) const
block = nextBlock;
top = bottom;
- bottom = top + (int)blockBoundingRect(block).height();
+ bottom = top + blockBoundingRect(block).height();
}
return QTextBlock();
}
@@ -2283,8 +2283,6 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
QRect er = e->rect();
QRect viewportRect = viewport()->rect();
- const QColor baseColor = palette().base().color();
-
qreal lineX = 0;
if (d->m_visibleWrapColumn > 0) {
@@ -2318,6 +2316,8 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
QAbstractTextDocumentLayout::PaintContext context = getPaintContext();
if (!d->m_highlightBlocksInfo.isEmpty()) {
+ const QColor baseColor = palette().base().color();
+
// extra pass for the block highlight
const int margin = 5;
@@ -2345,7 +2345,6 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
int vi = i > 0 ? d->m_highlightBlocksInfo.visualIndent.at(i-1) : 0;
painter.fillRect(rr.adjusted(vi, 0, -8*i, 0), calcBlendColor(baseColor, i, count));
}
-
}
offsetFP.ry() += r.height();
@@ -2610,8 +2609,8 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
offset = contentOffset();
block = firstVisibleBlock();
- int top = (int)blockBoundingGeometry(block).translated(offset).top();
- int bottom = top + (int)blockBoundingRect(block).height();
+ qreal top = blockBoundingGeometry(block).translated(offset).top();
+ qreal bottom = top + blockBoundingRect(block).height();
QTextCursor cursor = textCursor();
bool hasSelection = cursor.hasSelection();
@@ -2642,8 +2641,9 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
QTextLine line = layout->lineAt(i);
QRectF lineRect = line.naturalTextRect().translated(offset.x(), top);
QChar visualArrow((ushort)0x21b5);
- painter.drawText(static_cast<int>(lineRect.right()),
- static_cast<int>(lineRect.top() + line.ascent()), visualArrow);
+ painter.drawText(QPointF(lineRect.right(),
+ lineRect.top() + line.ascent()),
+ visualArrow);
}
if (!nextBlock.isValid()) { // paint EOF symbol
QTextLine line = layout->lineAt(lineCount-1);
@@ -2724,55 +2724,7 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
block = nextVisibleBlock;
top = bottom;
- bottom = top + (int)blockBoundingRect(block).height();
- }
-
- if (visibleCollapsedBlock.isValid() ) {
- int margin = doc->documentMargin();
- qreal maxWidth = 0;
- qreal blockHeight = 0;
- QTextBlock b = visibleCollapsedBlock;
-
- 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() + 2*margin);
-
- blockHeight += r.height();
-
- b.setVisible(false); // restore previous state
- b.setLineCount(0); // restore 0 line count for invisible block
- b = b.next();
- }
-
- painter.save();
- painter.setRenderHint(QPainter::Antialiasing, true);
- painter.translate(.5, .5);
- QBrush brush = baseColor;
- if (d->m_ifdefedOutFormat.hasProperty(QTextFormat::BackgroundBrush))
- brush = d->m_ifdefedOutFormat.background();
- painter.setBrush(brush);
- painter.drawRoundedRect(QRectF(visibleCollapsedBlockOffset.x(),
- visibleCollapsedBlockOffset.y(),
- maxWidth, blockHeight).adjusted(0, 0, 0, 0), 3, 3);
- painter.restore();
-
- QTextBlock end = b;
- b = visibleCollapsedBlock;
- while (b != end) {
- b.setVisible(true); // make sure block bounding rect works
- QRectF r = blockBoundingRect(b).translated(visibleCollapsedBlockOffset);
- QTextLayout *layout = b.layout();
- QVector<QTextLayout::FormatRange> selections;
- layout->draw(&painter, visibleCollapsedBlockOffset, selections, er);
-
- b.setVisible(false); // restore previous state
- visibleCollapsedBlockOffset.ry() += r.height();
- b = b.next();
- }
+ bottom = top + blockBoundingRect(block).height();
}
if (d->m_animator && d->m_animator->isRunning()) {
@@ -2798,6 +2750,64 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
cursor_layout->drawCursor(&painter, cursor_offset, cursor_cpos, cursorWidth());
}
+ if (visibleCollapsedBlock.isValid()) {
+ drawCollapsedBlockPopup(painter,
+ visibleCollapsedBlock,
+ visibleCollapsedBlockOffset,
+ er);
+ }
+}
+
+void BaseTextEditor::drawCollapsedBlockPopup(QPainter &painter,
+ const QTextBlock &block,
+ QPointF offset,
+ const QRect &clip)
+{
+ int margin = block.document()->documentMargin();
+ qreal maxWidth = 0;
+ qreal blockHeight = 0;
+ QTextBlock b = block;
+
+ while (!b.isVisible()) {
+ b.setVisible(true); // make sure block bounding rect works
+ QRectF r = blockBoundingRect(b).translated(offset);
+
+ QTextLayout *layout = b.layout();
+ for (int i = layout->lineCount()-1; i >= 0; --i)
+ maxWidth = qMax(maxWidth, layout->lineAt(i).naturalTextWidth() + 2*margin);
+
+ blockHeight += r.height();
+
+ b.setVisible(false); // restore previous state
+ b.setLineCount(0); // restore 0 line count for invisible block
+ b = b.next();
+ }
+
+ painter.save();
+ painter.setRenderHint(QPainter::Antialiasing, true);
+ painter.translate(.5, .5);
+ QBrush brush = palette().base();
+ if (d->m_ifdefedOutFormat.hasProperty(QTextFormat::BackgroundBrush))
+ brush = d->m_ifdefedOutFormat.background();
+ painter.setBrush(brush);
+ painter.drawRoundedRect(QRectF(offset.x(),
+ offset.y(),
+ maxWidth, blockHeight).adjusted(0, 0, 0, 0), 3, 3);
+ painter.restore();
+
+ QTextBlock end = b;
+ b = block;
+ while (b != end) {
+ b.setVisible(true); // make sure block bounding rect works
+ QRectF r = blockBoundingRect(b).translated(offset);
+ QTextLayout *layout = b.layout();
+ QVector<QTextLayout::FormatRange> selections;
+ layout->draw(&painter, offset, selections, clip);
+
+ b.setVisible(false); // restore previous state
+ offset.ry() += r.height();
+ b = b.next();
+ }
}
QWidget *BaseTextEditor::extraArea() const
@@ -2898,7 +2908,6 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
int selStart = textCursor().selectionStart();
int selEnd = textCursor().selectionEnd();
- const QColor baseColor = palette().base().color();
QPalette pal = d->m_extraArea->palette();
pal.setCurrentColorGroup(QPalette::Active);
QPainter painter(d->m_extraArea);
@@ -2924,7 +2933,8 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
while (block.isValid() && top <= e->rect().bottom()) {
top = bottom;
- bottom = top + blockBoundingRect(block).height();
+ const qreal height = blockBoundingRect(block).height();
+ bottom = top + height;
QTextBlock nextBlock = block.next();
QTextBlock nextVisibleBlock = nextBlock;
@@ -3056,7 +3066,7 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
painter.setFont(f);
painter.setPen(d->m_currentLineNumberFormat.foreground().color());
}
- painter.drawText(markWidth, top, extraAreaWidth - markWidth - 4, fm.height(), Qt::AlignRight, number);
+ painter.drawText(QRectF(markWidth, top, extraAreaWidth - markWidth - 4, height), Qt::AlignRight, number);
if (selected)
painter.restore();
}
@@ -3497,7 +3507,7 @@ void BaseTextEditor::extraAreaMouseEvent(QMouseEvent *e)
toggleBlockVisible(c);
d->moveCursorVisible(false);
}
- } else if (d->m_lineNumbersVisible && e->pos().x() > markWidth) {
+ } else if (e->pos().x() > markWidth) {
QTextCursor selection = cursor;
selection.setVisualNavigation(true);
d->extraAreaSelectionAnchorBlockNumber = selection.blockNumber();
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 1f2afc97ab6cd6def474a51f998a6eb93c743865..20a848369952e4cc38ebd5129729418217b5f6b6 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -492,6 +492,11 @@ private:
bool active,
bool hovered) const;
+ void drawCollapsedBlockPopup(QPainter &painter,
+ const QTextBlock &block,
+ QPointF offset,
+ const QRect &clip);
+
void toggleBlockVisible(const QTextBlock &block);
QRect foldBox();
diff --git a/src/plugins/texteditor/basetextmark.cpp b/src/plugins/texteditor/basetextmark.cpp
index 17b238b64189e2f99c10cf3e45b4df48836f1cbb..fb425cb8906178d8593bd7983569c2cf9b0a056c 100644
--- a/src/plugins/texteditor/basetextmark.cpp
+++ b/src/plugins/texteditor/basetextmark.cpp
@@ -29,6 +29,8 @@
#include "basetextmark.h"
+#include "basetextdocument.h"
+
#include <coreplugin/editormanager/editormanager.h>
#include <extensionsystem/pluginmanager.h>
@@ -37,18 +39,25 @@
using namespace TextEditor;
using namespace TextEditor::Internal;
-BaseTextMark::BaseTextMark()
- : m_markableInterface(0), m_internalMark(0), m_init(false)
-{
-}
-
BaseTextMark::BaseTextMark(const QString &filename, int line)
- : m_markableInterface(0), m_internalMark(0), m_fileName(filename), m_line(line), m_init(false)
+ : m_markableInterface(0)
+ , m_internalMark(0)
+ , m_fileName(filename)
+ , m_line(line)
+ , m_init(false)
{
// Why is this?
QTimer::singleShot(0, this, SLOT(init()));
}
+BaseTextMark::~BaseTextMark()
+{
+ // oha we are deleted
+ if (m_markableInterface)
+ m_markableInterface->removeMark(m_internalMark);
+ removeInternalMark();
+}
+
void BaseTextMark::init()
{
m_init = true;
@@ -73,39 +82,49 @@ void BaseTextMark::editorOpened(Core::IEditor *editor)
m_markableInterface = textEditor->markableInterface();
m_internalMark = new InternalMark(this);
- if (!m_markableInterface->addMark(m_internalMark, m_line)) {
- delete m_internalMark;
- m_internalMark = 0;
- m_markableInterface = 0;
+ if (m_markableInterface->addMark(m_internalMark, m_line)) {
+ // Handle reload of text documents, readding the mark as necessary
+ connect(textEditor->file(), SIGNAL(reloaded()),
+ this, SLOT(documentReloaded()), Qt::UniqueConnection);
+ } else {
+ removeInternalMark();
}
}
}
}
+void BaseTextMark::documentReloaded()
+{
+ if (m_markableInterface)
+ return;
+
+ BaseTextDocument *doc = qobject_cast<BaseTextDocument*>(sender());
+ if (!doc)
+ return;
+
+ m_markableInterface = doc->documentMarker();
+ m_internalMark = new InternalMark(this);
+
+ if (!m_markableInterface->addMark(m_internalMark, m_line))
+ removeInternalMark();
+}
+
void BaseTextMark::childRemovedFromEditor(InternalMark *mark)
{
Q_UNUSED(mark)
// m_internalMark was removed from the editor
- delete m_internalMark;
- m_markableInterface = 0;
- m_internalMark = 0;
+ removeInternalMark();
removedFromEditor();
}
void BaseTextMark::documentClosingFor(InternalMark *mark)
{
Q_UNUSED(mark)
- // the document is closing
- delete m_internalMark;
- m_markableInterface = 0;
- m_internalMark = 0;
+ removeInternalMark();
}
-BaseTextMark::~BaseTextMark()
+void BaseTextMark::removeInternalMark()
{
- // oha we are deleted
- if (m_markableInterface)
- m_markableInterface->removeMark(m_internalMark);
delete m_internalMark;
m_internalMark = 0;
m_markableInterface = 0;
@@ -128,13 +147,10 @@ void BaseTextMark::moveMark(const QString & /* filename */, int /* line */)
m_init = true;
}
-
if (m_markableInterface)
m_markableInterface->removeMark(m_internalMark);
- m_markableInterface = 0;
- // This is only necessary since m_internalMark is created in ediorOpened
- delete m_internalMark;
- m_internalMark = 0;
+ // This is only necessary since m_internalMark is created in editorOpened
+ removeInternalMark();
foreach (Core::IEditor *editor, em->openedEditors())
editorOpened(editor);
diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h
index 244dd0009d4ba7a3f4e7d4a4deae6a14e1109f7b..ad40b7571f537802ce129fd717a9edf2b1681424 100644
--- a/src/plugins/texteditor/basetextmark.h
+++ b/src/plugins/texteditor/basetextmark.h
@@ -45,8 +45,8 @@ class TEXTEDITOR_EXPORT BaseTextMark : public QObject
{
friend class Internal::InternalMark;
Q_OBJECT
+
public:
- BaseTextMark();
BaseTextMark(const QString &filename, int line);
~BaseTextMark();
@@ -69,12 +69,16 @@ public:
int lineNumber() const { return m_line; }
void moveMark(const QString &filename, int line);
+
private slots:
- void editorOpened(Core::IEditor *editor);
void init();
+ void editorOpened(Core::IEditor *editor);
+ void documentReloaded();
+
private:
void childRemovedFromEditor(Internal::InternalMark *mark);
void documentClosingFor(Internal::InternalMark *mark);
+ void removeInternalMark();
ITextMarkable *m_markableInterface;
Internal::InternalMark *m_internalMark;
diff --git a/src/plugins/texteditor/completionwidget.cpp b/src/plugins/texteditor/completionwidget.cpp
index 031ddbe39c680aaf7cc4b84141738d68fbea65f0..c8a6eae08a47d0056f3ee31ae0fb07daea225102 100644
--- a/src/plugins/texteditor/completionwidget.cpp
+++ b/src/plugins/texteditor/completionwidget.cpp
@@ -334,6 +334,8 @@ bool CompletionListView::event(QEvent *e)
}
#endif
m_completionWidget->closeList(index);
+ if (m_infoFrame)
+ m_infoFrame->close();
return true;
} else if (e->type() == QEvent::ShortcutOverride) {
QKeyEvent *ke = static_cast<QKeyEvent *>(e);
diff --git a/src/tools/qml/qmldump/main.cpp b/src/tools/qml/qmldump/main.cpp
index a8d1fd6b1d06cf20b1b0b871ef4218aed4b02563..4ff4114cf06a7b4a0785481b3711dda456d8a259 100644
--- a/src/tools/qml/qmldump/main.cpp
+++ b/src/tools/qml/qmldump/main.cpp
@@ -257,9 +257,9 @@ int main(int argc, char *argv[])
{
QByteArray code;
code += "import Qt 4.7;\n";
- code += "import Qt.widgets 4.7;\n";
- code += "import Qt.multimedia 1.0;\n";
code += "import Qt.labs.particles 4.7;\n";
+ code += "import Qt.labs.gestures 4.7;\n";
+ code += "import Qt.labs.folderlistmodel 4.7;\n";
code += "import org.webkit 1.0;\n";
code += "Item {}";
QDeclarativeComponent c(engine);
@@ -313,9 +313,9 @@ int main(int argc, char *argv[])
QByteArray code;
code += "import Qt 4.7;\n";
- code += "import Qt.widgets 4.7;\n";
- code += "import Qt.multimedia 1.0;\n";
code += "import Qt.labs.particles 4.7;\n";
+ code += "import Qt.labs.gestures 4.7;\n";
+ code += "import Qt.labs.folderlistmodel 4.7;\n";
code += "import org.webkit 1.0;\n";
code += tyName;
code += " {}\n";
diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.cpp b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
index 3330097b20601cfbab25599237a54df7e0f68f65..e0ffeb88cf08a1955febd47417752b44406bf431 100644
--- a/tests/auto/qml/qmldesigner/coretests/testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
@@ -3343,35 +3343,6 @@ void TestCore::testSubComponentManager()
QVERIFY(myButtonMetaInfo.property("border.width", true).isValid());
}
-void TestCore::testComponentLoadingTabWidget()
-{
-
- QSKIP("TODO: fails", SkipAll);
-
- QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/tabs.qml";
- QFile file(fileName);
- QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
- QPlainTextEdit textEdit;
- textEdit.setPlainText(file.readAll());
- NotIndentingTextEditModifier modifier(&textEdit);
-
- QScopedPointer<Model> model(Model::create("Qt/Item"));
- model->setFileUrl(QUrl::fromLocalFile(fileName));
- QScopedPointer<SubComponentManager> subComponentManager(new SubComponentManager(model->metaInfo(), 0));
- subComponentManager->update(QUrl::fromLocalFile(fileName), modifier.text().toUtf8());
-
- QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
- testRewriterView->setTextModifier(&modifier);
- model->attachView(testRewriterView.data());
-
- QVERIFY(testRewriterView->errors().isEmpty());
- QVERIFY(testRewriterView->rootModelNode().isValid());
-
- ModelNode rootModelNode = testRewriterView->rootModelNode();
- QCOMPARE(rootModelNode.type(), QLatin1String("TabWidget"));
-}
-
void TestCore::testAnchorsAndRewriting()
{
const QString qmlString("import Qt 4.7\n"
@@ -3606,6 +3577,16 @@ void TestCore::testMetaInfo()
{
QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
+
+ // test whether default type is registered
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
+
+ // test whether types from plugins are registered
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("org.webkit/WebView", 1, 0));
+
+ // test whether non-qml type is registered
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 4, 7)); // Qt 4.7 namespace
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // webkit 1.0 namespace
}
void TestCore::testMetaInfoSimpleType()
@@ -3619,11 +3600,11 @@ void TestCore::testMetaInfoSimpleType()
QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
NodeMetaInfo itemMetaInfo = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
- NodeMetaInfo itemMetaInfo2 = model->metaInfo().nodeMetaInfo("Qt/Item");
+ NodeMetaInfo itemMetaInfo2 = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
QCOMPARE(itemMetaInfo, itemMetaInfo2);
QVERIFY(itemMetaInfo.isValid());
@@ -3635,12 +3616,12 @@ void TestCore::testMetaInfoSimpleType()
NodeMetaInfo graphicsObjectInfo = itemMetaInfo.directSuperClass();
QVERIFY(graphicsObjectInfo.isValid());
QCOMPARE(graphicsObjectInfo.typeName(), QLatin1String("QGraphicsObject"));
- QCOMPARE(graphicsObjectInfo.majorVersion(), 4);
- QCOMPARE(graphicsObjectInfo.minorVersion(), 7);
+ QCOMPARE(graphicsObjectInfo.majorVersion(), -1);
+ QCOMPARE(graphicsObjectInfo.minorVersion(), -1);
QCOMPARE(itemMetaInfo.superClasses().size(), 2); // QGraphicsObject, Qt/QtObject
QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 4, 7));
- QVERIFY(itemMetaInfo.isSubclassOf("Qt/QtObject", -1, -1));
+ QVERIFY(itemMetaInfo.isSubclassOf("Qt/QtObject", 4, 7));
// availableInVersion
QVERIFY(itemMetaInfo.availableInVersion(4, 7));
@@ -3698,8 +3679,8 @@ void TestCore::testMetaInfoExtendedType()
NodeMetaInfo graphicsObjectTypeInfo = graphicsWidgetTypeInfo.directSuperClass();
QVERIFY(graphicsObjectTypeInfo.isValid());
QCOMPARE(graphicsObjectTypeInfo.typeName(), QLatin1String("QGraphicsObject"));
- QCOMPARE(graphicsObjectTypeInfo.majorVersion(), 4);
- QCOMPARE(graphicsObjectTypeInfo.minorVersion(), 7);
+ QCOMPARE(graphicsObjectTypeInfo.majorVersion(), -1);
+ QCOMPARE(graphicsObjectTypeInfo.minorVersion(), -1);
QCOMPARE(graphicsWidgetTypeInfo.superClasses().size(), 2);
}
@@ -3730,8 +3711,8 @@ void TestCore::testMetaInfoCustomType()
NodeMetaInfo stateOperationInfo = propertyChangesInfo.directSuperClass();
QVERIFY(stateOperationInfo.isValid());
QCOMPARE(stateOperationInfo.typeName(), QLatin1String("QDeclarativeStateOperation"));
- QCOMPARE(stateOperationInfo.majorVersion(), 4);
- QCOMPARE(stateOperationInfo.minorVersion(), 7);
+ QCOMPARE(stateOperationInfo.majorVersion(), -1);
+ QCOMPARE(stateOperationInfo.minorVersion(), -1);
QCOMPARE(propertyChangesInfo.superClasses().size(), 2);
// DeclarativePropertyChanges just has 3 properties