diff --git a/doc/images/qtcreator-ppbuildsettings.png b/doc/images/qtcreator-ppbuildsettings.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6481c140b95b15c0863cabd7bd8577f3170a828
Binary files /dev/null and b/doc/images/qtcreator-ppbuildsettings.png differ
diff --git a/doc/images/qtcreator-ppbuildsettings_orig.png b/doc/images/qtcreator-ppbuildsettings_orig.png
new file mode 100644
index 0000000000000000000000000000000000000000..6316a5e94a60a60a7d710f0afe266525100db055
Binary files /dev/null and b/doc/images/qtcreator-ppbuildsettings_orig.png differ
diff --git a/doc/images/qtcreator-pprunsettings.png b/doc/images/qtcreator-pprunsettings.png
new file mode 100644
index 0000000000000000000000000000000000000000..93c3d1202a772f613c3614a88a39c34df8d0ef8a
Binary files /dev/null and b/doc/images/qtcreator-pprunsettings.png differ
diff --git a/doc/images/qtcreator-pprunsettings_orig.png b/doc/images/qtcreator-pprunsettings_orig.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0d8f6807335a4388c20b3c08df63d9f9b3d68c3
Binary files /dev/null and b/doc/images/qtcreator-pprunsettings_orig.png differ
diff --git a/doc/images/qtcreator-projectpane.png b/doc/images/qtcreator-projectpane.png
new file mode 100644
index 0000000000000000000000000000000000000000..33f8d43bf7366f148e62bd462c9b2f6581e942b8
Binary files /dev/null and b/doc/images/qtcreator-projectpane.png differ
diff --git a/doc/images/qtcreator-projectpane_orig.png b/doc/images/qtcreator-projectpane_orig.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac97b8b7e73c46853794e235e80cb5c31665dea0
Binary files /dev/null and b/doc/images/qtcreator-projectpane_orig.png differ
diff --git a/doc/images/qtcreator-qt4-qtversions-win-mingw.png b/doc/images/qtcreator-qt4-qtversions-win-mingw.png
index 759b72eccce2a48ed49dfb101bb3bf8bbe9192b0..c210a8ef4cd337c664cb46a35a311fea4fa80653 100644
Binary files a/doc/images/qtcreator-qt4-qtversions-win-mingw.png and b/doc/images/qtcreator-qt4-qtversions-win-mingw.png differ
diff --git a/doc/images/qtcreator-qt4-qtversions-win-msvc.png b/doc/images/qtcreator-qt4-qtversions-win-msvc.png
index 0b84fe1545f936d7c22cd25996ce1ebf8b1c29bd..86811a3fa552c718bc24476a92022264e471cd1c 100644
Binary files a/doc/images/qtcreator-qt4-qtversions-win-msvc.png and b/doc/images/qtcreator-qt4-qtversions-win-msvc.png differ
diff --git a/doc/images/qtcreator-qt4-qtversions-win-symbian.png b/doc/images/qtcreator-qt4-qtversions-win-symbian.png
index da179a66951b7dc44cad7e0504b24f290bfadf19..35fb52c93c1d97b19cf7f3300df2d38bdde861ec 100644
Binary files a/doc/images/qtcreator-qt4-qtversions-win-symbian.png and b/doc/images/qtcreator-qt4-qtversions-win-symbian.png differ
diff --git a/doc/images/qtcreator-qt4-s60sdks.png b/doc/images/qtcreator-qt4-s60sdks.png
index 8f8c5da722b61c11a98c68763ecf55900d4c0f60..cefbcffc92a50dea20759abce7703c5481f36956 100644
Binary files a/doc/images/qtcreator-qt4-s60sdks.png and b/doc/images/qtcreator-qt4-s60sdks.png differ
diff --git a/doc/images/qtcreator-symbian-add-buildconfiguration.png b/doc/images/qtcreator-symbian-add-buildconfiguration.png
index a0b40ac402dcdc54ab417678e1560ccf3d119638..44d295d2d5eea713afe01fbc7a41408b8087f815 100644
Binary files a/doc/images/qtcreator-symbian-add-buildconfiguration.png and b/doc/images/qtcreator-symbian-add-buildconfiguration.png differ
diff --git a/doc/images/qtcreator-symbian-add-run-in-emulator.png b/doc/images/qtcreator-symbian-add-run-in-emulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..51f39216507ac8e87da7a083a23fbff1a7696fbb
Binary files /dev/null and b/doc/images/qtcreator-symbian-add-run-in-emulator.png differ
diff --git a/doc/images/qtcreator-symbian-add-runconfiguration.png b/doc/images/qtcreator-symbian-add-runconfiguration.png
index aa244a9acea37e46f7e508076b14285437b824fa..1dc94616fc3c05af46d3197a2065b55420d4cb05 100644
Binary files a/doc/images/qtcreator-symbian-add-runconfiguration.png and b/doc/images/qtcreator-symbian-add-runconfiguration.png differ
diff --git a/doc/images/qtcreator-symbian-change-buildconfiguration.png b/doc/images/qtcreator-symbian-change-buildconfiguration.png
index a8e6c77f0f2ad47007378c862f60c692c39ba87b..509adc375fcd2c7675542f5c41fc15dd8520df95 100644
Binary files a/doc/images/qtcreator-symbian-change-buildconfiguration.png and b/doc/images/qtcreator-symbian-change-buildconfiguration.png differ
diff --git a/doc/images/qtcreator-symbian-change-run-in-emulator.png b/doc/images/qtcreator-symbian-change-run-in-emulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..c53ea80e81a170f9f56166af7fc8f857ebe4e396
Binary files /dev/null and b/doc/images/qtcreator-symbian-change-run-in-emulator.png differ
diff --git a/doc/images/qtcreator-symbian-change-runconfiguration.png b/doc/images/qtcreator-symbian-change-runconfiguration.png
index a67670716479258a25d1ff95f86d0a818e135df7..8a090c3298ae77d905fddbe91432b401d9ee5348 100644
Binary files a/doc/images/qtcreator-symbian-change-runconfiguration.png and b/doc/images/qtcreator-symbian-change-runconfiguration.png differ
diff --git a/doc/images/qtcreator-symbian-details-runconfiguration.png b/doc/images/qtcreator-symbian-details-runconfiguration.png
index 0389603f6e854f839be87aae77ec197bfe86d371..959bf110bebde4f12d5e79273a4aa09d1ab675a5 100644
Binary files a/doc/images/qtcreator-symbian-details-runconfiguration.png and b/doc/images/qtcreator-symbian-details-runconfiguration.png differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 54ecae36bc7a6f5cad0823812f9cb067ecb65b28..afb746b62636bcb2b63788035079fcedbdae1832 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -27,7 +27,7 @@
\o \l{A Quick Tour of Qt Creator}
\o \l{Creating a Project in Qt Creator}
\o \l{The Code Editor}
- \o \l{Build Settings}
+ \o \l{Project Settings}
\o \l{Qt Version Management}
\o \l{Writing a Simple Program with Qt Creator}
\o \l{Qt Creator and Version Control Systems}
@@ -397,7 +397,7 @@
Qt Creator automatically detects if \c qmake is in the environment variable
\c PATH. This \l{glossary-system-qt}{version of Qt} is referred to as
- \bold{Auto-detected Qt}. If you intend to use only one version of Qt - it is
+ \bold{Qt in PATH}. If you intend to use only one version of Qt - it is
already in your path and correctly set up for command line usage - you do
not need to manually configure your Qt version.
@@ -413,7 +413,8 @@
\i \image qtcreator-qt4-qtversions.png
On Linux and Mac OS X, simply set the \gui{Path to QMake}
to the \c qmake binary of the Qt installation. If a Qt is
- found in the \c PATH environment variable, it will show up.
+ found in the \c PATH environment variable, it will show up
+ automatically as \gui{Qt in PATH}.
On both platforms, the platforms Gnu Compiler Collection (GCC)
is used to compile Qt. On Mac OS, the GCC compiler is part of XCode.
@@ -445,13 +446,20 @@
\row
\i \image qtcreator-qt4-qtversions-win-symbian.png
If you are using Qt for Symbian and your S60 SDK is registered
- with \c devices.exe, Qt Creator will detect the Qt version automatically.
- A known issue is that you cannot just point Creator to \c qmake.exe of Qt for Symbian.
- You can add the path to the Metrowerks Compiler (\gui {MWC Directory})
- if you want to use to build for the emulator. This requires Carbide 2.0
- to be installed. the MWC directory should then point to the directory
- of your Carbide installation. However, this not needed for compiling for
- the device.
+ with \c devices.exe, Qt Creator will detect the Qt version
+ automatically. These are shown in the \bold{Auto-detected}
+ section in the options dialog.
+ You can also manually add Qt for Symbian versions. In this case
+ you need to tell Qt Creator the path to the S60 SDK
+ it is supposed to use with these Qt installations.
+ Add the path to your Carbide C++ install, version 2.0
+ or later, if you want to build for the emulator
+ (\c WINSCW tool chain).
+ If you want to use \c GCCE to build for your device,
+ you might need to add the path to the
+ \c{CSL Arm Toolchain} directory (\gui{CSL/GCCE Directory}),
+ if the compiler is not found in the \c PATH environment
+ variable.
\endtable
\note By default projects are compiled with the
@@ -1600,31 +1608,27 @@
For each detected S60 SDK with Qt, a special entry is made in the Qt Version Management settings
\gui{Tools -> Options... -> Qt4 -> Qt Versions}.
- \e{Note that you must use one of these special Qt version entries for building projects
- for the emulator or devices. You can not just point Qt Creator to the qmake executable
- like you would do for a desktop version of Qt.}
+ \e{Note that if you manually add a Qt version for Symbian, you must
+ also manually specify the S60 SDK to use for this version.}
\image qtcreator-qt4-qtversions-win-symbian.png
If you want to run your applications in the Symbian Emulator, you need to point Qt Creator
- to the Metrowerks Compiler that you want to use, by setting the \gui{MWC Directory}
+ to the Metrowerks Compiler that you want to use, by setting the \gui{Carbide Directory}
of the Qt version to the corresponding Carbide.c++ installation directory.
You can check what S60 SDKs and corresponding Qt versions are found in the
\gui{Tools -> Options... -> Qt4 -> S60 SDKs} preference page.
- At the moment it is not possible to override the autodetected settings.
\image qtcreator-qt4-s60sdks.png
- \section2 Setting up Your Project
+ \section2 Building your Project
After installing all the prerequisites and checking the setup in Qt Creator as described
above, you need to make some settings for your project.
\e{Note that the only supported build system for Qt for Symbian applications in Qt Creator
is qmake.}
- \section3 Building your Project
-
Before you can build your project for the Symbian Platform you need to create build
configurations for it.
Open \gui{Projects mode} and make sure that your project is selected for editing in
@@ -1644,11 +1648,26 @@
\image qtcreator-symbian-change-buildconfiguration.png
+ \section2 Running your Project
+
+ \section3 Running your Project in the Emulator
+
+ Similar to the build configuration setup for your project you need to create a run
+ configuration for running your project in the Symbian emulator: Switch to \gui{Projects mode}
+ and in \gui{Run Settings} you will find the \gui{Add -> YourApplication in Symbian Emulator}
+ button.
+
+ \image qtcreator-symbian-add-run-in-emulator.png
+
+ To start your project in the emulator select this run configuration as the active configuration
+ at the top of \gui{Projects mode} and press the run button.
+
+ \image qtcreator-symbian-change-run-in-emulator.png
+
\section3 Running your Project on the Device
- Similar to the build configuration setup for your project you need to create a run configuration
- for running your project on a Symbian device. Add a new run configuration in \gui{Projects mode}
- via \gui{Run Settings}, \gui{Add -> YourApplication on Symbian Device} button.
+ To run your project on a real Symbian device, just add another run configuration in
+ \gui{Projects mode} via \gui{Run Settings}, \gui{Add -> YourApplication on Symbian Device} button.
\image qtcreator-symbian-add-runconfiguration.png
@@ -1664,11 +1683,19 @@
\image qtcreator-symbian-change-runconfiguration.png
+ \section2 Troubleshooting
+
When something goes wrong check the following things:
\list
- \o Is the device run configuration selected as the active run configuration?
- \o Did you build your application with one of the special Qt versions created for the
- S60 SDKs?
+ \o Did you build your application with a Qt version for Symbian?
+ \o Are the settings for the Qt version you use to build your project correct? Check the
+ path to the S60 SDK, and if you need to specify the path to your compiler tool chain.
+ \o Is the emulator/device run configuration selected as the active run configuration?
+ \o Did you build using the right toolchain, i. e. WINSCW for running in the Emulator,
+ GCCE or RVCT for running on the device?
+ \o If the emulator process could not be started, try closing Creator and starting the
+ application directly from your file manager. Having done this, Creator should be
+ able to run your projects in the Emulator.
\o Is the device connected via USB in \e{PC Suite} mode?
\o Is App TRK running on the device, using the USB connection, and does it have status
\e{connected}?
@@ -1887,11 +1914,12 @@
\row
\o
\raw HTML
- Auto-detected Qt
+ Qt in PATH
\endraw
\target glossary-system-qt
- \o The version of Qt installed on your system. This is the Qt
- version for the \c qmake command found in your \c PATH.
+ \o This is the Qt
+ version for the \c qmake command found in your \c PATH
+ environment variable.
\row
\o
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index dd51f806bd75836a7dd5cf990bc4f0dee8baa924..0af17f99cb39be7a306ab8cd2d3c2c4433681b50 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -2135,19 +2135,23 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
*value = qvariant_cast<QColor>(*v).name();
break;
case QVariant::KeySequence:
+ #ifndef QT_NO_SHORTCUT
*value = qvariant_cast<QKeySequence>(*v).toString();
+ #else
+ *value = QString::fromLatin1("Disabled by QT_NO_SHORTCUT");
+ #endif
break;
case QVariant::SizePolicy:
*value = sizePolicyValue(qvariant_cast<QSizePolicy>(*v));
break;
#endif
default: {
- static const char *qTypeFormat = sizeof(void *) == sizeof(long) ?
- "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%lx)" :
- "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%llx)";
- static const char *nonQTypeFormat = sizeof(void *) == sizeof(long) ?
- "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%lx)" :
- "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%llx)";
+ static const char *qTypeFormat = sizeof(void *) == sizeof(long)
+ ? "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%lx)"
+ : "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%llx)";
+ static const char *nonQTypeFormat = sizeof(void *) == sizeof(long)
+ ? "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%lx)"
+ : "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%llx)";
char buf[1000];
const char *format = (v->typeName()[0] == 'Q') ? qTypeFormat : nonQTypeFormat;
qsnprintf(buf, sizeof(buf) - 1, format, v->typeName(), v->typeName(), v);
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 523d203aefa232ff43243d6a55990563223bad2a..77c63fb7c7a75f2bf9c31ed3b6545bd47a7ae1b2 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -12009,8 +12009,8 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <source>CLS/GCCE Directory:</source>
- <translation>CLS/GCCE:</translation>
+ <source>CSL/GCCE Directory:</source>
+ <translation>CSL/GCCE:</translation>
</message>
</context>
<context>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index f45b49cf79d3b023cfc9ff4d9e4ebe3b93d2ff0c..382130868f256b39d7a4c36d65d84a7cba68b9b5 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -44,7 +44,7 @@
<message>
<location/>
<source>Compatibility Version:</source>
- <translation type="unfinished"></translation>
+ <translation>Zgodność z wersją:</translation>
</message>
<message>
<location/>
@@ -197,7 +197,7 @@
<translation>Ścieżka:</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+416"/>
+ <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+417"/>
<source>Invalid base class name</source>
<translation>Niepoprawna nazwa klasy podstawowej</translation>
</message>
@@ -221,6 +221,21 @@
<source>Inherits QObject</source>
<translation>Wywodzi siÄ™ z QObject</translation>
</message>
+ <message>
+ <location/>
+ <source>Type information:</source>
+ <translation>Informacja o typie:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>None</source>
+ <translation>Brak</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Inherits QWidget</source>
+ <translation>Wywiedziony z QWidget</translation>
+ </message>
</context>
<context>
<name>Utils::ProjectIntroPage</name>
@@ -507,7 +522,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/cpaster/pasteview.ui"/>
<source>Send to Codepaster</source>
- <translation type="unfinished">Wyślij do </translation>
+ <translation>Wyślij do Codepaster</translation>
</message>
<message>
<location/>
@@ -579,7 +594,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>CodePaster</source>
- <translation type="unfinished"></translation>
+ <translation>CodePaster</translation>
</message>
<message>
<location/>
@@ -604,12 +619,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Display Output Pane after sending a post</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż panel wyjścia po wysłaniu kodu</translation>
</message>
<message>
<location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
<source>Code Pasting</source>
- <translation type="unfinished"></translation>
+ <translation>Wklejanie kodu</translation>
</message>
</context>
<context>
@@ -642,12 +657,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Insert the common prefix of available completion items.</source>
- <translation type="unfinished"></translation>
+ <translation>Wprowadź wspólny przedrostek dla istniejących elementów dopełnienia.</translation>
</message>
<message>
<location/>
<source>Autocomplete common &prefix</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie dopełniaj wspólny &przedrostek</translation>
</message>
</context>
<context>
@@ -688,12 +703,12 @@ p, li { white-space: pre-wrap; }
<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 type="unfinished"></translation>
+ <translation>Gdy zaznaczone, wszystkie pliki powiązane z bieżącą operacją zostaną wyświetlone po kliknięciu na numer rewizji w widoku adnotacji (odzyskane przez identyfikator operacji). W przeciwnym razie, wyświetlony będzie tylko określony plik.</translation>
</message>
<message>
<location/>
<source>Describe all files matching commit id:</source>
- <translation type="unfinished"></translation>
+ <translation>Opisz wszystkie pliki pasujÄ…ce do identyfikatora operacji:</translation>
</message>
<message>
<location/>
@@ -708,7 +723,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Diff Options:</source>
- <translation type="unfinished"></translation>
+ <translation>Parametry różnicowania:</translation>
</message>
<message>
<location filename="../../../src/plugins/cvs/settingspage.cpp" line="+84"/>
@@ -731,7 +746,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Core File:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik zrzutu:</translation>
</message>
</context>
<context>
@@ -780,7 +795,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Ignore count:</source>
- <translation type="unfinished"></translation>
+ <translation>Licznik pominięć:</translation>
</message>
</context>
<context>
@@ -788,7 +803,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
<source>These options take effect at the next start of Qt Creator.</source>
- <translation type="unfinished"></translation>
+ <translation>Te opcje zostanÄ… zastosowanie po ponownym uruchomieniu Qt Creator.</translation>
</message>
<message>
<location/>
@@ -824,13 +839,13 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Verbose Symbol Loading</source>
- <translation type="unfinished"></translation>
+ <translation>Gadatliwe Å‚adowanie symboli</translation>
</message>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
<source><html><body><p>Specify the path to the <a href="%1">Debugging Tools for Windows</a> (%2) here.</p><p><b>Note:</b> Restarting Qt Creator is required for these settings to take effect.</p></p></body></html></source>
<extracomment>Label text for path configuration. %2 is "x-bit version".</extracomment>
- <translation type="unfinished"></translation>
+ <translation><html><body><p>Określ tutaj ścieżkę do <a href="%1">Narzędzi debugowania dla Windows</a> (%2).</p><p><b>Uwaga:</b> żeby zmiany odniosły skutek, konieczne jest ponowne uruchomienie programu.</p></p></body></html></translation>
</message>
<message>
<location line="+5"/>
@@ -858,12 +873,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Populate source file view automatically</source>
- <translation>Wypełnij automatycznie widok pliku źródłowego</translation>
+ <translation>Wypełniaj automatycznie widok pliku źródłowego</translation>
</message>
<message>
<location/>
<source>Show a message box when receiving a signal</source>
- <translation>Pokaż komunikat po otrzymaniu sygnału</translation>
+ <translation>Pokazuj komunikat po otrzymaniu sygnału</translation>
</message>
<message>
<location/>
@@ -879,17 +894,17 @@ p, li { white-space: pre-wrap; }
<location/>
<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="unfinished"></translation>
+ <translation>Kiedy ta opcja jest zaznaczona "Wskocz do wnętrza" kompresuje w pewnych sytuacjach kilka kroków w jeden, co prowadzi do przejrzystszego debugowania. I tak np. kod atomowego licznika referencji będzie pominięty, a pojedyńcze "Wskocz do wnętrza" dla emisji sygnału wskoczy bezpośrednio do podłączonego slotu.</translation>
</message>
<message>
<location/>
<source>Skip known frames when stepping</source>
- <translation type="unfinished"></translation>
+ <translation>Pomijaj znane kroki</translation>
</message>
<message>
<location/>
<source>Enable reverse debugging</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚Ä…cz debugowanie wsteczne</translation>
</message>
<message>
<location/>
@@ -907,17 +922,17 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
<source>Debugging helper</source>
- <translation type="unfinished"></translation>
+ <translation>Asystent debuggera</translation>
</message>
<message>
<location/>
<source>This will enable nice display of Qt and Standard Library objects in the Locals&Watchers view</source>
- <translation type="unfinished"></translation>
+ <translation>To włącza bardziej przejrzyste wyświetlanie obiektów Qt i Biblioteki Standardowej w widoku ze zmiennymi lokalnymi i obserwowanymi</translation>
</message>
<message>
<location/>
<source>Use debugging helper</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj asystenta debuggera</translation>
</message>
<message>
<location/>
@@ -927,7 +942,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Use debugging helper from custom location</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj asystenta debuggera z innego położenia</translation>
</message>
<message>
<location/>
@@ -937,12 +952,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Debug debugging helper</source>
- <translation type="unfinished"></translation>
+ <translation>Debuguj asystenta debuggera</translation>
</message>
<message>
<location/>
<source>Makes use of Qt Creator's code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source>
- <translation type="unfinished"></translation>
+ <translation>Korzysta z modelu kodu Qt Creator'a w celu zbadania czy wartość została już przypisana do zmiennej w chwili przerwania debuggera.</translation>
</message>
<message>
<location/>
@@ -1168,7 +1183,7 @@ p, li { white-space: pre-wrap; }
<translation>Skonfiguruj...</translation>
</message>
<message>
- <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+148"/>
+ <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+149"/>
<source>%1 - Error</source>
<translation>%1 - BÅ‚Ä…d</translation>
</message>
@@ -1193,12 +1208,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Expand tabulators:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozwijaj tabulatory:</translation>
</message>
<message>
<location/>
<source>Highlight search results:</source>
- <translation type="unfinished"></translation>
+ <translation>Podświetlaj wyniki poszukiwań:</translation>
</message>
<message>
<location/>
@@ -1208,12 +1223,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Smart tabulators:</source>
- <translation type="unfinished"></translation>
+ <translation>Inteligentne tabulatory:</translation>
</message>
<message>
<location/>
<source>Start of line:</source>
- <translation type="unfinished"></translation>
+ <translation>PoczÄ…tek wiersza:</translation>
</message>
<message>
<location/>
@@ -1223,7 +1238,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Tabulator size:</source>
- <translation type="unfinished"></translation>
+ <translation>Wielkość tabulatorów:</translation>
</message>
<message>
<location/>
@@ -1238,22 +1253,22 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Automatic indentation:</source>
- <translation type="unfinished"></translation>
+ <translation>Automatyczne wcięcia:</translation>
</message>
<message>
<location/>
<source>Incremental search:</source>
- <translation type="unfinished"></translation>
+ <translation>Wyszukiwanie przyrostowe:</translation>
</message>
<message>
<location/>
<source>Copy text editor settings</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj ustawienia edytora tekstu</translation>
</message>
<message>
<location/>
<source>Set Qt style</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw styl Qt</translation>
</message>
<message>
<location/>
@@ -1332,7 +1347,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericmakestep.ui"/>
<source>Override %1:</source>
- <translation>Nadpisanie %1:</translation>
+ <translation>ZastÄ…pienie %1:</translation>
</message>
<message>
<location/>
@@ -1380,7 +1395,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+20"/>
<source>Unable to find the repository directory for '%1'.</source>
- <translation>Nie można znależć katalogu składnicy "%1".</translation>
+ <translation>Nie można znaleźć katalogu składnicy "%1".</translation>
</message>
<message>
<location line="+69"/>
@@ -1747,32 +1762,32 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Startup</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie</translation>
</message>
<message>
<location/>
<source>On context help:</source>
- <translation type="unfinished"></translation>
+ <translation>Podręczna pomoc:</translation>
</message>
<message>
<location/>
<source>Show side-by-side if possible</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj z boku jeśli jest miejsce</translation>
</message>
<message>
<location/>
<source>Always show side-by-side</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze pokazuj z boku</translation>
</message>
<message>
<location/>
<source>Always start full help</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze zaczynaj od pełnej pomocy</translation>
</message>
<message>
<location/>
<source>On help start:</source>
- <translation type="unfinished"></translation>
+ <translation>Po uruchomieniu pomocy:</translation>
</message>
<message>
<location/>
@@ -1958,7 +1973,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/processstep.ui"/>
<source>Enable Custom Process Step</source>
- <translation type="unfinished"></translation>
+ <translation>Włącz własny krok procesu</translation>
</message>
<message>
<location/>
@@ -2049,7 +2064,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+3"/>
<source>%1 (current session)</source>
- <translation type="unfinished"></translation>
+ <translation>%1 (bieżąca sesja)</translation>
</message>
<message>
<location line="+46"/>
@@ -2210,12 +2225,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>The header file has to be specified in source code.</source>
- <translation>Plik nagłowkowy musi wystąpić w kodzie źródłowym.</translation>
+ <translation>Plik nagłówkowy musi wystąpić w kodzie źródłowym.</translation>
</message>
<message>
<location/>
<source>Widge&t source file:</source>
- <translation>Plik żródłowy widże&tu:</translation>
+ <translation>Plik źródłowy widże&tu:</translation>
</message>
<message>
<location/>
@@ -2318,27 +2333,27 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Plugin and Collection Class Information</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje o wtyczce i o klasie z kolekcjÄ…</translation>
</message>
<message>
<location/>
<source>Specify the properties of the plugin library and the collection class.</source>
- <translation type="unfinished"></translation>
+ <translation>Podaj dane o wtyczce i o klasie z kolekcjÄ….</translation>
</message>
<message>
<location/>
<source>Collection class:</source>
- <translation type="unfinished"></translation>
+ <translation>Klasa z kolekcjÄ…:</translation>
</message>
<message>
<location/>
<source>Collection header file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nagłówkowy kolekcji:</translation>
</message>
<message>
<location/>
<source>Collection source file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik źródłowy kolekcji:</translation>
</message>
<message>
<location/>
@@ -2386,7 +2401,9 @@ p, li { white-space: pre-wrap; }
<source>Use Virtual Box
Note: This adds the toolchain to the build environment and runs the program inside a virtual machine.
It also automatically sets the correct Qt version.</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj Virtual Box
+Uwaga: dodaje narzędzia do środowiska kompilacji i uruchamia program w ramach maszyny wirtualnej.
+Jednocześnie samoczynnie ustawia odpowiednią wersję Qt.</translation>
</message>
<message>
<location/>
@@ -2439,7 +2456,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location line="+2"/>
<source>Understanding widgets</source>
- <translation>Pojęcie widżetów</translation>
+ <translation>Zgłębianie widżetów</translation>
</message>
<message>
<location line="+2"/>
@@ -2459,12 +2476,12 @@ It also automatically sets the correct Qt version.</source>
<message>
<location line="+81"/>
<source>Copy Project to writable Location?</source>
- <translation type="unfinished"></translation>
+ <translation>Kopiować projekt do miejsca zapisywalnego?</translation>
</message>
<message>
<location line="+3"/>
<source><p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p></source>
- <translation type="unfinished"></translation>
+ <translation><p>Projekt, który masz zamiar załadować, znajduje się w miejscu zabezpieczonym przed zapisem:</p><blockquote>%1</blockquote><p>Proszę wybrać miejsce z prawami do zapisu i kliknąć "Skopiuj projekt i otwórz", żeby załadować edytowalną kopię projektu lub kliknąć "Zostaw projekt i otwórz", żeby załadować projekt z miejsca, gdzie się obecnie znajduje.</p><p><b>Uwaga:</b> Nie będzie można zmienić lub skompilować projektu w bieżącej lokalizacji.</p></translation>
</message>
<message>
<location line="+8"/>
@@ -2479,7 +2496,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location line="+2"/>
<source>&Keep Project and Open</source>
- <translation type="unfinished"></translation>
+ <translation>Po&zostaw projekt i otwórz</translation>
</message>
<message>
<location line="+10"/>
@@ -2518,13 +2535,12 @@ It also automatically sets the correct Qt version.</source>
<message>
<location line="+4"/>
<source>You can show and hide the side bar using <tt>%1+0<tt>.</source>
- <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
<translation>Możesz pokazać lub schować boczny pasek używając <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 type="unfinished">Możesz wyregulować działanie funkcji <tt>Znajdź</tt> poprzez wybranie &quot;Tylko całe słowa&quot; lub &quot;Uwzględniaj wielkość liter&quot;. W tym celu naciśnij ikonę w prawym końcu pola edycyjnego.</translation>
+ <translation>Możesz wyregulować działanie funkcji <tt>Znajdź</tt> poprzez wybranie &quot;Tylko całe słowa&quot; lub &quot;Uwzględniaj wielkość liter&quot;. W tym celu naciśnij ikonę po prawej stronie pola edycyjnego.</translation>
</message>
<message>
<location line="+2"/>
@@ -2554,13 +2570,12 @@ It also automatically sets the correct Qt version.</source>
<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>
- <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
<translation>Możesz przełączać panele wyjściowe naciskając <tt>%1+n</tt> gdzie n jest odpowiednim numerem na przycisku u dołu okna:<ul><li>1 - Problemy podczas budowania</li><li>2 - Wyniki poszukiwania</li><li>3 - Wyjście aplikacji</li><li>4 - Wyjście kompilacji</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>Używając <a href="qthelp://com.nokia.qtcreator/doc/creator-navigation.html">lokalizatora</a> (<tt>%1+K</tt>) możesz szybko znależć metody, klasy, itd. lub przeszukać dokumentację.</translation>
+ <translation>Używając <a href="qthelp://com.nokia.qtcreator/doc/creator-navigation.html">lokalizatora</a> (<tt>%1+K</tt>) możesz szybko znaleźć metody, klasy, itd. lub przeszukać dokumentację.</translation>
</message>
<message>
<location line="+2"/>
@@ -2579,11 +2594,6 @@ It also automatically sets the correct Qt version.</source>
</message>
<message>
<location line="+1"/>
- <source>You can modify the binary that is being executed when you press the <tt>Run</tt> button: Add a <tt>Custom Executable</tt> by clicking the <tt>+</tt> button in <tt>Projects -> Run Settings -> Run Configuration</tt> and then select the new target in the combo box.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
<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>Możesz używać Qt Creator'a z wieloma różnymi <a href="qthelp://com.nokia.qtcreator/doc/creator-version-control.html">systemami kontroli wersji</a> takimi jak Subversion, Perforce, CVS i Git.</translation>
</message>
@@ -2602,7 +2612,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/makestep.ui"/>
<source>Override %1:</source>
- <translation>Nadpisanie %1:</translation>
+ <translation>ZastÄ…pienie %1:</translation>
</message>
<message>
<location/>
@@ -2635,7 +2645,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location/>
<source>Effective qmake call:</source>
- <translation type="unfinished"></translation>
+ <translation>Ostateczna komenda qmake:</translation>
</message>
</context>
<context>
@@ -2648,7 +2658,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location/>
<source>Installed S60 SDKs:</source>
- <translation type="unfinished"></translation>
+ <translation>Zainstalowane SDK S60:</translation>
</message>
<message>
<location/>
@@ -2658,17 +2668,17 @@ It also automatically sets the correct Qt version.</source>
<message>
<location/>
<source>Qt Location</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie Qt</translation>
</message>
<message>
<location/>
<source>Refresh</source>
- <translation type="unfinished">Odśwież</translation>
+ <translation>Odśwież</translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+96"/>
<source>S60 SDKs</source>
- <translation type="unfinished"></translation>
+ <translation>SDK S60</translation>
</message>
</context>
<context>
@@ -2691,7 +2701,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location/>
<source>Shadow Build:</source>
- <translation type="unfinished"></translation>
+ <translation>Kompilacja w innym miejscu:</translation>
</message>
<message>
<location/>
@@ -2716,7 +2726,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+71"/>
<source>Shadow Build Directory</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog kompilacji w innym miejscu</translation>
</message>
<message>
<location line="+23"/>
@@ -2789,7 +2799,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Debugging Helper</source>
- <translation type="unfinished"></translation>
+ <translation>Asystent debuggera</translation>
</message>
<message>
<location/>
@@ -2802,9 +2812,8 @@ p, li { white-space: pre-wrap; }
<translation>Położenie QMake:</translation>
</message>
<message>
- <location/>
- <source>MinGW Directory:</source>
- <translation>Katalog MinGW:</translation>
+ <source>MinGw Directory:</source>
+ <translation type="obsolete">Katalog MinGW:</translation>
</message>
<message>
<location/>
@@ -2814,7 +2823,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Debugging Helper:</source>
- <translation type="unfinished"></translation>
+ <translation>Asystent debuggera:</translation>
</message>
<message>
<location/>
@@ -2833,8 +2842,13 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <source>CLS/GCCE Directory:</source>
- <translation type="unfinished"></translation>
+ <source>CSL/GCCE Directory:</source>
+ <translation>Katalog CSL/GCCE:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>MinGW Directory:</source>
+ <translation>Katalog MinGW:</translation>
</message>
</context>
<context>
@@ -2842,7 +2856,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/qt4projectmanager/showbuildlog.ui"/>
<source>Debugging Helper Build Log</source>
- <translation type="unfinished"></translation>
+ <translation>Dziennik kompilacji asystenta debuggera</translation>
</message>
</context>
<context>
@@ -3102,7 +3116,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/texteditor/displaysettingspage.ui"/>
<source>Display</source>
- <translation type="unfinished"></translation>
+ <translation>Wyświetlanie</translation>
</message>
<message>
<location/>
@@ -3117,7 +3131,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Display &folding markers</source>
- <translation type="unfinished"></translation>
+ <translation>Wyświetlaj znaczniki &składania bloków</translation>
</message>
<message>
<location/>
@@ -3157,7 +3171,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Display right &margin at column:</source>
- <translation>Wyświetl prawy &margines w kolumnie:</translation>
+ <translation>Wyświetlaj prawy &margines w kolumnie:</translation>
</message>
<message>
<location/>
@@ -3249,7 +3263,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/vcsbase/vcsbasesettingspage.ui"/>
<source>Common</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
</message>
<message>
<location/>
@@ -3314,32 +3328,32 @@ name <email> alias <email></source>
<message>
<location line="+3"/>
<source>Qt Home</source>
- <translation type="unfinished"></translation>
+ <translation>Strona główna Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Labs</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Labs</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Git Hosting</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica Git dla Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Centre</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Centre</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Apps</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Apps</translation>
</message>
<message>
<location line="+1"/>
<source>Qt for Symbian at Forum Nokia</source>
- <translation type="unfinished"></translation>
+ <translation>Qt dla Symbiana na forum Nokii</translation>
</message>
</context>
<context>
@@ -3583,7 +3597,7 @@ name <email> alias <email></source>
<message>
<location/>
<source>Unique (*=)</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj niepowtarzalny (*=)</translation>
</message>
<message>
<location/>
@@ -3674,7 +3688,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/app/main.cpp" line="+129"/>
<source>Failed to load core: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie udało się załadować zrzutu: %1</translation>
</message>
<message>
<location line="+5"/>
@@ -3684,12 +3698,12 @@ name <email> alias <email></source>
<message>
<location line="+135"/>
<source>Could not find 'Core.pluginspec' in %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć "Core.pluginspec" w %1</translation>
</message>
<message>
<location line="+36"/>
<source>Qt Creator - Plugin loader messages</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator - komunikaty Å‚adowania wtyczek</translation>
</message>
</context>
<context>
@@ -3739,27 +3753,27 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/libs/extensionsystem/pluginerrorview.cpp" line="+79"/>
<source>Invalid</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna</translation>
</message>
<message>
<location line="+1"/>
<source>Description file found, but error on read</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z opisem został znaleziony lecz wystąpił błąd podczas czytania</translation>
</message>
<message>
<location line="+3"/>
<source>Read</source>
- <translation type="unfinished"></translation>
+ <translation>Wczytana</translation>
</message>
<message>
<location line="+1"/>
<source>Description successfully read</source>
- <translation type="unfinished"></translation>
+ <translation>Opis pomyślnie wczytany</translation>
</message>
<message>
<location line="+3"/>
<source>Resolved</source>
- <translation type="unfinished"></translation>
+ <translation>RozwiÄ…zana</translation>
</message>
<message>
<location line="+1"/>
@@ -3769,17 +3783,17 @@ name <email> alias <email></source>
<message>
<location line="+3"/>
<source>Loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Załadowana</translation>
</message>
<message>
<location line="+1"/>
<source>Library is loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Biblioteka załadowana</translation>
</message>
<message>
<location line="+3"/>
<source>Initialized</source>
- <translation type="unfinished"></translation>
+ <translation>Zainicjalizowana</translation>
</message>
<message>
<location line="+1"/>
@@ -3789,7 +3803,7 @@ name <email> alias <email></source>
<message>
<location line="+3"/>
<source>Running</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchomiona</translation>
</message>
<message>
<location line="+1"/>
@@ -3799,22 +3813,22 @@ name <email> alias <email></source>
<message>
<location line="+3"/>
<source>Stopped</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymana</translation>
</message>
<message>
<location line="+1"/>
<source>Plugin was shut down</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczka została zamknięta</translation>
</message>
<message>
<location line="+2"/>
<source>Deleted</source>
- <translation type="unfinished"></translation>
+ <translation>Usunięta</translation>
</message>
<message>
<location line="+1"/>
<source>Plugin ended its life cycle and was deleted</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczka zakończyła działanie i została usunięta</translation>
</message>
</context>
<context>
@@ -3905,7 +3919,7 @@ Przyczyna: %3</translation>
<message>
<location line="+234"/>
<source>Resolving dependencies failed because state != Read</source>
- <translation type="unfinished"></translation>
+ <translation>Rozwiązanie zależności nie udało się, bo stan wtyczki jest inny niż "wczytana"</translation>
</message>
<message>
<location line="+17"/>
@@ -3915,22 +3929,22 @@ Przyczyna: %3</translation>
<message>
<location line="+24"/>
<source>Loading the library failed because state != Resolved</source>
- <translation type="unfinished"></translation>
+ <translation>Åadowanie biblioteki nie powiodÅ‚o siÄ™, bo stan wtyczki jest inny niż "rozwiÄ…zana"</translation>
</message>
<message>
<location line="+35"/>
<source>Plugin is not valid (does not derive from IPlugin)</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczka jest niepoprawna (nie jest wywiedziona z IPlugin)</translation>
</message>
<message>
<location line="+21"/>
<source>Initializing the plugin failed because state != Loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Zainicjowanie wtyczki nie powiodło się, bo jej stan jest inny niż "załadowana"</translation>
</message>
<message>
<location line="+5"/>
<source>Internal error: have no plugin instance to initialize</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd wewnętrzny: brak wtyczki do zainicjalizowania</translation>
</message>
<message>
<location line="+6"/>
@@ -3940,12 +3954,12 @@ Przyczyna: %3</translation>
<message>
<location line="+19"/>
<source>Cannot perform extensionsInitialized because state != Initialized</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można wykonać extensionsInitialized bo stan wtyczki jest inny niż "zainicjowana"</translation>
</message>
<message>
<location line="+5"/>
<source>Internal error: have no plugin instance to perform extensionsInitialized</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd wewnętrzny: brak instancji wtyczki potrzebnej do wykonania extensionsInitialized</translation>
</message>
</context>
<context>
@@ -4019,12 +4033,12 @@ Przyczyna: %3</translation>
<message>
<location line="+5"/>
<source>Unexpected output from helper program.</source>
- <translation type="unfinished"></translation>
+ <translation>Nieoczekiwany komunikat od programu pomocniczego.</translation>
</message>
<message>
<location line="+5"/>
<source>Cannot change to working directory '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zmienić katalogu roboczego na '%1': %2</translation>
</message>
<message>
<location line="+5"/>
@@ -4034,7 +4048,7 @@ Przyczyna: %3</translation>
<message>
<location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+111"/>
<source>Cannot start the terminal emulator '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić emulatora terminala "%1".</translation>
</message>
<message>
<location line="+49"/>
@@ -4342,7 +4356,7 @@ Przyczyna: %3</translation>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+125"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+123"/>
<source>CMake Wizard</source>
<translation>Kreator CMake</translation>
</message>
@@ -4408,27 +4422,27 @@ Przyczyna: %3</translation>
<message>
<location line="+19"/>
<source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun cmake. Or simply finish the wizard directly</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog %1 zawiera już uaktualniony plik cbp. Możesz przekazać specjalne argumenty lub zmienić istniejący zestaw narzędzi i ponownie uruchomić cmake. Możesz również bezpośrednio zakończyć kreatora.</translation>
</message>
<message>
<location line="+5"/>
<source>The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running cmake. Some projects require command line arguments to the initial cmake call.</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog %1 nie zawiera pliku cbp. Qt Creator wymaga utworzenia go poprzez uruchomienie cmake. Niektóre projekty wymagają dodatkowych argumentów w komendzie cmake.</translation>
</message>
<message>
<location line="+4"/>
<source>The directory %1 contains an outdated .cbp file. Qt Creator needs to update this file by running cmake. If you want to add additional command line arguments, add them below. Note that cmake remembers command line arguments from the previous runs.</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog %1 zawiera nieaktualny plik cbp. Qt Creator wymaga uaktualnienia go poprzez uruchomienie cmake. Poniżej podaj dodatkowe argumenty dla komendy cmake. Zwróć uwagę że cmake zapamiętuje argumenty komendy z ostatniego uruchomienia.</translation>
</message>
<message>
<location line="+6"/>
<source>The directory %1 specified in a build-configuration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note that cmake remembers command line arguments from the previous runs.</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog %1 podany w konfiguracji budowania nie zawiera pliku cbp. Qt Creator wymaga utworzenia go poprzez uruchomienie cmake. Niektóre projekty wymagają dodatkowych argumentów w komendzie cmake. Zwróć uwagę że cmake zapamiętuje argumenty komendy z ostatniego uruchomienia.</translation>
</message>
<message>
<location line="+8"/>
<source>Qt Creator needs to run cmake in the new build directory. Some projects require command line arguments to the initial cmake call.</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator wymaga uruchomienia cmake w nowym katalogu budowania. Niektóre projekty wymagają dodatkowych argumentów w komendzie cmake.</translation>
</message>
<message>
<location line="+31"/>
@@ -4472,7 +4486,7 @@ Przyczyna: %3</translation>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location line="+702"/>
+ <location line="+704"/>
<source>&Change</source>
<translation>&Zmień</translation>
</message>
@@ -4748,11 +4762,11 @@ Czy chcesz je nadpisać?</translation>
<location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+187"/>
<location line="+1493"/>
<source>Revert to Saved</source>
- <translation>Przywróć do zachowanego</translation>
+ <translation>Odwróć zmiany</translation>
</message>
<message>
<location line="-1490"/>
- <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+531"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+539"/>
<source>Close</source>
<translation>Zamknij</translation>
</message>
@@ -4780,12 +4794,12 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+1"/>
<source>Go Back</source>
- <translation type="unfinished"></translation>
+ <translation>Wstecz</translation>
</message>
<message>
<location line="+1"/>
<source>Go Forward</source>
- <translation type="unfinished"></translation>
+ <translation>W przód</translation>
</message>
<message>
<location line="+1"/>
@@ -4795,7 +4809,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+45"/>
<source>Revert File to Saved</source>
- <translation>Przywróć plik do zachowanego</translation>
+ <translation>Odwróć zmiany w pliku</translation>
</message>
<message>
<location line="+28"/>
@@ -4957,7 +4971,7 @@ Czy chcesz je nadpisać?</translation>
<location line="+2"/>
<location line="+134"/>
<source>Make writable</source>
- <translation type="unfinished"></translation>
+ <translation>Uczyń plik zapisywalnym</translation>
</message>
<message>
<location line="-130"/>
@@ -4973,12 +4987,12 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="-8"/>
<source>Could not open the file for editing with SCC.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie udało się otworzyć pliku do edycji przez SCC.</translation>
</message>
<message>
<location line="+8"/>
<source>Could not set permissions to writable.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można ustawić prawa do zapisu.</translation>
</message>
<message>
<location line="+92"/>
@@ -4998,7 +5012,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+1"/>
<source>Revert %1 to Saved</source>
- <translation>Przywróć %1 do zachowanego</translation>
+ <translation>Odwróć zmiany w %1</translation>
</message>
<message>
<location line="+4"/>
@@ -5013,12 +5027,12 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+197"/>
<source>You will lose your current changes if you proceed reverting %1.</source>
- <translation type="unfinished">Utracisz swoje bieżące zmiany</translation>
+ <translation>Utracisz swoje bieżące zmiany w %1 jeśli potwierdzisz wykonanie tego polecenia.</translation>
</message>
<message>
<location line="+2"/>
<source>Proceed</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonaj</translation>
</message>
<message>
<location line="+1"/>
@@ -5106,15 +5120,15 @@ Czy chcesz je nadpisać?</translation>
</context>
<context>
<name>Core::Internal::EditorView</name>
- <message id="===============EditorView====================">
- <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-442"/>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-450"/>
<source>Go Back</source>
- <translation type="unfinished"></translation>
+ <translation>Wstecz</translation>
</message>
<message>
<location line="+2"/>
<source>Go Forward</source>
- <translation type="unfinished"></translation>
+ <translation>W przód</translation>
</message>
<message>
<location line="+73"/>
@@ -5128,14 +5142,14 @@ Czy chcesz je nadpisać?</translation>
<translation>Zamknij</translation>
</message>
<message>
- <location line="+213"/>
+ <location line="+221"/>
<source>Make writable</source>
- <translation type="unfinished"></translation>
+ <translation>Uczyń plik zapisywalnym</translation>
</message>
<message>
<location line="+4"/>
<source>File is writable</source>
- <translation type="unfinished"></translation>
+ <translation>Plik jest zapisywalny</translation>
</message>
<message>
<location line="+57"/>
@@ -5227,7 +5241,7 @@ Czy chcesz je nadpisać?</translation>
<translation>Wyjścia</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+162"/>
<source>&File</source>
<translation>&Plik</translation>
</message>
@@ -5556,7 +5570,7 @@ Czy chcesz je nadpisać?</translation>
<context>
<name>VCSManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+132"/>
+ <location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+144"/>
<source>Version Control</source>
<translation>System kontroli wersji</translation>
</message>
@@ -5579,7 +5593,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<location line="+11"/>
<source>From revision %1<br/></source>
<extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment>
- <translation>Z rewizji %1<br/></translation>
+ <translation>Z poprawki %1<br/></translation>
</message>
<message>
<location line="+3"/>
@@ -5592,17 +5606,17 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+70"/>
<source>No Server defined in the CodePaster preferences.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie podano serwera w ustawieniach CodePastera.</translation>
</message>
<message>
<location line="+2"/>
<source>No Server defined in the CodePaster options.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie podano serwera w opcjach CodePastera.</translation>
</message>
<message>
<location line="+83"/>
<source>No such paste</source>
- <translation type="unfinished"></translation>
+ <translation>Nie ma takiego wycinka</translation>
</message>
</context>
<context>
@@ -5610,12 +5624,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/cpaster/codepastersettings.cpp" line="+59"/>
<source>CodePaster</source>
- <translation type="unfinished"></translation>
+ <translation>CodePaster</translation>
</message>
<message>
<location line="+10"/>
<source>Code Pasting</source>
- <translation type="unfinished"></translation>
+ <translation>Wklejanie kodu</translation>
</message>
<message>
<location line="+6"/>
@@ -5625,15 +5639,15 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+4"/>
<source>Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).</source>
- <translation type="unfinished"></translation>
+ <translation>Uwaga: Podaj nazwę hosta dla serwisu CodePaster bez podawania protokołu (np. codepaster.mycompany.com).</translation>
</message>
</context>
<context>
<name>CodePaster::CodepasterPlugin</name>
<message>
- <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
+ <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+110"/>
<source>&Code Pasting</source>
- <translation type="unfinished"></translation>
+ <translation>Wklejanie &kodu</translation>
</message>
<message>
<location line="+5"/>
@@ -5684,7 +5698,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+10"/>
<source>Code Pasting</source>
- <translation type="unfinished"></translation>
+ <translation>Wklejanie kodu</translation>
</message>
</context>
<context>
@@ -5750,12 +5764,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<context>
<name>CppEditor::Internal::CPPEditor</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+615"/>
+ <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+616"/>
<source>Sort alphabetically</source>
<translation>Posortuj alfabetycznie</translation>
</message>
<message>
- <location line="+163"/>
+ <location line="+188"/>
<source>This change cannot be undone.</source>
<translation>Ta zmiana nie może być cofnięta.</translation>
</message>
@@ -5776,7 +5790,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<context>
<name>CppEditor::Internal::CppPlugin</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+174"/>
+ <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+190"/>
<source>C++</source>
<translation>C++</translation>
</message>
@@ -5811,7 +5825,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<translation>Tworzy plik nagłówkowy i źródłowy dla nowej klasy.</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+12"/>
<source>Follow Symbol under Cursor</source>
<translation>Podążaj za symbolem pod kursorem</translation>
</message>
@@ -5835,6 +5849,11 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<source>Rename Symbol under Cursor</source>
<translation>Zmień nazwę symbolu pod kursorem</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <source>Update code model</source>
+ <translation>Odśwież model kodu</translation>
+ </message>
</context>
<context>
<name>CppTools::Internal::CompletionSettingsPage</name>
@@ -5860,7 +5879,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<context>
<name>CppTools::Internal::FunctionArgumentWidget</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+434"/>
+ <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+443"/>
<source>%1 of %2</source>
<translation>%1 z %2</translation>
</message>
@@ -5910,7 +5929,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<context>
<name>CppTools::Internal::CppFindReferences</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+238"/>
+ <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+235"/>
<source>Searching...</source>
<translation>Przeszukiwanie...</translation>
</message>
@@ -5934,7 +5953,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<context>
<name>CppTools::Internal::CppModelManager</name>
<message>
- <location line="+295"/>
+ <location line="+319"/>
<source>Scanning</source>
<translation>Skanowanie</translation>
</message>
@@ -5967,7 +5986,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<context>
<name>CppTools::Internal::CppToolsPlugin</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+120"/>
+ <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+126"/>
<source>&C++</source>
<translation>&C++</translation>
</message>
@@ -6016,12 +6035,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+5"/>
<source>Parsing of the log output failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przetworzyć wyjścia dziennika</translation>
</message>
<message>
<location line="+169"/>
<source>&CVS</source>
- <translation type="unfinished"></translation>
+ <translation>&CVS</translation>
</message>
<message>
<location line="+11"/>
@@ -6179,14 +6198,14 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<translation>Plik został zmieniony. Czy chcesz odwrócić w nim zmiany?</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+80"/>
<source>The commit list spans several repositories (%1). Please commit them one by one.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+18"/>
<source>Another commit is currently being executed.</source>
- <translation type="unfinished"></translation>
+ <translation>Trwa inna wysyłka.</translation>
</message>
<message>
<location line="+29"/>
@@ -6199,14 +6218,14 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<translation>Nie można utworzyć tymczasowego pliku: %1</translation>
</message>
<message>
- <location line="+105"/>
+ <location line="+108"/>
<source>Project status</source>
<translation>Stan projektu</translation>
</message>
<message>
<location line="+43"/>
<source>The initial revision %1 cannot be described.</source>
- <translation>Początkowa rewizja %1 nie może być opisana.</translation>
+ <translation>Początkowa poprawka %1 nie może być opisana.</translation>
</message>
<message>
<location line="+34"/>
@@ -6250,7 +6269,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+3"/>
<source>CVS did not respond within timeout limit (%1 ms).</source>
- <translation type="unfinished"></translation>
+ <translation>CVS nie odpowiedział w określonym czasie (%1 ms).</translation>
</message>
</context>
<context>
@@ -6349,7 +6368,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+2"/>
<source>Ignore Count:</source>
- <translation type="unfinished"></translation>
+ <translation>Licznik pominięć:</translation>
</message>
<message>
<location line="+215"/>
@@ -6437,7 +6456,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+4"/>
<source>Edit condition...</source>
- <translation>Zodyfikuj warunek...</translation>
+ <translation>Zmodyfikuj warunek...</translation>
</message>
<message>
<location line="+3"/>
@@ -6485,7 +6504,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+133"/>
<source>Unable to load the debugger engine library '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie udało się załadować biblioteki silnika debuggera '%1': %2</translation>
</message>
<message>
<location line="+17"/>
@@ -6496,12 +6515,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+112"/>
<source>Unable to resolve '%1' in the debugger engine library '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie udało się rozwiązać symbolu '%1' w bibliotece silnika debuggera '%2'</translation>
</message>
<message>
<location line="+349"/>
<source>Version: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja: %1</translation>
</message>
<message>
<location line="+2"/>
@@ -6511,12 +6530,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+4"/>
<source>Debugger</source>
- <translation type="unfinished">Debugger</translation>
+ <translation>Debugger</translation>
</message>
<message>
<location line="+33"/>
<source>The dumper library was not found at %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Biblioteka zrzutów nie została znaleziona w %1.</translation>
</message>
<message>
<location line="+33"/>
@@ -6526,113 +6545,112 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+8"/>
<source>Attaching to core files is not supported!</source>
- <translation type="unfinished"></translation>
+ <translation>Dołączanie się do pliku zrzutu nie jest obsługiwane!</translation>
</message>
<message>
<location line="+4"/>
<source>Debugger running</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger uruchomiony</translation>
</message>
<message>
<location line="+30"/>
<source>Attaching to a process failed for process id %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Dołączenie do procesu o identyfikatorze %1 nie powiodło się: %2</translation>
</message>
<message>
<location line="+27"/>
<source>Unable to set the image path to %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można ustawić ścieżki do obrazu programu na %1: %2</translation>
</message>
<message>
<location line="+31"/>
<source>Unable to create a process '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć procesu "%1": %2</translation>
</message>
<message>
<location line="+43"/>
<source>The process exited with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces zakończył się kodem wyjściowym %1.</translation>
</message>
<message>
<location line="+191"/>
<source>Continuing with '%1'...</source>
- <translation type="unfinished"></translation>
+ <translation>Kontynuacja z "%1"...</translation>
</message>
<message>
<location line="+8"/>
<source>Unable to continue: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można kontynuować: %1</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+31"/>
<source>Reverse stepping is not implemented.</source>
- <translation type="unfinished"></translation>
+ <translation>Kroczenie wstecz nie jest zaimplementowane.</translation>
</message>
<message>
<location line="+6"/>
<source>Thread %1 cannot be stepped.</source>
- <translation type="unfinished"></translation>
+ <translation>Wątek %1 nie może być śledzony krok po kroku.</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+37"/>
<source>Stepping %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
<source>Running to 0x%1...</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Uruchamianie do 0x%1...</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+94"/>
<source>Running requested...</source>
- <translation type="unfinished">ZarzÄ…dano uruchomienia...</translation>
+ <translation>Zażądano uruchomienia...</translation>
</message>
<message>
<location line="+59"/>
<source>Running up to %1:%2...</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonanie do osiągnięcia %1:%2...</translation>
</message>
<message>
<location line="+14"/>
<source>Running up to function '%1()'...</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonanie do osiągnięcia funkcji '%1()'...</translation>
</message>
<message>
<location line="+13"/>
<source>Jump to line is not implemented</source>
- <translation type="unfinished"></translation>
+ <translation>Skok do linii nie jest obsługiwany</translation>
</message>
<message>
<location line="+27"/>
<source>Unable to assign the value '%1' to '%2': %3</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można podstawić wartości "%1" do "%2": %3</translation>
</message>
<message>
<location line="+239"/>
<source>Unable to retrieve %1 bytes of memory at 0x%2: %3</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odczytać %1 bajtów pamięci spod adresu 0x%2: %3</translation>
</message>
<message>
<location line="+32"/>
<source>Cannot retrieve symbols while the debuggee is running.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odzyskać symboli dopóki debugowany program pracuje.</translation>
</message>
<message>
<location line="+64"/>
<location line="+6"/>
<source>Debugger Error</source>
- <translation type="unfinished">BÅ‚Ä…d debuggera</translation>
+ <translation>BÅ‚Ä…d debuggera</translation>
</message>
<message>
<location line="+27"/>
<source>Ignoring initial breakpoint...</source>
- <translation type="unfinished"></translation>
+ <translation>Zignorowano początkową pułapkę...</translation>
</message>
<message>
<location line="+55"/>
<source>Interrupted in thread %1, current thread: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Przerwano w wątku %1, bieżący wątek: %2</translation>
</message>
<message>
<location line="+1"/>
@@ -6647,12 +6665,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+80"/>
<source>Thread %1: Missing debug information for top stack frame (%2).</source>
- <translation type="unfinished"></translation>
+ <translation>WÄ…tek %1: Brak informacji debugowej dla wierzchniej ramki stosu (%2).</translation>
</message>
<message>
<location line="+1"/>
<source>Thread %1: No debug information available (%2).</source>
- <translation type="unfinished"></translation>
+ <translation>Wątek %1: Brak dostępnej informacji debugowej (%2).</translation>
</message>
</context>
<context>
@@ -6660,12 +6678,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+209"/>
<source>injection</source>
- <translation type="unfinished"></translation>
+ <translation>wstrzyknięcie</translation>
</message>
<message>
<location line="+1"/>
<source>debugger call</source>
- <translation type="unfinished"></translation>
+ <translation>wywołanie debuggera</translation>
</message>
<message>
<location line="+5"/>
@@ -6718,28 +6736,29 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="-23"/>
<source>Cdb</source>
- <translation type="unfinished">Cdb</translation>
+ <translation>Cdb</translation>
</message>
<message>
<location line="+35"/>
<source>Autodetect</source>
- <translation type="unfinished"></translation>
+ <translation>Wykryj automatycznie</translation>
</message>
<message>
<location line="+35"/>
<source>"Debugging Tools for Windows" could not be found.</source>
- <translation type="unfinished"></translation>
+ <translation>"Narzędzia debugowe dla Windows" nie mogą zostać odnalezione.</translation>
</message>
<message>
<location line="+1"/>
<source>Checked:
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Sprawdzono w:
+%1</translation>
</message>
<message>
<location line="+1"/>
<source>Autodetection</source>
- <translation type="unfinished"></translation>
+ <translation>Automatyczne wykrywanie</translation>
</message>
</context>
<context>
@@ -6747,17 +6766,17 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdbstackframecontext.cpp" line="+136"/>
<source><Unknown Type></source>
- <translation type="unfinished"></translation>
+ <translation><Nieznany typ></translation>
</message>
<message>
<location line="+13"/>
<source><Unknown Value></source>
- <translation type="unfinished"></translation>
+ <translation><Nieznana wartość></translation>
</message>
<message>
<location line="+219"/>
<source><Unknown></source>
- <translation type="unfinished"><Nieznany></translation>
+ <translation><Nieznany></translation>
</message>
</context>
<context>
@@ -6796,22 +6815,22 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+6"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished">Wyrównaj szerokości kolumn do ich zawartości</translation>
+ <translation>Wyrównaj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+4"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished">Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
+ <translation>Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+5"/>
<source>Use alternating row colors</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj alternatywnych kolorów wierszy</translation>
</message>
<message>
<location line="+7"/>
<source>Show a message box when receiving a signal</source>
- <translation type="unfinished">Pokaż komunikat po otrzymaniu sygnału</translation>
+ <translation>Pokaż komunikat po otrzymaniu sygnału</translation>
</message>
<message>
<location line="+8"/>
@@ -6866,7 +6885,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+8"/>
<source>Use code model</source>
- <translation type="unfinished">Używaj modelu kodu</translation>
+ <translation>Używaj modelu kodu</translation>
</message>
<message>
<location line="+7"/>
@@ -6876,62 +6895,62 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+7"/>
<source>Synchronize breakpoints</source>
- <translation type="unfinished">Zsynchronizuj pułapki</translation>
+ <translation>Zsynchronizuj pułapki</translation>
</message>
<message>
<location line="+23"/>
<source>Automatically quit debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie zakańczaj debugger</translation>
</message>
<message>
<location line="+7"/>
<source>Use tooltips in main editor when debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj podpowiedzi w głównym edytorze podczas debugowania</translation>
</message>
<message>
<location line="+1"/>
<source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczenie tej opcji włączy podpowiedzi dla wartości zmiennych podczas debugowania. Domyślnie jest to wyłączone ponieważ może to spowalniać debugowanie i ponadto może dostarczać nieprawidłowych informacji jako że dane o zakresach nie są uwzględniane.</translation>
</message>
<message>
<location line="+10"/>
<source>Use tooltips in locals view when debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj podpowiedzi w widoku ze zmiennymi lokalnymi podczas debugowania</translation>
</message>
<message>
<location line="+1"/>
<source>Checking this will enable tooltips in the locals view during debugging.</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczenie tej opcji włączy podpowiedzi w widoku ze zmiennymi lokalnymi podczas debugowania.</translation>
</message>
<message>
<location line="+8"/>
<source>Use tooltips in breakpoints view when debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj podpowiedzi w widoku z pułapkami podczas debugowania</translation>
</message>
<message>
<location line="+1"/>
<source>Checking this will enable tooltips in the breakpoints view during debugging.</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczenie tej opcji włączy podpowiedzi w widoku z pułapkami podczas debugowania.</translation>
</message>
<message>
<location line="+8"/>
<source>Show address data in breakpoints view when debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj adresy w widoku z pułapkami podczas debugowania</translation>
</message>
<message>
<location line="+1"/>
<source>Checking this will show a column with address information in the breakpoint view during debugging.</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczenie tej opcji spowoduje pokazanie kolumny z adresami w widoku z pułapkami podczas debugowania.</translation>
</message>
<message>
<location line="+9"/>
<source>Show address data in stack view when debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj adresy w widoku stosu podczas debugowania</translation>
</message>
<message>
<location line="+1"/>
<source>Checking this will show a column with address information in the stack view during debugging.</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczenie tej opcji spowoduje pokazanie kolumny z adresami w widoku stosu podczas debugowania.</translation>
</message>
<message>
<location line="+8"/>
@@ -6941,7 +6960,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+7"/>
<source>Skip known frames</source>
- <translation type="unfinished"></translation>
+ <translation>Pomijaj znane kroki</translation>
</message>
<message>
<location line="+7"/>
@@ -6951,12 +6970,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+31"/>
<source>Reload full stack</source>
- <translation type="unfinished"></translation>
+ <translation>Przeładuj cały stos</translation>
</message>
<message>
<location line="+4"/>
<source>Execute line</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonaj liniÄ™</translation>
</message>
</context>
<context>
@@ -6964,7 +6983,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggeragents.cpp" line="+93"/>
<source>Memory $</source>
- <translation type="unfinished"></translation>
+ <translation>Pamięć $</translation>
</message>
</context>
<context>
@@ -6972,17 +6991,17 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggerconstants.h" line="+55"/>
<source>Common</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
</message>
<message>
<location line="+1"/>
<source>Debugger</source>
- <translation type="unfinished">Debugger</translation>
+ <translation>Debugger</translation>
</message>
<message>
<location filename="../../../src/plugins/debugger/watchutils.cpp" line="+654"/>
<source><Encoding error></source>
- <translation type="unfinished"></translation>
+ <translation><BÅ‚Ä…d kodowania></translation>
</message>
</context>
<context>
@@ -7018,7 +7037,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+3"/>
<source>Select Core File</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik zrzutu</translation>
</message>
</context>
<context>
@@ -7063,20 +7082,20 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<context>
<name>Debugger::DebuggerManager</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+451"/>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+454"/>
<source>Continue</source>
<translation>Kontynuuj</translation>
</message>
<message>
<location line="+3"/>
- <location line="+1207"/>
+ <location line="+1215"/>
<source>Interrupt</source>
<translation>Przerwij</translation>
</message>
<message>
- <location line="-1204"/>
+ <location line="-1212"/>
<source>Reset Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Wyzeruj debugger</translation>
</message>
<message>
<location line="+2"/>
@@ -7116,12 +7135,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+2"/>
<source>Add to Watch Window</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj do okna obserwowanych</translation>
</message>
<message>
<location line="+2"/>
<source>Reverse Direction</source>
- <translation type="unfinished"></translation>
+ <translation>Odwrotny kierunek</translation>
</message>
<message>
<location line="+235"/>
@@ -7147,12 +7166,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+30"/>
<source>The application requires the debugger engine '%1', which is disabled.</source>
- <translation type="unfinished"></translation>
+ <translation>Program wymaga silnika debuggera '%1', który jest wyłączony.</translation>
</message>
<message>
- <location line="+123"/>
+ <location line="+125"/>
<source>Starting debugger for tool chain '%1'...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie debuggera dla zestawu narzędzi '%1'...</translation>
</message>
<message>
<location line="+20"/>
@@ -7187,25 +7206,25 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+6"/>
<source>The debugger could not load the debugging helper library.</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger nie mógł załadować biblioteki asystenta debuggera.</translation>
</message>
<message>
<location line="+1"/>
<source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each used Qt version separately. This can be done in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' in the 'Debugging Helper' row.</source>
- <translation type="unfinished"></translation>
+ <translation>Asystent debuggera jest używany do ładnego formatowania niektórych typów Qt i Biblioteki Standardowej. Musi być skompilowany oddzielnie dla każdej używanej wersji Qt. Można to zrobić z poziomu strony ustawień Qt poprzez wybranie instalacji Qt i kliknięcie na "Przebuduj" w linijce "Asystent debuggera".</translation>
</message>
<message>
<location line="-5"/>
<source>Continue anyway</source>
- <translation type="unfinished"></translation>
+ <translation>Kontynuuj</translation>
</message>
<message>
<location line="+3"/>
<source>Debugging helper missing</source>
- <translation type="unfinished"></translation>
+ <translation>Brak asystenta debuggera</translation>
</message>
<message>
- <location line="+166"/>
+ <location line="+172"/>
<source>Stop Debugger</source>
<translation>Zatrzymaj debugger</translation>
</message>
@@ -7252,17 +7271,17 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+36"/>
<source>Close Debugging Session</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończ sesję debugową</translation>
</message>
<message>
<location line="+17"/>
<source>A debugging session is still in progress. Would you like to terminate it?</source>
- <translation type="unfinished"></translation>
+ <translation>Trwa sesja debugowa. Czy chcesz ją zakończyć?</translation>
</message>
<message>
<location line="+1"/>
<source>A debugging session is still in progress. Terminating the session in the current state (%1) can leave the target in an inconsistent state. Would you still like to terminate it?</source>
- <translation type="unfinished"></translation>
+ <translation>Trwa sesja debugowa. Zakończenie jej w bieżącym stanie (%1) może spowodować, że program znajdzie się w niespójnym stanie. Czy wciąż chcesz ją zakończyć?</translation>
</message>
</context>
<context>
@@ -7270,12 +7289,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+142"/>
<source>Debugging Helper</source>
- <translation type="unfinished"></translation>
+ <translation>Asystent debuggera</translation>
</message>
<message>
<location line="+23"/>
<source>Choose DebuggingHelper Location</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz położenie asystenta debuggera</translation>
</message>
<message>
<location line="+35"/>
@@ -7303,12 +7322,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+22"/>
<source>Error evaluating command line arguments: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd podczas przetwarzania argumentów komendy: %1</translation>
</message>
<message>
<location line="+41"/>
<source>Start and Debug External Application...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom i zdebuguj zewnętrzną aplikację...</translation>
</message>
<message>
<location line="+5"/>
@@ -7318,12 +7337,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+5"/>
<source>Attach to Core...</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz do zrzutu...</translation>
</message>
<message>
<location line="+5"/>
<source>Start and Attach to Remote Application...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom i dołącz do zdalnej aplikacji...</translation>
</message>
<message>
<location line="+6"/>
@@ -7348,7 +7367,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+3"/>
<source>Locked</source>
- <translation type="unfinished"></translation>
+ <translation>Zablokowany</translation>
</message>
<message>
<location line="+15"/>
@@ -7398,13 +7417,13 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+17"/>
<source>Attaching to core %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Dołączanie do zrzutu %1.</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebuggerRunControlFactory</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+79"/>
+ <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+80"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
@@ -7412,7 +7431,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<context>
<name>Debugger::Internal::DebuggerRunControl</name>
<message>
- <location line="+108"/>
+ <location line="+123"/>
<source>Debugger</source>
<translation></translation>
</message>
@@ -7441,7 +7460,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+5"/>
<source>Inferior running.</source>
- <translation>Uruchamianie podprocesu.</translation>
+ <translation>Podproces uruchomiony.</translation>
</message>
<message>
<location line="+5"/>
@@ -7468,75 +7487,76 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="-68"/>
<source>No executable to load symbols from specified.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie podano programu z którego można załadować symbole.</translation>
</message>
<message>
<location line="+24"/>
<source>Loading symbols from "%1" failed:
</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można załadować symboli z "%1":
+</translation>
</message>
<message>
<location line="+36"/>
<source>Attached to core temporarily.</source>
- <translation type="unfinished"></translation>
+ <translation>Tymczasowo dołączono do zrzutu.</translation>
</message>
<message>
<location line="+9"/>
<source>Unable to determine executable from core file.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można określić pliku wykonywalnego na podstawie zrzutu pamięci.</translation>
</message>
<message>
<location line="+7"/>
<source>Attach to core "%1" failed:
</source>
- <translation type="unfinished"></translation>
+ <translation>Dołączenie do zrzutu "%1" nie powiodło się:</translation>
</message>
<message>
<location line="-54"/>
<source>Symbols found.</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole odnalezione.</translation>
</message>
<message>
<location line="+50"/>
<source>Attached to core.</source>
- <translation type="unfinished"></translation>
+ <translation>Dołączono do zrzutu.</translation>
</message>
</context>
<context>
<name>Debugger::Internal::GdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+293"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+306"/>
<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 type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>The Gdb process crashed some time after starting successfully.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces gdb zakończony błędem po poprawnym uruchomieniu.</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 type="unfinished"></translation>
+ <translation>Ostatnie wywołanie funkcji waitFor...() zakończyło się niepowodzeniem po określonym czasie. Stan QProcess się nie zmienił, możesz ponownie spróbować wywołać waitFor...().</translation>
</message>
<message>
<location line="+4"/>
<source>An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel.</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił błąd podczas próby pisania do procesu gdb. Być może proces nie jest uruchomiony lub zamknął on swój kanał wejściowy.</translation>
</message>
<message>
<location line="+4"/>
<source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił błąd podczas próby czytania z procesu gdb. Być może proces nie jest uruchomiony.</translation>
</message>
<message>
<location line="+3"/>
<source>An unknown error in the Gdb process occurred. </source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił nieznany błąd w procesie gdb.</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+116"/>
<source>Library %1 loaded.</source>
<translation>Załadowano bibliotekę %1.</translation>
</message>
@@ -7558,12 +7578,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+4"/>
<source>Thread group %1 exited.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono grupę wątków %1.</translation>
</message>
<message>
<location line="+5"/>
<source>Thread %1 in group %2 exited.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono wątek %1 w grupie %2.</translation>
</message>
<message>
<location line="+4"/>
@@ -7581,38 +7601,40 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<translation>Uruchamianie...</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+97"/>
<source>Stop requested...</source>
- <translation>ZarzÄ…dano zatrzymania...</translation>
+ <translation>Zażądano zatrzymania...</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+110"/>
<source>Stopping temporarily.</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymywanie tymczasowe.</translation>
</message>
<message>
- <location line="+53"/>
- <location line="+16"/>
+ <location line="+87"/>
+ <location line="+29"/>
+ <location line="+3"/>
<source>Executable failed</source>
<translation>Uruchomienie programu zakończone niepowodzeniem</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-31"/>
<source>Process failed to start.</source>
<translation>Nie można uruchomić procesu.</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+24"/>
+ <location line="+8"/>
<source>Executable failed: %1</source>
<translation>Uruchomienie programu zakończone niepowodzeniem: %1</translation>
</message>
<message>
- <location line="+122"/>
+ <location line="+133"/>
<source>Jumped. Stopped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+95"/>
<source>Program exited with exit code %1.</source>
<translation>Program zakończył się kodem wyjściowym %1.</translation>
</message>
@@ -7624,52 +7646,46 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+3"/>
<source>Program exited normally.</source>
- <translation type="unfinished"></translation>
+ <translation>Program zakończony prawidłowo.</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="-341"/>
<source>Processing queued commands.</source>
<translation>Przetwarzanie skolejkowanych komend.</translation>
</message>
<message>
- <location line="+54"/>
+ <location line="+392"/>
<source>Loading %1...</source>
<translation>Åadowanie %1...</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+102"/>
<source>Stopped at breakpoint.</source>
<translation>Zatrzymano w pułapce.</translation>
</message>
<message>
<location line="+9"/>
<source><p>The inferior stopped because it received a signal from the Operating System.<p><table><tr><td>Signal name : </td><td>%1</td></tr><tr><td>Signal meaning : </td><td>%2</td></tr></table></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <location line="+1"/>
- <source> <Unknown> </source>
- <translation type="unfinished"></translation>
+ <translation><p>Podproces zatrzymany ponieważ otrzymał on sygnał z systemu operacyjnego.<p><table><tr><td>Nazwa sygnału: </td><td>%1</td></tr><tr><td>Znaczenie sygnału: </td><td>%2</td></tr></table></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+7"/>
<source>Signal received</source>
- <translation type="unfinished"></translation>
+ <translation>Otrzymano sygnał</translation>
</message>
<message>
<location line="+5"/>
- <location line="+101"/>
+ <location line="+120"/>
<source>Stopped.</source>
<translation>Zatrzymano.</translation>
</message>
<message>
- <location line="-99"/>
+ <location line="-118"/>
<source>Stopped: "%1"</source>
<translation>Zatrzymano: "%1"</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+64"/>
<source>The debugger you are using identifies itself as:</source>
<translation>Debugger którego używasz identyfikuje się jako:</translation>
</message>
@@ -7683,14 +7699,14 @@ Debugowanie najprawdopodobniej nie będzie działało poprawnie.
Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
</message>
<message>
- <location line="+260"/>
+ <location line="+265"/>
<source>Continuing after temporary stop...</source>
<translation>Kontynuowanie po tymczasowym zatrzymaniu...</translation>
</message>
<message>
<location line="+8"/>
<source>Running requested...</source>
- <translation>ZarzÄ…dano uruchomienia...</translation>
+ <translation>Zażądano uruchomienia...</translation>
</message>
<message>
<location line="+8"/>
@@ -7730,37 +7746,35 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+493"/>
<source>Unable to run '%1': %2</source>
- <translation type="unfinished">Nie można uruchomić "%1": %2</translation>
- </message>
- <message>
- <location line="+74"/>
- <source><unknown></source>
- <extracomment>End address of loaded module</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić "%1": %2</translation>
</message>
<message>
- <location line="+45"/>
+ <location line="+123"/>
<location line="+8"/>
<source>Retrieving data for stack view...</source>
- <translation type="unfinished"></translation>
+ <translation>Pobieranie danych dla widoku stosu...</translation>
</message>
<message numerus="yes">
- <location line="+495"/>
+ <location line="+503"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
<location line="+324"/>
<source>Finished retrieving data.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono pobieranie danych.</translation>
</message>
<message numerus="yes">
<location line="+37"/>
<source>Dumper version %1, %n custom dumpers found.</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
@@ -7769,21 +7783,23 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+121"/>
<source>Custom dumper setup: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+132"/>
<source><0 items></source>
- <translation type="unfinished"></translation>
+ <translation><0 elementów></translation>
</message>
<message numerus="yes">
<location line="+7"/>
<source><%n items></source>
<extracomment>In string list</extracomment>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform><%n element></numerusform>
+ <numerusform><%n elementy></numerusform>
+ <numerusform><%n elementów></numerusform>
</translation>
</message>
<message>
@@ -7792,37 +7808,37 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+133"/>
+ <location line="+134"/>
<source><n/a></source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source><anonymous union></source>
- <translation type="unfinished"></translation>
+ <translation><anonimowa unia></translation>
</message>
<message>
<location line="+37"/>
<source><no information></source>
<extracomment>About variable's value</extracomment>
- <translation type="unfinished"></translation>
+ <translation><brak informacji></translation>
</message>
<message>
- <location line="+333"/>
+ <location line="+349"/>
<location line="+25"/>
<location line="+14"/>
<source>Disassembler failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+33"/>
<source>Unable to start gdb '%1': %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+122"/>
<source>Gdb I/O Error</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd wejścia / wyjścia gdb</translation>
</message>
<message>
<location line="+14"/>
@@ -7842,7 +7858,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+0"/>
<source>code %1</source>
- <translation type="unfinished"></translation>
+ <translation>kod %1</translation>
</message>
<message>
<location line="+11"/>
@@ -7850,14 +7866,26 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-52"/>
+ <location line="-60"/>
<source>Cannot find debugger initialization script</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2932"/>
+ <location line="-3088"/>
+ <source> <Unknown> </source>
+ <comment>name</comment>
+ <translation>nieznana</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> <Unknown> </source>
+ <comment>meaning</comment>
+ <translation>nieznane</translation>
+ </message>
+ <message>
+ <location line="+132"/>
<source>Execution Error</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d uruchamiania</translation>
</message>
<message>
<location line="+1"/>
@@ -7866,42 +7894,49 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1007"/>
+ <location line="+868"/>
+ <source><unknown></source>
+ <comment>address</comment>
+ <extracomment>End address of loaded module</extracomment>
+ <translation>nieznany</translation>
+ </message>
+ <message>
+ <location line="+143"/>
<source>Jumping out of bogus frame...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1498"/>
+ <location line="+1484"/>
<source>The debugging helper library was not found at %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+460"/>
<source>The debugger settings point to a script file at '%1' which is not accessible. If a script file is not needed, consider clearing that entry to avoid this warning. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+98"/>
<source>Setting breakpoints...</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawianie pułapek...</translation>
</message>
<message>
- <location line="-8"/>
+ <location line="-23"/>
<source>Starting inferior...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie podprocesu...</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+45"/>
<source>Inferior start failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić podprocesu</translation>
</message>
<message>
- <location line="-2938"/>
+ <location line="-2987"/>
<source>Inferior shutdown failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zakończyć podprocesu</translation>
</message>
<message>
- <location line="+2958"/>
+ <location line="+3007"/>
<source>Adapter crashed</source>
<translation type="unfinished"></translation>
</message>
@@ -7927,12 +7962,12 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<context>
<name>Debugger::Internal::PlainGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+70"/>
+ <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+79"/>
<source>Cannot set up communication with child process: %1</source>
<translation>Nie można ustanowić komunikacji z podprocesem: %1</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+43"/>
<source>Starting executable failed:
</source>
<translation>Nie można uruchomić programu:
@@ -7942,34 +7977,34 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<context>
<name>Debugger::Internal::RemoteGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+93"/>
+ <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+112"/>
<source>The upload process failed to start. Shell missing?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>The upload process crashed some time after starting successfully.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces upload zakończony błędem po poprawnym uruchomieniu.</translation>
</message>
<message>
<location line="+4"/>
<source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnie wywołanie funkcji waitFor...() zakończyło się niepowodzeniem po określonym czasie. Stan QProcess się nie zmienił, możesz ponownie spróbować wywołać waitFor...().</translation>
</message>
<message>
<location line="+5"/>
<source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił błąd podczas próby pisania do procesu upload. Być może proces nie jest uruchomiony lub zamknął on swój kanał wejściowy.</translation>
</message>
<message>
<location line="+5"/>
<source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił błąd podczas próby czytania z procesu upload. Być może proces nie jest uruchomiony.</translation>
</message>
<message>
<location line="+4"/>
<source>An unknown error in the upload process occurred. This is the default return value of error().</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił nieznany błąd podczas procesu upload. Jest to domyślna wartość zwrócona przez error().</translation>
</message>
<message>
<location line="+5"/>
@@ -7985,18 +8020,18 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<location line="+20"/>
<source>Starting remote executable failed:
</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie zdalnego programu zakończone niepowodzeniem:</translation>
</message>
</context>
<context>
<name>Debugger::Internal::TrkGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1597"/>
+ <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1605"/>
<source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>Connecting to TRK server adapter failed:
</source>
<translation type="unfinished"></translation>
@@ -8013,12 +8048,12 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location filename="../../../src/plugins/debugger/gdb/trkoptions.cpp" line="+91"/>
<source>No Symbian gdb executable specified.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie podano programu gdb dla Symbian.</translation>
</message>
<message>
<location line="+5"/>
<source>The Symbian gdb executable '%1' could not be found in the search path.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie znaleziono programu gdb "%1" dla Symbian w ścieżce.</translation>
</message>
</context>
<context>
@@ -8030,7 +8065,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
<source>Symbian TRK</source>
- <translation type="unfinished"></translation>
+ <translation>Symbian TRK</translation>
</message>
</context>
<context>
@@ -8071,7 +8106,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+2"/>
<source>Show source files for module "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż źródłowe pliki modułu "%1"</translation>
</message>
<message>
<location line="+2"/>
@@ -8144,7 +8179,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+331"/>
<source>Premature end of input</source>
- <translation type="unfinished"></translation>
+ <translation>Przedwczesny koniec danych wejściowych</translation>
</message>
<message>
<location line="+90"/>
@@ -8177,12 +8212,12 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+19"/>
<source>Invalid qualifiers: unexpected 'volatile'</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawne kwalifikatory: niespodziewany "volatile"</translation>
</message>
<message>
<location line="+9"/>
<source>Invalid qualifiers: 'const' appears twice</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawne kwalifikatory: "const" wystąpił dwukrotnie</translation>
</message>
<message>
<location line="+43"/>
@@ -8194,7 +8229,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<location line="+9"/>
<location line="+2"/>
<source>Invalid template-arg</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny argument szablonu</translation>
</message>
<message>
<location line="+64"/>
@@ -8206,7 +8241,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+20"/>
<source>Invalid primary expression</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawne wyrażenie główne</translation>
</message>
<message>
<location line="+11"/>
@@ -8320,7 +8355,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+9"/>
<source>At position %1: </source>
- <translation type="unfinished"></translation>
+ <translation>W miejscu %1: </translation>
</message>
</context>
<context>
@@ -8412,7 +8447,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location filename="../../../src/plugins/debugger/script/scriptengine.cpp" line="+244"/>
<source>Running requested...</source>
- <translation type="unfinished">ZarzÄ…dano uruchomienia...</translation>
+ <translation>Zażądano uruchomienia...</translation>
</message>
<message>
<location line="+228"/>
@@ -8422,22 +8457,33 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+5"/>
<source>String literal %1</source>
- <translation type="unfinished"></translation>
+ <translation>Stała znakowa %1</translation>
</message>
<message>
<location line="+15"/>
<source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
- <translation type="unfinished"></translation>
+ <translation>Celowa odmowa obliczenia wyrażenia '%1' z możliwymi efektami ubocznymi</translation>
</message>
<message>
<location line="+81"/>
<location line="+50"/>
<source>Stopped.</source>
- <translation type="unfinished">Zatrzymano.</translation>
+ <translation>Zatrzymano.</translation>
</message>
</context>
<context>
<name>SourceFilesModel</name>
+ <message>
+ <source>Internal name</source>
+ <translation type="obsolete">Nazwa wewnętrzna</translation>
+ </message>
+ <message>
+ <source>Full name</source>
+ <translation type="obsolete">Pełna nazwa</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::SourceFilesModel</name>
<message>
<location filename="../../../src/plugins/debugger/sourcefileswindow.cpp" line="+98"/>
<source>Internal name</source>
@@ -8475,7 +8521,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<context>
<name>Debugger::Internal::StackHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+66"/>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+67"/>
<location line="+14"/>
<source>Address:</source>
<translation>Adres:</translation>
@@ -8597,7 +8643,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<translation>Stos</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+41"/>
<source>Copy contents to clipboard</source>
<translation>Skopiuj zawartość do schowka</translation>
</message>
@@ -8614,12 +8660,12 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+5"/>
<source>Open disassembler</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz deasembler</translation>
</message>
<message>
<location line="+3"/>
<source>Open disassembler at %1</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz deasembler w %1</translation>
</message>
<message>
<location line="+9"/>
@@ -8653,7 +8699,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<context>
<name>Debugger::Internal::WatchData</name>
<message>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+71"/>
+ <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+72"/>
<location line="+250"/>
<source><not in scope></source>
<translation><poza zakresem></translation>
@@ -8661,7 +8707,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+8"/>
<source>%1 <shadowed %2></source>
- <translation type="unfinished"></translation>
+ <translation>%1 <przykryło %2></translation>
</message>
</context>
<context>
@@ -8679,7 +8725,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+4"/>
<source> ... <cut off></source>
- <translation type="unfinished"></translation>
+ <translation>... <odcięte></translation>
</message>
<message>
<location line="+2"/>
@@ -8714,12 +8760,12 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+7"/>
<source>Locals</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienne lokalne</translation>
</message>
<message>
<location line="+4"/>
<source>Watchers</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienne obserwowane</translation>
</message>
<message>
<location line="+4"/>
@@ -8727,7 +8773,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<translation>Podpowiedź</translation>
</message>
<message>
- <location line="+1069"/>
+ <location line="+1075"/>
<source><Edit></source>
<translation><Zmodyfikuj></translation>
</message>
@@ -8787,6 +8833,8 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
</context>
@@ -8795,7 +8843,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+128"/>
<source>Locals and Watchers</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienne lokalne i obserwowane</translation>
</message>
<message>
<location line="+95"/>
@@ -8820,12 +8868,12 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+6"/>
<source>Insert new watch item</source>
- <translation type="unfinished"></translation>
+ <translation>Wprowadź element do obserwacji</translation>
</message>
<message>
<location line="+1"/>
<source>Select widget to watch</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz widżet do obserwacji</translation>
</message>
<message>
<location line="+5"/>
@@ -8840,7 +8888,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+17"/>
<source>Refresh code model snapshot</source>
- <translation type="unfinished"></translation>
+ <translation>Odśwież kopię modelu danych</translation>
</message>
<message>
<location line="+9"/>
@@ -8914,7 +8962,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+1"/>
<source>Creates a Qt Designer form file (.ui) with a matching class.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy plik z formularzem Qt Designer (.ui) wraz z dopasowanÄ… klasÄ….</translation>
</message>
</context>
<context>
@@ -9036,7 +9084,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+10"/>
<source>Locked</source>
- <translation type="unfinished"></translation>
+ <translation>Zablokowany</translation>
</message>
<message>
<location line="+7"/>
@@ -9066,7 +9114,7 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+161"/>
<source>The image could not be created: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć obrazu: %1</translation>
</message>
</context>
<context>
@@ -9121,12 +9169,12 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
<source>The class definition of '%1' could not be found in %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć definicji klasy "%1" w %2.</translation>
</message>
<message>
<location line="+475"/>
<source>Error finding/adding a slot.</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas znajdowania / dodawania slotu.</translation>
</message>
<message>
<location line="+41"/>
@@ -9156,14 +9204,14 @@ Rebuilding the project might help.</source>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+249"/>
+ <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+250"/>
<source>E20: Mark '%1' not set</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+671"/>
+ <location line="+672"/>
<source>%1%2%</source>
- <translation type="unfinished"></translation>
+ <translation>%1%2%</translation>
</message>
<message>
<location line="+2"/>
@@ -9173,17 +9221,17 @@ Rebuilding the project might help.</source>
<message>
<location line="+22"/>
<source>Not implemented in FakeVim</source>
- <translation type="unfinished"></translation>
+ <translation>Nie obsługiwane w FakeVim</translation>
</message>
<message>
<location line="+1003"/>
<source>File '%1' exists (add ! to override)</source>
- <translation type="unfinished"></translation>
+ <translation>Plik "%1" istnieje (dodaj ! aby go zastąpić)</translation>
</message>
<message>
<location line="+20"/>
<source>Cannot open file '%1' for writing</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć pliku "%1" do zapisu</translation>
</message>
<message>
<location line="+7"/>
@@ -9193,18 +9241,20 @@ Rebuilding the project might help.</source>
<message>
<location line="+8"/>
<source>Cannot open file '%1' for reading</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć pliku "%1" do odczytu</translation>
</message>
<message>
<location line="+9"/>
<source>"%1" %2L, %3C</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" %2L, %3C</translation>
</message>
<message numerus="yes">
<location line="+18"/>
<source>%n lines filtered</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Przefiltrowano %n liniÄ™</numerusform>
+ <numerusform>Przefiltrowano %n linie</numerusform>
+ <numerusform>Przefiltrowano %n linii</numerusform>
</translation>
</message>
<message numerus="yes">
@@ -9212,37 +9262,39 @@ Rebuilding the project might help.</source>
<source>%n lines >ed %1 time</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
<location line="+78"/>
<source>E512: Unknown option: </source>
- <translation type="unfinished"></translation>
+ <translation>E512: Nieznana opcja: </translation>
</message>
<message>
<location line="+71"/>
<source>search hit BOTTOM, continuing at TOP</source>
- <translation type="unfinished"></translation>
+ <translation>Przeszukano do KOŃCA, wznowiono od POCZĄTKU</translation>
</message>
<message>
<location line="+2"/>
<source>search hit TOP, continuing at BOTTOM</source>
- <translation type="unfinished"></translation>
+ <translation>Przeszukano do POCZĄTKU, wznowiono od KOŃCA</translation>
</message>
<message>
<location line="+5"/>
<source>Pattern not found: </source>
- <translation type="unfinished"></translation>
+ <translation>Brak dopasowań do wzorca: </translation>
</message>
<message>
- <location line="+570"/>
+ <location line="+577"/>
<source>Already at oldest change</source>
- <translation type="unfinished"></translation>
+ <translation>Jest to najstarsza zmiana</translation>
</message>
<message>
<location line="+16"/>
<source>Already at newest change</source>
- <translation type="unfinished"></translation>
+ <translation>Jest to najnowsza zmiana</translation>
</message>
</context>
<context>
@@ -9250,12 +9302,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+114"/>
<source>General</source>
- <translation type="unfinished">Ogólne</translation>
+ <translation>Ogólne</translation>
</message>
<message>
<location line="+2"/>
<source>FakeVim</source>
- <translation type="unfinished"></translation>
+ <translation>FakeVim</translation>
</message>
</context>
<context>
@@ -9264,7 +9316,7 @@ Rebuilding the project might help.</source>
<location line="+347"/>
<location line="+188"/>
<source>Quit FakeVim</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończ FakeVim</translation>
</message>
<message>
<location line="-117"/>
@@ -9274,8 +9326,10 @@ Rebuilding the project might help.</source>
<message numerus="yes">
<location line="+2"/>
<source>%n files not saved</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Nie zachowano %n pliku</numerusform>
+ <numerusform>Nie zachowano %n plików</numerusform>
+ <numerusform>Nie zachowano %n plików</numerusform>
</translation>
</message>
<message>
@@ -9286,7 +9340,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+112"/>
<source>FakeVim Information</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje o FakeVim</translation>
</message>
</context>
<context>
@@ -9373,9 +9427,9 @@ Rebuilding the project might help.</source>
<context>
<name>Find::SearchResultWindow</name>
<message>
- <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+67"/>
+ <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+68"/>
<source>No matches found!</source>
- <translation type="unfinished"></translation>
+ <translation>Brak pasujących wyników!</translation>
</message>
<message>
<location line="+8"/>
@@ -9408,7 +9462,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+190"/>
<source>Override %1:</source>
- <translation type="unfinished">Nadpisanie %1:</translation>
+ <translation>ZastÄ…pienie %1:</translation>
</message>
<message>
<location line="+32"/>
@@ -9465,7 +9519,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericprojectwizard.cpp" line="+124"/>
<source>Import of Makefile-based Project</source>
- <translation type="unfinished">Zaimportuj projekt bazujÄ…cy na pliku Makefile</translation>
+ <translation>Zaimportuj projekt bazujÄ…cy na pliku Makefile</translation>
</message>
<message>
<location line="+4"/>
@@ -9576,7 +9630,7 @@ Rebuilding the project might help.</source>
<context>
<name>Git::Internal::GitClient</name>
<message>
- <location filename="../../../src/plugins/git/gitclient.cpp" line="+71"/>
+ <location filename="../../../src/plugins/git/gitclient.cpp" line="+76"/>
<source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source>
<translation type="unfinished"></translation>
</message>
@@ -9604,7 +9658,7 @@ Rebuilding the project might help.</source>
<translation>Oczekiwanie na dane...</translation>
</message>
<message>
- <location line="+100"/>
+ <location line="+101"/>
<source>Git Diff</source>
<translation type="unfinished"></translation>
</message>
@@ -9629,7 +9683,7 @@ Rebuilding the project might help.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+56"/>
+ <location line="+58"/>
<source>Unable to add %n file(s) to %1: %2</source>
<translation>
<numerusform>Nie można dodać %n pliku do %1: %2</numerusform>
@@ -9642,6 +9696,8 @@ Rebuilding the project might help.</source>
<source>Unable to reset %n file(s) in %1: %2</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
@@ -9649,6 +9705,8 @@ Rebuilding the project might help.</source>
<source>Unable to checkout %n file(s) in %1: %2</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
@@ -9667,7 +9725,7 @@ Rebuilding the project might help.</source>
<translation>Nie można uruchomić komendy "show": %1: %2</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+149"/>
<source>Changes</source>
<translation>Zmiany</translation>
</message>
@@ -9692,6 +9750,8 @@ Rebuilding the project might help.</source>
</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
@@ -9700,6 +9760,8 @@ Rebuilding the project might help.</source>
</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
@@ -9713,12 +9775,12 @@ Rebuilding the project might help.</source>
<translation>Plik został zmieniony. Czy chcesz odwrócić w nim zmiany?</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+26"/>
<source>The file is not modified.</source>
<translation>Plik nie jest zmodyfikowany.</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+23"/>
<source>There are no modified files.</source>
<translation>Brak zmodyfikowanych plików.</translation>
</message>
@@ -9794,7 +9856,7 @@ Rebuilding the project might help.</source>
<context>
<name>Git::Internal::GitPlugin</name>
<message>
- <location filename="../../../src/plugins/git/gitplugin.cpp" line="+232"/>
+ <location filename="../../../src/plugins/git/gitplugin.cpp" line="+233"/>
<source>&Git</source>
<translation>&Git</translation>
</message>
@@ -10014,7 +10076,7 @@ Rebuilding the project might help.</source>
<translation>&Przywróć</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+65"/>
<source>Could not find working directory</source>
<translation>Nie można odnaleźć katalogu roboczego</translation>
</message>
@@ -10026,12 +10088,12 @@ Rebuilding the project might help.</source>
<message>
<location line="+1"/>
<source>Would you like to revert all pending changes to the project?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz odwrócić wszystkie oczekujące zmiany w projekcie?</translation>
</message>
<message>
<location line="+29"/>
<source>Another submit is currently being executed.</source>
- <translation type="unfinished"></translation>
+ <translation>Trwa inna wysyłka.</translation>
</message>
<message>
<location line="+30"/>
@@ -10075,32 +10137,32 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/helloworld/helloworldplugin.cpp" line="+85"/>
<source>Say "&Hello World!"</source>
- <translation type="unfinished"></translation>
+ <translation>Powiedz "&Witaj świecie!"</translation>
</message>
<message>
<location line="+13"/>
<source>&Hello World</source>
- <translation type="unfinished"></translation>
+ <translation>&Witaj świecie</translation>
</message>
<message>
<location line="+15"/>
<source>Hello world!</source>
- <translation type="unfinished"></translation>
+ <translation>Witaj świecie!</translation>
</message>
<message>
<location line="+3"/>
<source>Hello World PushButton!</source>
- <translation type="unfinished"></translation>
+ <translation>Przycisk powitalny!</translation>
</message>
<message>
<location line="+31"/>
<source>Hello World!</source>
- <translation type="unfinished"></translation>
+ <translation>Witaj świecie!</translation>
</message>
<message>
<location line="+0"/>
<source>Hello World! Beautiful day today, isn't it?</source>
- <translation type="unfinished"></translation>
+ <translation>Witaj świecie! Piękny dzień dziś mamy, nieprawdaż?</translation>
</message>
</context>
<context>
@@ -10108,12 +10170,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/helloworld/helloworldwindow.cpp" line="+41"/>
<source>Focus me to activate my context!</source>
- <translation type="unfinished"></translation>
+ <translation>Daj mi fokus, żeby uaktywnić mój kontekst!</translation>
</message>
<message>
<location line="+1"/>
<source>Hello, world!</source>
- <translation type="unfinished"></translation>
+ <translation>Witaj świecie!</translation>
</message>
</context>
<context>
@@ -10218,7 +10280,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+122"/>
<source>Open Image</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz obraz</translation>
</message>
<message>
<location line="+1"/>
@@ -10281,7 +10343,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+8"/>
<source>Home</source>
- <translation type="unfinished"></translation>
+ <translation>Strona startowa</translation>
</message>
<message>
<location line="+6"/>
@@ -10351,7 +10413,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+20"/>
<source>Go to Help Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do trybu pomocy</translation>
</message>
<message>
<location line="+3"/>
@@ -10643,7 +10705,7 @@ Rebuilding the project might help.</source>
<translation>Plik został zmieniony. Czy chcesz odwrócić w nim zmiany?</translation>
</message>
<message>
- <location line="+93"/>
+ <location line="+98"/>
<source>Another submit is currently executed.</source>
<translation>Trwa inna wysyłka.</translation>
</message>
@@ -10702,7 +10764,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+3"/>
<source>Perforce did not respond within timeout limit (%1 ms).</source>
- <translation type="unfinished"></translation>
+ <translation>Perforce nie odpowiedział w określonym czasie (%1 ms).</translation>
</message>
<message>
<location line="+84"/>
@@ -10786,7 +10848,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+8"/>
<source>"%1" timed out after %2ms.</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" bez odpowiedzi po %2ms.</translation>
</message>
<message>
<location line="+4"/>
@@ -10836,22 +10898,23 @@ Rebuilding the project might help.</source>
<location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+188"/>
<source><font color="#0000ff">Starting: %1 %2</font>
</source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff">Uruchamianie: %1 %2</font>
+</translation>
</message>
<message>
<location line="+7"/>
<source><font color="#0000ff">Exited with code %1.</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff">Zakończono kodem wyjściowym %1.</font></translation>
</message>
<message>
<location line="+2"/>
<source><font color="#ff0000"><b>Exited with code %1.</b></font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000"><b>Zakończono kodem wyjściowym %1.</b></font></translation>
</message>
<message>
<location line="+7"/>
<source><font color="#ff0000">Could not start process %1 </b></font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Nie można uruchomić procesu %1 </b></font></translation>
</message>
</context>
<context>
@@ -10955,7 +11018,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+44"/>
<source><b>Running build steps for project %2...</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>Uruchamianie kroków procesu budowania dla projektu %2...</b></translation>
</message>
</context>
<context>
@@ -11001,7 +11064,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+48"/>
<source><a href="#">Make %1 active.</a></source>
- <translation type="unfinished"></translation>
+ <translation><a href="#">Uaktywnij %1.</a></translation>
</message>
<message>
<location line="+33"/>
@@ -11230,7 +11293,8 @@ Reason: %2</source>
<location line="+15"/>
<source>Building debugging helper library in %1
</source>
- <translation type="unfinished"></translation>
+ <translation>Budowanie biblioteki asystenta debuggera w %1
+</translation>
</message>
<message>
<location line="+7"/>
@@ -11464,7 +11528,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::ProjectExplorerPlugin</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+257"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+258"/>
<source>Projects</source>
<translation>Projekty</translation>
</message>
@@ -11697,7 +11761,7 @@ Reason: %2</source>
<translation>Nowy projekt</translation>
</message>
<message>
- <location line="+900"/>
+ <location line="+904"/>
<source>New File</source>
<comment>Title of dialog</comment>
<translation>Nowy plik</translation>
@@ -11756,14 +11820,14 @@ do systemu kontroli wersji (%2)?</translation>
<translation>Nie można odnaleźć explorer.exe w ścieżce w celu uruchomienia "Windows Explorer".</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+18"/>
<source>Launching a file explorer failed</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchomienie przeglądarki plików zakończone niepowodzeniem</translation>
</message>
<message>
<location line="+1"/>
<source>Could not find xdg-open to launch the native file explorer.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można znaleźć programu xdg-open potrzebnego do uruchomienia natywnej przeglądarki plików.</translation>
</message>
<message>
<location line="+26"/>
@@ -11791,42 +11855,46 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location line="+212"/>
<source>Change build configuration && continue</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień konfigurację budowania i kontynuuj</translation>
</message>
<message>
<location line="+2"/>
<source>Cancel</source>
- <translation type="unfinished">Anuluj</translation>
+ <translation>Anuluj</translation>
</message>
<message>
<location line="+2"/>
<source>Continue anyway</source>
- <translation type="unfinished"></translation>
+ <translation>Kontynuuj</translation>
</message>
<message>
<location line="+5"/>
- <source>Run configuration doesn't match build configuration</source>
- <translation type="unfinished"></translation>
+ <source>Run configuration does not match build configuration</source>
+ <translation>Konfiguracja uruchamiania nie odpowiada konfiguracji budowania</translation>
</message>
<message>
- <location line="+1"/>
- <source>The active build configuration builds a target that cannot be used by the active run configuration.</source>
+ <location line="+6"/>
+ <source>This can happen if the active build configuration uses the wrong Qt version and/or tool chain for the active run configuration (for example, running in Symbian emulator requires building with the WINSCW tool chain).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>This can happen if the active build configuration uses the wrong Qt version and/or tool chain for the active run configuration (e.g. running in Symbian emulator requires building with WINSCW tool chain).</source>
- <translation type="unfinished"></translation>
+ <source>Run configuration doesn't match build configuration</source>
+ <translation type="obsolete">Konfiguracja uruchamiania nie pasuje do konfiguracji budowania</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-5"/>
+ <source>The active build configuration builds a target that cannot be used by the active run configuration.</source>
+ <translation>Aktywna konfiguracja budowania tworzy produkt który nie może zostać użyty przez aktywną konfigurację uruchamiania.</translation>
+ </message>
+ <message>
+ <location line="+29"/>
<source>Choose build configuration:</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz konfiguracjÄ™ budowania:</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-9"/>
<source>No valid build configuration found.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie znaleziono poprawnej konfiguracji budowania.</translation>
</message>
</context>
<context>
@@ -11909,7 +11977,7 @@ do systemu kontroli wersji (%2)?</translation>
<context>
<name>ProjectExplorer::Internal::ProjectWelcomePage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+47"/>
+ <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+48"/>
<source>Develop</source>
<translation type="unfinished"></translation>
</message>
@@ -11917,6 +11985,7 @@ do systemu kontroli wersji (%2)?</translation>
<context>
<name>ProjectExplorer::Internal::ActiveConfigurationWidget</name>
<message>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+6"/>
<location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+181"/>
<source>Active run configuration</source>
<translation>Aktywna konfiguracja uruchamiania</translation>
@@ -11925,7 +11994,7 @@ do systemu kontroli wersji (%2)?</translation>
<context>
<name>ProjectExplorer::Internal::ProjectLabel</name>
<message>
- <location line="+375"/>
+ <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+375"/>
<source>Edit Project Settings for Project <b>%1</b></source>
<translation>Zmodyfikuj ustawienia projektu <b>%1</b></translation>
</message>
@@ -11947,12 +12016,12 @@ do systemu kontroli wersji (%2)?</translation>
<name>ProjectExplorer::Internal::ProjectWindow</name>
<message>
<location line="+104"/>
- <location line="+105"/>
+ <location line="+110"/>
<source>Active Build and Run Configurations</source>
<translation>Aktywne konfiguracje procesu budowania i uruchamiania</translation>
</message>
<message>
- <location line="-67"/>
+ <location line="-72"/>
<source>No project loaded.</source>
<translation>Brak załadowanego projektu.</translation>
</message>
@@ -11991,9 +12060,9 @@ do systemu kontroli wersji (%2)?</translation>
<translation>Usuń</translation>
</message>
<message>
- <location line="+133"/>
+ <location line="+138"/>
<source><a href="#">Make %1 active.</a></source>
- <translation type="unfinished"></translation>
+ <translation><a href="#">Uaktywnij %1.</a></translation>
</message>
</context>
<context>
@@ -12102,12 +12171,11 @@ do systemu kontroli wersji (%2)?</translation>
<translation>Kompilator Intel C++ (Linux)</translation>
</message>
<message>
- <location line="+2"/>
<source>MinGW</source>
- <translation>MinGW</translation>
+ <translation type="obsolete">MinGW</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Microsoft Visual C++</source>
<translation>Microsoft Visual C++</translation>
</message>
@@ -12155,14 +12223,14 @@ do systemu kontroli wersji (%2)?</translation>
<context>
<name>ProjectExplorer::Internal::WinGuiProcess</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+122"/>
+ <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+125"/>
<source>The process could not be started!</source>
<translation>Proces nie może zostać rozpoczęty!</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+5"/>
<source>Cannot retrieve debugging output!</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można pobrać wyjścia debuggera!</translation>
</message>
</context>
<context>
@@ -12262,26 +12330,26 @@ do systemu kontroli wersji (%2)?</translation>
<name>QmlProjectManager::Internal::QmlRunConfiguration</name>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+339"/>
- <location line="+106"/>
+ <location line="+107"/>
<source>QML Viewer</source>
- <translation type="unfinished"></translation>
+ <translation>PrzeglÄ…darka QML</translation>
</message>
<message>
<location line="-31"/>
<location line="+40"/>
- <location line="+60"/>
+ <location line="+46"/>
<source><Current File></source>
- <translation type="unfinished"></translation>
+ <translation><Bieżący plik></translation>
</message>
<message>
- <location line="-68"/>
+ <location line="-54"/>
<source>QML Viewer arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumenty przeglÄ…darki QML:</translation>
</message>
<message>
<location line="+1"/>
<source>Main QML File:</source>
- <translation type="unfinished"></translation>
+ <translation>Główny plik QML:</translation>
</message>
</context>
<context>
@@ -12289,7 +12357,7 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlprojectwizard.cpp" line="+124"/>
<source>Import of QML Project</source>
- <translation type="unfinished"></translation>
+ <translation>Importowanie projektu QML</translation>
</message>
<message>
<location line="+4"/>
@@ -12427,7 +12495,7 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepage.h" line="+47"/>
<source>Getting Started</source>
- <translation type="unfinished"></translation>
+ <translation>Zaczynamy</translation>
</message>
</context>
<context>
@@ -12448,7 +12516,7 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location line="+57"/>
<source>Override %1:</source>
- <translation>Nadpisanie %1:</translation>
+ <translation>ZastÄ…pienie %1:</translation>
</message>
<message>
<location line="+18"/>
@@ -12479,7 +12547,7 @@ do systemu kontroli wersji (%2)?</translation>
<location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+51"/>
<location line="+125"/>
<source>Import existing build settings</source>
- <translation type="unfinished"></translation>
+ <translation>Zaimportuj istniejÄ…ce ustawienia procesu budowania</translation>
</message>
<message>
<location line="+8"/>
@@ -12526,7 +12594,7 @@ do systemu kontroli wersji (%2)?</translation>
<context>
<name>Qt4ProjectManager::QMakeStepConfigWidget</name>
<message>
- <location line="+78"/>
+ <location line="+88"/>
<source><b>QMake:</b> No Qt version set. QMake can not be run.</source>
<translation><b>QMake:</b> Brak ustawionej wersji Qt. Nie można uruchomić QMake.</translation>
</message>
@@ -12597,7 +12665,7 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location line="+9"/>
<source>Self-signed certificate</source>
- <translation type="unfinished"></translation>
+ <translation>Własnoręcznie podpisany certyfikat</translation>
</message>
<message>
<location line="+13"/>
@@ -12612,12 +12680,12 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location line="+3"/>
<source>Choose key file (.key / .pem)</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik z kluczem (.key / .pem)</translation>
</message>
<message>
<location line="+1"/>
<source>Key file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z kluczem:</translation>
</message>
<message>
<location line="+126"/>
@@ -12633,7 +12701,7 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location line="+1"/>
<source>(self-signed certificate)</source>
- <translation type="unfinished"></translation>
+ <translation>(własnoręcznie podpisany certyfikat)</translation>
</message>
<message>
<location line="+1"/>
@@ -12659,7 +12727,7 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location line="+83"/>
<source>There is no device plugged in.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak podłączonego urządzenia.</translation>
</message>
<message>
<location line="+5"/>
@@ -12715,7 +12783,8 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<location line="+21"/>
<source>Could not connect to phone on port '%1': %2
Check if the phone is connected and App TRK is running.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można nawiązać połączenia z telefonem na porcie "%1": %2
+Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</translation>
</message>
<message>
<location line="+9"/>
@@ -12730,12 +12799,12 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+5"/>
<source>Could not close file %1 on device: %2. It will be closed when App TRK is closed.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zamknąć pliku %1 w urządzeniu: %2, będzie on zamknięty gdy aplikacja TRK zostanie zakończona.</translation>
</message>
<message>
<location line="+6"/>
<source>Could not connect to App TRK on device: %1. Restarting App TRK might help.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można ustanowić połączenia z aplikacją TRK w urządzeniu: %1. Spróbuj ponownie uruchomić aplikację TRK.</translation>
</message>
<message>
<location line="+5"/>
@@ -12760,17 +12829,17 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+12"/>
<source>Waiting for App TRK</source>
- <translation type="unfinished"></translation>
+ <translation>Oczekiwanie na aplikacjÄ™ TRK</translation>
</message>
<message>
<location line="+2"/>
<source>Please start App TRK on %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Proszę uruchomić aplikację TRK na porcie %1.</translation>
</message>
<message>
<location line="+22"/>
<source>Canceled.</source>
- <translation type="unfinished"></translation>
+ <translation>Anulowano.</translation>
</message>
<message>
<location line="+10"/>
@@ -12816,7 +12885,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+51"/>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Ostrzeżenie: nie można odnaleźć pliku z symbolami należącego do %1.</translation>
</message>
<message>
<location line="+8"/>
@@ -12852,7 +12921,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+87"/>
<source>Could not parse %1. The Qt for Symbian emulator run configuration %2 can not be started.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przetworzyć %1. Nie można uruchomić konfiguracji %2 emulatora Qt dla Symbiana.</translation>
</message>
</context>
<context>
@@ -12971,12 +13040,12 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+7"/>
<source>Could not set permissions to writable.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można ustawić prawa do zapisu.</translation>
</message>
<message>
<location line="+33"/>
<source>There are unsaved changes for project file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z projektem %1 posiada niezachowane zmiany.</translation>
</message>
<message>
<location line="+22"/>
@@ -13082,7 +13151,7 @@ Check if the phone is connected and App TRK is running.</source>
<name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+72"/>
- <location line="+458"/>
+ <location line="+459"/>
<source>Qt4RunConfiguration</source>
<translation>Konfiguracja procesu uruchamiania Qt4</translation>
</message>
@@ -13132,7 +13201,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+5"/>
<source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj pakietów w wersji do debuggowania (DYLD_IMAGE_SUFFIX=_debug)</translation>
</message>
<message>
<location line="+8"/>
@@ -13358,12 +13427,12 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+2"/>
<source>Select Carbide Install Directory</source>
- <translation type="unfinished"></translation>
+ <translation>Wskaż katalog z zainstalowanym Carbide</translation>
</message>
<message>
<location line="+2"/>
<source>Select S60 SDK Root</source>
- <translation type="unfinished"></translation>
+ <translation>Wskaż katalog główny S60 SDK</translation>
</message>
<message>
<location line="+2"/>
@@ -13383,7 +13452,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+144"/>
<source>Building helpers</source>
- <translation type="unfinished"></translation>
+ <translation>Budowanie asystentów</translation>
</message>
<message>
<location line="+77"/>
@@ -13392,25 +13461,25 @@ Check if the phone is connected and App TRK is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+126"/>
<source>The Qt Version identified by %1 is not installed. Run make install</source>
<translation>Wersja Qt identyfikowana przez %1 nie jest zainstalowana. Uruchom "make install"</translation>
</message>
<message>
<location line="+3"/>
<source>%1 does not specify a valid Qt installation</source>
- <translation type="unfinished"></translation>
+ <translation>%1 nie wskazuje na poprawnÄ… instalacjÄ™ Qt</translation>
</message>
<message>
<location line="+5"/>
<source>Found Qt version %1, using mkspec %2</source>
- <translation type="unfinished"></translation>
+ <translation>Znaleziono wersję Qt %1 używająca mkspec %2</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+351"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+347"/>
<source><not found></source>
<translation><nie znaleziony></translation>
</message>
@@ -13421,50 +13490,50 @@ Check if the phone is connected and App TRK is running.</source>
<translation>Qt w PATH</translation>
</message>
<message>
- <location line="+147"/>
+ <location line="+144"/>
<source>Name:</source>
- <translation type="unfinished">Nazwa:</translation>
+ <translation>Nazwa:</translation>
</message>
<message>
<location line="+2"/>
<source>Source:</source>
- <translation type="unfinished"></translation>
+ <translation>Źródło:</translation>
</message>
<message>
<location line="+2"/>
<source>mkspec:</source>
- <translation type="unfinished"></translation>
+ <translation>mkspec:</translation>
</message>
<message>
<location line="+2"/>
<source>qmake:</source>
- <translation type="unfinished"></translation>
+ <translation>qmake:</translation>
</message>
<message>
<location line="+4"/>
<source>Default:</source>
- <translation type="unfinished">Domyślna:</translation>
+ <translation>Domyślna:</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Compiler:</source>
- <translation type="unfinished"></translation>
+ <translation>Kompilator:</translation>
</message>
<message>
<location line="+2"/>
<source>Version:</source>
- <translation type="unfinished">Wersja:</translation>
+ <translation>Wersja:</translation>
</message>
<message>
<location line="+3"/>
<source>Debugging helper:</source>
- <translation type="unfinished"></translation>
+ <translation>Asystent debuggera:</translation>
</message>
</context>
<context>
<name>QApplication</name>
<message>
- <location line="+872"/>
+ <location line="+870"/>
<source>The Qt Version has no toolchain.</source>
<translation type="unfinished"></translation>
</message>
@@ -13474,12 +13543,12 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp" line="+59"/>
<source>Qt4 Console Application</source>
- <translation type="unfinished"></translation>
+ <translation>Aplikacja konsolowa Qt4</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt4 console application.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy aplikacjÄ™ konsolowÄ… Qt4.</translation>
</message>
</context>
<context>
@@ -13487,7 +13556,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp" line="+52"/>
<source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not provide a GUI.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten kreator generuje projekt aplikacji konsolowej Qt4. Aplikacja wywodzi się z QCoreApplication i nie używa GUI.</translation>
</message>
</context>
<context>
@@ -13617,7 +13686,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location filename="../../../src/plugins/qtestlib/qtestlibplugin.cpp" line="+59"/>
<source>Pass</source>
- <translation type="unfinished"></translation>
+ <translation>Prawidłowy</translation>
</message>
<message>
<location line="+1"/>
@@ -13632,7 +13701,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+1"/>
<source>Expected Pass</source>
- <translation type="unfinished"></translation>
+ <translation>Spodziewany prawidłowy</translation>
</message>
<message>
<location line="+9"/>
@@ -13652,17 +13721,17 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+1"/>
<source>Critical</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d krytyczny</translation>
</message>
<message>
<location line="+1"/>
<source>Fatal</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd śmiertelny</translation>
</message>
<message>
<location line="+1"/>
<source>Skipped</source>
- <translation type="unfinished"></translation>
+ <translation>Pominięty</translation>
</message>
<message>
<location line="+1"/>
@@ -13704,7 +13773,7 @@ Check if the phone is connected and App TRK is running.</source>
<context>
<name>QtScriptEditor::Internal::ScriptEditor</name>
<message>
- <location filename="../../../src/plugins/qtscripteditor/qtscripteditor.cpp" line="+228"/>
+ <location filename="../../../src/plugins/qtscripteditor/qtscripteditor.cpp" line="+229"/>
<source><Select Symbol></source>
<translation><Wybierz symbol></translation>
</message>
@@ -13712,15 +13781,14 @@ Check if the phone is connected and App TRK is running.</source>
<context>
<name>QtScriptEditor::Internal::QtScriptEditorActionHandler</name>
<message>
- <location filename="../../../src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp" line="+96"/>
<source>Qt Script Error</source>
- <translation>Edytor skryptów Qt</translation>
+ <translation type="obsolete">Edytor skryptów Qt</translation>
</message>
</context>
<context>
<name>QtScriptEditor::Internal::QtScriptEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/qtscripteditor/qtscripteditorplugin.cpp" line="+97"/>
+ <location filename="../../../src/plugins/qtscripteditor/qtscripteditorplugin.cpp" line="+102"/>
<source>Creates a Qt Script file.</source>
<translation>Tworzy plik ze skryptem Qt.</translation>
</message>
@@ -13735,14 +13803,12 @@ Check if the phone is connected and App TRK is running.</source>
<translation>Qt</translation>
</message>
<message>
- <location line="+56"/>
<source>Run</source>
- <translation>Uruchom</translation>
+ <translation type="obsolete">Uruchom</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+R</source>
- <translation>Ctrl+R</translation>
+ <translation type="obsolete">Ctrl+R</translation>
</message>
</context>
<context>
@@ -13833,7 +13899,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+1"/>
<source>&Escaped Pattern:</source>
- <translation type="unfinished"></translation>
+ <translation>&Zabezpieczony wzorzec:</translation>
</message>
<message>
<location line="+1"/>
@@ -13853,7 +13919,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+1"/>
<source>&Minimal</source>
- <translation type="unfinished"></translation>
+ <translation>&Minimalistyczny</translation>
</message>
<message>
<location line="+2"/>
@@ -13888,12 +13954,12 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+39"/>
<source>Capture %1:</source>
- <translation type="unfinished"></translation>
+ <translation>ZÅ‚apanie %1:</translation>
</message>
<message>
<location line="+4"/>
<source>Match:</source>
- <translation type="unfinished"></translation>
+ <translation>Dopasowanie:</translation>
</message>
<message>
<location line="+13"/>
@@ -14170,14 +14236,14 @@ Check if the phone is connected and App TRK is running.</source>
<translation>Plik został zmieniony. Czy chcesz odwrócić w nim zmiany?</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>The commit list spans several repositories (%1). Please commit them one by one.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+18"/>
<source>Another commit is currently being executed.</source>
- <translation type="unfinished"></translation>
+ <translation>Trwa inna wysyłka.</translation>
</message>
<message>
<location line="+15"/>
@@ -14190,19 +14256,19 @@ Check if the phone is connected and App TRK is running.</source>
<translation>Nie można utworzyć tymczasowego pliku: %1</translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+189"/>
<source>Describe</source>
<translation>Opisz</translation>
</message>
<message>
<location line="+1"/>
<source>Revision number:</source>
- <translation type="unfinished"></translation>
+ <translation>Numer poprawki:</translation>
</message>
<message>
<location line="+47"/>
<source>No subversion executable specified!</source>
- <translation type="unfinished"></translation>
+ <translation>Nie podano komendy programu subversion!</translation>
</message>
<message>
<location line="+8"/>
@@ -14230,7 +14296,7 @@ Check if the phone is connected and App TRK is running.</source>
<message>
<location line="+3"/>
<source>Subversion did not respond within timeout limit (%1 ms).</source>
- <translation type="unfinished"></translation>
+ <translation>Subversion nie odpowiedział w określonym czasie (%1 ms).</translation>
</message>
</context>
<context>
@@ -14245,7 +14311,7 @@ Check if the phone is connected and App TRK is running.</source>
<name>TextEditor::BaseFileFind</name>
<message>
<location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+119"/>
- <location line="+20"/>
+ <location line="+21"/>
<source>%1 found</source>
<translation>Ilość znalezionych: %1</translation>
</message>
@@ -14276,7 +14342,7 @@ Check if the phone is connected and App TRK is running.</source>
<context>
<name>TextEditor::BaseTextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+252"/>
+ <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+254"/>
<source>Print Document</source>
<translation>Wydrukuj dokument</translation>
</message>
@@ -14294,7 +14360,7 @@ Check if the phone is connected and App TRK is running.</source>
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+4275"/>
+ <location line="+4324"/>
<source>Line: %1, Col: %2</source>
<translation>Linia: %1, kolumna: %2</translation>
</message>
@@ -14315,7 +14381,8 @@ Check if the phone is connected and App TRK is running.</source>
<location line="+4"/>
<source>
The following encodings are likely to fit:</source>
- <translation type="unfinished"></translation>
+ <translation>
+Następujące kodowania będą najprawdopodobniej pasowały:</translation>
</message>
<message>
<location line="+1"/>
@@ -14511,7 +14578,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Clean Whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>Oczyść białe znaki</translation>
</message>
<message>
<location line="+7"/>
@@ -14616,7 +14683,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Goto Block Start With Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznacz do poczÄ…tku bloku</translation>
</message>
<message>
<location line="+2"/>
@@ -14626,7 +14693,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Goto Block End With Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznacz do końca bloku</translation>
</message>
<message>
<location line="+2"/>
@@ -14671,7 +14738,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Copy Line Up</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj linię i wstaw powyżej</translation>
</message>
<message>
<location line="+2"/>
@@ -14681,7 +14748,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Copy Line Down</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj linię i wstaw poniżej</translation>
</message>
<message>
<location line="+2"/>
@@ -14729,7 +14796,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+6"/>
<source>Triggers a quick fix in this scope</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktywnia w tym zakresie szybkÄ… poprawkÄ™</translation>
</message>
<message>
<location line="+4"/>
@@ -14894,7 +14961,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+8"/>
<source>Display</source>
- <translation type="unfinished"></translation>
+ <translation>Wyświetlanie</translation>
</message>
</context>
<context>
@@ -14912,12 +14979,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+10"/>
<source>Could not find any project files matching (%1) in the directory '%2'.</source>
- <translation>Nie można odnaleźć żadnych plików z projekami pasujących do (%1) w katalogu "%2".</translation>
+ <translation>Nie można odnaleźć żadnych plików z projektami pasujących do (%1) w katalogu "%2".</translation>
</message>
<message>
<location line="+32"/>
<source>The Project Explorer is not available.</source>
- <translation type="unfinished"></translation>
+ <translation>Przeglądarka projektów nie jest dostępna.</translation>
</message>
<message>
<location line="+7"/>
@@ -14933,7 +15000,12 @@ The following encodings are likely to fit:</source>
<context>
<name>VCSBase::ProcessCheckoutJob</name>
<message>
- <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+109"/>
+ <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+101"/>
+ <source>Unable to start %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
<source>The process terminated with exit code %1.</source>
<translation>Proces zakończył się kodem wyjściowym %1.</translation>
</message>
@@ -14961,7 +15033,7 @@ The following encodings are likely to fit:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Failed.</source>
<translation>Niepomyślnie zakończone.</translation>
</message>
@@ -15023,7 +15095,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="-2"/>
<source>Common</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
</message>
</context>
<context>
@@ -15531,7 +15603,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+1"/>
<source>The current startup project can not be run.</source>
- <translation type="unfinished"></translation>
+ <translation>Bieżący projekt startowy nie może zostać uruchomiony.</translation>
</message>
<message>
<location line="+146"/>
@@ -15625,17 +15697,17 @@ in your .pro file.</source>
<message>
<location line="+1"/>
<source>Generic Project Files</source>
- <translation>Ogólne pliki projektów</translation>
+ <translation>Ogólne pliki projektu</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Project Include Paths</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne ścieżki do nagłówków projektu</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Project Configuration File</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólny plik z konfiguracją projektu</translation>
</message>
<message>
<location line="+1"/>
@@ -15660,12 +15732,12 @@ in your .pro file.</source>
<message>
<location line="+1"/>
<source>Qt Project include file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nagłówkowy projektu Qt</translation>
</message>
<message>
<location line="+1"/>
<source>message catalog</source>
- <translation type="unfinished"></translation>
+ <translation>katalog komunikatów</translation>
</message>
<message>
<location line="+1"/>
@@ -15685,7 +15757,7 @@ in your .pro file.</source>
<message>
<location line="+1"/>
<source>Plain text document</source>
- <translation type="unfinished"></translation>
+ <translation>Dokument tekstowy</translation>
</message>
<message>
<location line="+1"/>
@@ -15827,7 +15899,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
<context>
<name>Debugger::Internal::TermGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+142"/>
+ <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+176"/>
<source>Debugger Error</source>
<translation>BÅ‚Ä…d debuggera</translation>
</message>
@@ -15837,7 +15909,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
<source>Generic Directory Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólny filtr katalogów</translation>
</message>
<message>
<location line="+59"/>
@@ -16054,12 +16126,12 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location filename="../../../src/plugins/qmleditor/parser/qmljslexer.cpp" line="+553"/>
<source>Illegal character</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny znak</translation>
</message>
<message>
<location line="+14"/>
<source>Unclosed string at end of line</source>
- <translation type="unfinished"></translation>
+ <translation>Niedomknięty ciąg na końcu linii</translation>
</message>
<message>
<location line="+26"/>
@@ -16074,7 +16146,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location line="+26"/>
<source>Unclosed comment at end of file</source>
- <translation type="unfinished"></translation>
+ <translation>Niedomknięty komentarz na końcu pliku</translation>
</message>
<message>
<location line="+87"/>
@@ -16084,33 +16156,33 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location line="+26"/>
<source>Identifier cannot start with numeric literal</source>
- <translation type="unfinished"></translation>
+ <translation>Identyfikator nie może rozpoczynać się cyfrą</translation>
</message>
<message>
<location line="+331"/>
<source>Unterminated regular expression literal</source>
- <translation type="unfinished"></translation>
+ <translation>Brak znaku kończącego stałą znakową w wyrażeniu regularnym</translation>
</message>
<message>
<location line="+24"/>
<source>Invalid regular expression flag '%0'</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna flaga "%0" wyrażenia regularnego</translation>
</message>
<message>
<location filename="../../../src/plugins/qmleditor/parser/qmljsparser.cpp" line="+1752"/>
<source>Unexpected token '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Niespodziewany znak "%1"</translation>
</message>
<message>
<location line="+28"/>
<location line="+23"/>
<source>Expected token '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Spodziewany znak "%1"</translation>
</message>
<message>
<location line="+13"/>
<source>Syntax error</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd składni</translation>
</message>
</context>
<context>
@@ -16118,27 +16190,27 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location filename="../../../src/shared/trk/bluetoothlistener_gui.cpp" line="+68"/>
<source>Connection on %1 canceled.</source>
- <translation type="unfinished">Anulowano połączenie z %1.</translation>
+ <translation>Anulowano połączenie z %1.</translation>
</message>
<message>
<location line="+16"/>
<source>Waiting for App TRK</source>
- <translation type="unfinished"></translation>
+ <translation>Oczekiwanie na aplikacjÄ™ TRK</translation>
</message>
<message>
<location line="+1"/>
<source>Waiting for App TRK to start on %1...</source>
- <translation type="unfinished"></translation>
+ <translation>Oczekiwanie na uruchomienie aplikacji TRK na %1...</translation>
</message>
<message>
<location line="+9"/>
<source>Waiting for Bluetooth Connection</source>
- <translation type="unfinished">Oczekiwanie na połączenie Bluetooth</translation>
+ <translation>Oczekiwanie na połączenie Bluetooth</translation>
</message>
<message>
<location line="+1"/>
<source>Connecting to %1...</source>
- <translation type="unfinished">ÅÄ…czenie z %1...</translation>
+ <translation>ÅÄ…czenie z %1...</translation>
</message>
</context>
<context>
@@ -16148,6 +16220,8 @@ aktywny tylko po wpisaniu przedrostka</translation>
<source>%1: timed out after %n attempts using an interval of %2ms.</source>
<translation type="unfinished">
<numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
@@ -16161,4 +16235,46 @@ aktywny tylko po wpisaniu przedrostka</translation>
<translation>%1: %2 próba połączenia zakończona niepomyślnie: %3 (ponowna próba)...</translation>
</message>
</context>
+<context>
+ <name>trk::Session</name>
+ <message>
+ <location filename="../../../src/shared/trk/trkutils.cpp" line="+79"/>
+ <source>CPU: v%1.%2%3%4</source>
+ <extracomment>CPU description of an S60 device %1 major verison, %2 minor version %3 real name of major verison, %4 real name of minor version</extracomment>
+ <translation>CPU: v%1.%2%3%4</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>App TRK: v%1.%2 TRK protocol: v%3.%4</source>
+ <translation>Aplikacja TRK: v%1.%2, protokół TRK: v%3.%4</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>%1, %2%3%4, %5</source>
+ <extracomment>s60description description of an S60 device %1 CPU description, %2 endianness %3 default type size (if any), %4 float size (if any) %5 TRK version</extracomment>
+ <translation>%1, %2%3%4, %5</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>big endian</source>
+ <translation>big endian</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>little endian</source>
+ <translation>little endian</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>, type size: %1</source>
+ <extracomment>will be inserted into s60description</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>, float size: %1</source>
+ <extracomment>will be inserted into s60description</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
</TS>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index f90641eda278fcbb4bf1011f71a4f67a0a2371d4..3065beed58a01168ca07ebda3193ad6ff7ba3fef 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -350,7 +350,7 @@
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+702"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+704"/>
<source>&Change</source>
<translation>&Изменить</translation>
</message>
@@ -358,7 +358,7 @@
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+125"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+123"/>
<source>CMake Wizard</source>
<translation>МаÑтер CMake</translation>
</message>
@@ -421,7 +421,7 @@
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+148"/>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
- <translation type="unfinished">Укажите размещение программы cmake, так как она не была найдена в Ñтандартных меÑтах.</translation>
+ <translation>Укажите размещение программы cmake, так как она не была найдена автоматичеÑки.</translation>
</message>
<message>
<location line="+5"/>
@@ -436,7 +436,7 @@
<message>
<location line="+2"/>
<source> The path %1 is not a valid cmake.</source>
- <translation> Путь %1 не ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ программой cmake.</translation>
+ <translation> Путь %1 не ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¼ путём к программе cmake.</translation>
</message>
<message>
<location line="+17"/>
@@ -451,27 +451,27 @@
<message>
<location line="+19"/>
<source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun cmake. Or simply finish the wizard directly</source>
- <translation>Каталог %1 уже Ñодержит доÑтаточно Ñвежий файл cbp. Ð’Ñ‹ можете передать Ñпециальные параметры или Ñменить иÑпользуемый инÑтрументарий Ñ Ð¿Ð¾Ñледующим перезапуÑком cmake. Или проÑто завершите работу Ñ Ð¼Ð°Ñтером</translation>
+ <translation>Каталог %1 уже Ñодержит доÑтаточно Ñвежий файл cbp. Ð’Ñ‹ можете передать Ñпециальные параметры или Ñменить иÑпользуемый инÑтрументарий Ñ Ð¿Ð¾Ñледующим перезапуÑком cmake. Либо проÑто завершите работу Ñ Ð¼Ð°Ñтером</translation>
</message>
<message>
<location line="+5"/>
<source>The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running cmake. Some projects require command line arguments to the initial cmake call.</source>
- <translation>Каталог %1 не Ñодержит файла cbp. Qt Creator ÑоздаÑÑ‚ Ñтот файл путём запуÑка cmake. Ðекоторые проекты требуют ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² командной Ñтроки Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ запуÑка cmake.</translation>
+ <translation>Каталог %1 не Ñодержит файла cbp. Qt Creator ÑоздаÑÑ‚ Ñтот файл путём запуÑка cmake. Ðекоторые проекты требуют ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… параметров командной Ñтроки Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ запуÑка cmake.</translation>
</message>
<message>
<location line="+4"/>
<source>The directory %1 contains an outdated .cbp file. Qt Creator needs to update this file by running cmake. If you want to add additional command line arguments, add them below. Note that cmake remembers command line arguments from the previous runs.</source>
- <translation>Каталог %1 Ñодержит уÑтаревший файл cbp. Qt Creator обновит Ñтот файл путём запуÑка cmake. ЕÑли требуетÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ дополнительные параметры командной Ñтроки, добавьте их ниже. Следует иметь в виду, что cmake запоминает параметры командной Ñтроки Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ запуÑка.</translation>
+ <translation>Каталог %1 Ñодержит уÑтаревший файл cbp. Qt Creator обновит Ñтот файл путём запуÑка cmake. ЕÑли требуетÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ дополнительные параметры командной Ñтроки, добавьте их ниже. Следует иметь в виду, что cmake запоминает параметры командной Ñтроки предыдущего запуÑка.</translation>
</message>
<message>
<location line="+6"/>
<source>The directory %1 specified in a build-configuration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note that cmake remembers command line arguments from the previous runs.</source>
- <translation>Указанный в наÑтройках Ñборки каталог %1 не Ñодержит файла cbp. Qt Creator ÑоздаÑÑ‚ Ñтот файл путём запуÑка cmake. Ðекоторые проекты требуют ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² командной Ñтроки Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ запуÑка cmake. Следует иметь в виду, что cmake запоминает параметры командной Ñтроки Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ запуÑка.</translation>
+ <translation>Указанный в наÑтройках Ñборки каталог %1 не Ñодержит файла cbp. Qt Creator ÑоздаÑÑ‚ Ñтот файл путём запуÑка cmake. Ðекоторые проекты требуют ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… параметров командной Ñтроки Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ запуÑка cmake. Следует иметь в виду, что cmake запоминает параметры командной Ñтроки предыдущего запуÑка.</translation>
</message>
<message>
<location line="+8"/>
<source>Qt Creator needs to run cmake in the new build directory. Some projects require command line arguments to the initial cmake call.</source>
- <translation>Qt Creator должен выполнить cmake в новом каталоге Ñборки. Ðекоторые проекты требуют ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² командной Ñтроки Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ запуÑка cmake.</translation>
+ <translation>Qt Creator должен выполнить cmake в новом каталоге Ñборки. Ðекоторые проекты требуют ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… параметров командной Ñтроки Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ запуÑка cmake.</translation>
</message>
<message>
<location line="+31"/>
@@ -544,7 +544,7 @@
<message>
<location line="+2"/>
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
- <translation>Укажите каталог, в котором желаете Ñобирать проект. Qt Creator рекомендует не иÑпользовать каталог Ñ Ð¸Ñходниками Ð´Ð»Ñ Ñборки. Ðто позволит каталогу Ñ Ð¸Ñходниками оÑтаватьÑÑ Ñ‡Ð¸Ñтым, а так же даÑÑ‚ возможноÑÑ‚ÑŒ делать неÑколько Ñборок Ñ Ñ€Ð°Ð·Ð½Ñ‹Ð¼Ð¸ наÑтройками.</translation>
+ <translation>Укажите каталог, в котором желаете Ñобирать проект. Qt Creator рекомендует не иÑпользовать каталог Ñ Ð¸Ñходниками Ð´Ð»Ñ Ñборки. Ðто позволит поддерживать каталог Ñ Ð¸Ñходниками в чиÑтоте, а также даÑÑ‚ возможноÑÑ‚ÑŒ делать неÑколько Ñборок Ñ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸ наÑтройками.</translation>
</message>
<message>
<location line="+8"/>
@@ -915,7 +915,7 @@
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
<source>These options take effect at the next start of Qt Creator.</source>
- <translation>Данные наÑтройки вÑтупÑÑ‚ в Ñилу только поÑле Ñледующего запуÑка Qt Creator.</translation>
+ <translation>Данные наÑтройки вÑтупÑÑ‚ в Ñилу поÑле перезапуÑка Qt Creator.</translation>
</message>
<message>
<location/>
@@ -936,12 +936,12 @@
<message>
<location/>
<source>Symbol paths:</source>
- <translation>Путь к Ñимволам:</translation>
+ <translation>Пути к Ñимволам:</translation>
</message>
<message>
<location/>
<source>Source paths:</source>
- <translation>Путь к иÑходным текÑтам:</translation>
+ <translation>Пути к иÑходным текÑтам:</translation>
</message>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
@@ -1051,7 +1051,7 @@
<context>
<name>CodePaster::CodepasterPlugin</name>
<message>
- <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
+ <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+110"/>
<source>&Code Pasting</source>
<translation type="unfinished">Ð’Ñтавка &Кода</translation>
</message>
@@ -1337,7 +1337,7 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="-1490"/>
- <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+531"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+539"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
@@ -1735,8 +1735,8 @@ Would you like to overwrite them?</source>
</context>
<context>
<name>Core::Internal::EditorView</name>
- <message id="===============EditorView====================">
- <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-442"/>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-450"/>
<source>Go Back</source>
<translation>Перейти назад</translation>
</message>
@@ -1757,7 +1757,7 @@ Would you like to overwrite them?</source>
<translation>Закрыть</translation>
</message>
<message>
- <location line="+213"/>
+ <location line="+221"/>
<source>Make writable</source>
<translation>Сделать запиÑываемым</translation>
</message>
@@ -2101,22 +2101,22 @@ Would you like to overwrite them?</source>
<message>
<location line="+1"/>
<source>Close Editor</source>
- <translation>Закрыть редактор</translation>
+ <translation>Закрыть документ</translation>
</message>
<message>
<location line="+2"/>
<source>Close All Except %1</source>
- <translation>Закрыть вÑе, кроме %1</translation>
+ <translation>Закрыть вÑÑ‘, кроме %1</translation>
</message>
<message>
<location line="+1"/>
<source>Close Other Editors</source>
- <translation>Закрыть другие редакторы</translation>
+ <translation>Закрыть оÑтальные документы</translation>
</message>
<message>
<location line="+1"/>
<source>Close All Editors</source>
- <translation>Закрыть вÑе редакторы</translation>
+ <translation>Закрыть вÑе документы</translation>
</message>
</context>
<context>
@@ -2497,24 +2497,24 @@ Would you like to overwrite them?</source>
<context>
<name>Utils::NewClassWidget</name>
<message>
- <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+416"/>
+ <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+417"/>
<source>Invalid base class name</source>
- <translation>Ðеверное Ð¸Ð¼Ñ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð³Ð¾ клаÑÑа</translation>
+ <translation>Ðекорректное Ð¸Ð¼Ñ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð³Ð¾ клаÑÑа</translation>
</message>
<message>
<location line="+7"/>
<source>Invalid header file name: '%1'</source>
- <translation>Ðеверное Ð¸Ð¼Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ файла: '%1'</translation>
+ <translation>Ðекорректное Ð¸Ð¼Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ файла: '%1'</translation>
</message>
<message>
<location line="+6"/>
<source>Invalid source file name: '%1'</source>
- <translation>Ðеверное Ð¸Ð¼Ñ Ð¸Ñходного файла: '%1'</translation>
+ <translation>Ðекорректное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° иÑходников: '%1'</translation>
</message>
<message>
<location line="+7"/>
<source>Invalid form file name: '%1'</source>
- <translation>Ðеверное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° формы: '%1'</translation>
+ <translation>Ðекорректное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° формы: '%1'</translation>
</message>
<message>
<location filename="../../../src/libs/utils/newclasswidget.ui"/>
@@ -2534,12 +2534,12 @@ Would you like to overwrite them?</source>
<message>
<location/>
<source>Source file:</source>
- <translation>ИÑходный файл:</translation>
+ <translation>Файл иÑходников:</translation>
</message>
<message>
<location/>
<source>Generate form:</source>
- <translation>Создать форму:</translation>
+ <translation type="unfinished">Создать форму:</translation>
</message>
<message>
<location/>
@@ -2554,7 +2554,22 @@ Would you like to overwrite them?</source>
<message>
<location/>
<source>Inherits QObject</source>
- <translation>ÐаÑледует QObject</translation>
+ <translation>ÐаÑледуетÑÑ Ð¾Ñ‚ QObject</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Type information:</source>
+ <translation type="unfinished">Тип клаÑÑа:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>None</source>
+ <translation type="unfinished">Ðе указан</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Inherits QWidget</source>
+ <translation>ÐаÑледуетÑÑ Ð¾Ñ‚ QWidget</translation>
</message>
</context>
<context>
@@ -2720,7 +2735,7 @@ Would you like to overwrite them?</source>
<message>
<location line="+4"/>
<source>The unsaved file %1 has been changed outside Qt Creator. Do you want to reload it and discard your changes?</source>
- <translation>ÐеÑохранённый файл %1 изменилÑÑ Ð²Ð½Ðµ Qt Creator. Перезагрузить его Ñ Ð¿Ð¾Ñ‚ÐµÑ€ÐµÐ¹ ваших изменений?</translation>
+ <translation>ÐеÑохранённый файл %1 изменилÑÑ Ð²Ð½Ðµ Qt Creator. Перезагрузить его Ñ Ð¿Ð¾Ñ‚ÐµÑ€ÐµÐ¹ изменений?</translation>
</message>
<message>
<location line="+3"/>
@@ -2813,7 +2828,7 @@ Would you like to overwrite them?</source>
<message>
<location line="+1"/>
<source>C++ Source File</source>
- <translation>ИÑходный файл C++</translation>
+ <translation>Файл иÑходных текÑтов C++</translation>
</message>
<message>
<location line="+4"/>
@@ -2871,7 +2886,7 @@ Would you like to overwrite them?</source>
<message>
<location/>
<source>Source suffix:</source>
- <translation>ИÑходный:</translation>
+ <translation>ИÑходные текÑÑ‚Ñ‹:</translation>
</message>
<message>
<location/>
@@ -2973,7 +2988,7 @@ Would you like to overwrite them?</source>
<context>
<name>CppTools::Internal::CppFindReferences</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+238"/>
+ <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+235"/>
<source>Searching...</source>
<translation>ПоиÑк...</translation>
</message>
@@ -2989,7 +3004,7 @@ Would you like to overwrite them?</source>
<context>
<name>CppTools::Internal::CppModelManager</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+295"/>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+319"/>
<source>Scanning</source>
<translatorcomment>Слово "Ñканирование" Ñлишком длинное</translatorcomment>
<translation>Ðнализ</translation>
@@ -3072,18 +3087,18 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::DebuggerManager</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+451"/>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+453"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location line="+3"/>
- <location line="+1207"/>
+ <location line="+1215"/>
<source>Interrupt</source>
<translation>Прервать</translation>
</message>
<message>
- <location line="-1204"/>
+ <location line="-1212"/>
<source>Reset Debugger</source>
<translation>СброÑить отладчик</translation>
</message>
@@ -3159,7 +3174,7 @@ Would you like to overwrite them?</source>
<translation>Приложению требуетÑÑ Ð´Ð²Ð¸Ð¶Ð¾Ðº отладчика '%1', который выключен.</translation>
</message>
<message>
- <location line="+123"/>
+ <location line="+125"/>
<source>Starting debugger for tool chain '%1'...</source>
<translation>ЗапуÑкаетÑÑ Ð¾Ñ‚Ð»Ð°Ð´Ñ‡Ð¸Ðº из инÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ñ '%1'...</translation>
</message>
@@ -3194,12 +3209,12 @@ Would you like to overwrite them?</source>
<translation>Помощник отладчика иÑпользуетÑÑ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ðº наглÑдному виду значений некоторых типов данных Qt и Ñтандартной библиотеки. Он должен быть Ñобран отдельно Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ верÑии Qt. Ðто можно Ñделать в параметрах Qt, выбрав профиль Qt и нажав на 'ПереÑобрать' в Ñтроке 'Помощник отладчика'.</translation>
</message>
<message>
- <location line="+164"/>
+ <location line="+170"/>
<source>Stop Debugger</source>
<translation>ОÑтановить отладчик</translation>
</message>
<message>
- <location line="-182"/>
+ <location line="-188"/>
<source>%1 (explicitly set in the Debugger Options)</source>
<translation>%1 (уÑтановлено в параметрах отладчика)</translation>
</message>
@@ -3548,7 +3563,7 @@ Would you like to overwrite them?</source>
<translation>Ðе удалоÑÑŒ продолжить: %1</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+31"/>
<source>Reverse stepping is not implemented.</source>
<translation>РеверÑивное движение не реализовано.</translation>
</message>
@@ -3558,24 +3573,19 @@ Would you like to overwrite them?</source>
<translation>ÐÐµÐ»ÑŒÐ·Ñ Ð´Ð²Ð¸Ð³Ð°Ñ‚ÑŒÑÑ Ð¿Ð¾ потоку %1.</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+37"/>
<source>Stepping %1</source>
<translation type="unfinished">Шаг %1</translation>
</message>
<message>
- <location line="+63"/>
- <source>Running to 0x%1...</source>
- <translation>ВыподнÑетÑÑ Ð´Ð¾ 0x%1...</translation>
- </message>
- <message>
- <location line="+67"/>
+ <location line="+94"/>
<source>Running requested...</source>
- <translation type="unfinished">Потребовано выполнение...</translation>
+ <translation type="unfinished">Затребовано выполнение...</translation>
</message>
<message>
<location line="+59"/>
<source>Running up to %1:%2...</source>
- <translation>Выподнение до Ñтроки %1:%2...</translation>
+ <translation>Выполнение до Ñтроки %1:%2...</translation>
</message>
<message>
<location line="+14"/>
@@ -3831,7 +3841,7 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::Internal::DebuggerPlugin</name>
<message>
- <location line="+269"/>
+ <location line="+270"/>
<source>Option '%1' is missing the parameter.</source>
<translation>У наÑтройки '%1' пропущен параметр.</translation>
</message>
@@ -3843,7 +3853,7 @@ Would you like to overwrite them?</source>
<message>
<location line="+54"/>
<source>Invalid debugger option: %1</source>
- <translation>Ðеверный параметр отладчика: %1</translation>
+ <translation>Ðекорректный параметр отладчика: %1</translation>
</message>
<message>
<location line="+22"/>
@@ -3876,7 +3886,7 @@ Would you like to overwrite them?</source>
<translation type="unfinished">Отцепить отладчик</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+45"/>
<source>Stop Debugger/Interrupt Debugger</source>
<translation>ОÑтановить/прервать отладчик</translation>
</message>
@@ -3901,7 +3911,7 @@ Would you like to overwrite them?</source>
<translation type="unfinished">Компоновка по умолчанию</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+87"/>
<source>Threads:</source>
<translation>Потоки:</translation>
</message>
@@ -3931,7 +3941,7 @@ Would you like to overwrite them?</source>
<translation>УÑтановить точку оÑтанова</translation>
</message>
<message>
- <location line="+229"/>
+ <location line="+230"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
@@ -3949,7 +3959,7 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::Internal::DebuggerRunControl</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+187"/>
+ <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+203"/>
<source>Debugger</source>
<translation>Отладчик</translation>
</message>
@@ -3957,7 +3967,7 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::Internal::DebuggerRunControlFactory</name>
<message>
- <location line="-108"/>
+ <location line="-123"/>
<source>Debug</source>
<translation>Отладка</translation>
</message>
@@ -4145,7 +4155,7 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::Internal::DebuggingHelperOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-912"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-926"/>
<source>Debugging Helper</source>
<translation>Помощник отладчика</translation>
</message>
@@ -4163,7 +4173,7 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::Internal::GdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+293"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+306"/>
<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>
@@ -4188,7 +4198,7 @@ Would you like to overwrite them?</source>
<translation>Возникла ошибка при получении данных от процеÑÑа Gdb. Ðапример, процеÑÑ Ð¼Ð¾Ð¶ÐµÑ‚ уже не работать.</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+119"/>
<source>Library %1 loaded.</source>
<translation>Библиотека %1 загружена.</translation>
</message>
@@ -4228,32 +4238,32 @@ Would you like to overwrite them?</source>
<translation>Чтение %1...</translation>
</message>
<message>
- <location line="+223"/>
+ <location line="+251"/>
<source>Stopping temporarily.</source>
<translation>Временно оÑтановлено.</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+88"/>
<source>Process failed to start.</source>
<translation>Ðе удалоÑÑŒ запуÑтить процеÑÑ.</translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+165"/>
<source>Jumped. Stopped.</source>
<translation>Переход Ñделан. ОÑтановлено.</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="-240"/>
<source>Processing queued commands.</source>
<translation>Обработка очереди команд.</translation>
</message>
<message>
- <location line="+54"/>
+ <location line="+392"/>
<source>Loading %1...</source>
<translation>ЗагружаетÑÑ %1...</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+105"/>
<source>Stopped at breakpoint.</source>
<translation>ОÑтановлено на точке оÑтанова.</translation>
</message>
@@ -4275,17 +4285,17 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="+5"/>
- <location line="+101"/>
+ <location line="+121"/>
<source>Stopped.</source>
<translation>ОÑтановлено.</translation>
</message>
<message>
- <location line="-99"/>
+ <location line="-119"/>
<source>Stopped: "%1"</source>
<translation>ОÑтановлено: "%1"</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+64"/>
<source>The debugger you are using identifies itself as:</source>
<translation>Отладчик, иÑпользуемый вами, определÑет ÑÐµÐ±Ñ ÐºÐ°Ðº:</translation>
</message>
@@ -4299,37 +4309,37 @@ Using gdb 6.7 or later is strongly recommended.</source>
ÐаÑтоÑтельно рекомендуетÑÑ Ð¸Ñпользование gdb верÑии не ниже 6.7.</translation>
</message>
<message>
- <location line="+260"/>
+ <location line="+265"/>
<source>Continuing after temporary stop...</source>
<translation>Продолжение поÑле временного оÑтанова...</translation>
</message>
<message>
- <location line="+2296"/>
+ <location line="+2284"/>
<source>The debugging helper library was not found at %1.</source>
<translation>Библиотека помощника отладчика не обнаружена в %1.</translation>
</message>
<message>
- <location line="+335"/>
+ <location line="+366"/>
<source>Unable to start gdb '%1': %2</source>
<translation>Ðе удалоÑÑŒ запуÑтить gdb '%1': %2</translation>
</message>
<message>
- <location line="+143"/>
+ <location line="+150"/>
<source>Adapter start failed</source>
<translation>Ðе удалоÑÑŒ запуÑтить адаптер</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+61"/>
<source>Inferior start failed</source>
<translation type="unfinished">Ðе удалоÑÑŒ запуÑтить подчинённого</translation>
</message>
<message>
- <location line="-2938"/>
+ <location line="-2980"/>
<source>Inferior shutdown failed</source>
<translation type="unfinished">Ðе удалоÑÑŒ оÑтановить подчинённого</translation>
</message>
<message>
- <location line="+2840"/>
+ <location line="+2859"/>
<source>Cannot find debugger initialization script</source>
<translation>Ðе удалоÑÑŒ найти Ñкрипт инициализации отладчика</translation>
</message>
@@ -4339,24 +4349,24 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>Ð’ наÑтройках указан файл Ñкрипта '%1', который ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ´Ð¾Ñтупен. ЕÑли файл Ñкрипта не обÑзателен, проÑто очиÑтите поле, чтобы не было Ñтого предупреждениÑ.</translation>
</message>
<message>
- <location line="-2138"/>
+ <location line="-2156"/>
<source>Unable to run '%1': %2</source>
<translation>Ðе удалоÑÑŒ запуÑтить '%1': %2</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+76"/>
<source><unknown></source>
<extracomment>End address of loaded module</extracomment>
<translation><неизвеÑтный></translation>
</message>
<message>
- <location line="+45"/>
+ <location line="+47"/>
<location line="+8"/>
<source>Retrieving data for stack view...</source>
<translation>Получение данных о Ñтеке...</translation>
</message>
<message numerus="yes">
- <location line="+856"/>
+ <location line="+864"/>
<source>Dumper version %1, %n custom dumpers found.</source>
<translation type="unfinished">
<numerusform>Дампер верÑии %1, обнаружен %n пользовательÑкий дампер.</numerusform>
@@ -4365,24 +4375,24 @@ Using gdb 6.7 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2889"/>
<source>An unknown error in the Gdb process occurred. </source>
<translation>ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° возникла у процеÑÑа Gdb. </translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+335"/>
<source>Stop requested...</source>
<translation>Потребована оÑтановка...</translation>
</message>
<message>
- <location line="+142"/>
- <location line="+27"/>
+ <location line="+197"/>
+ <location line="+29"/>
<location line="+3"/>
<source>Executable failed</source>
<translation>Программа завершилаÑÑŒ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹</translation>
</message>
<message>
- <location line="+212"/>
+ <location line="+229"/>
<source>Program exited with exit code %1.</source>
<translation>Программа завершилаÑÑŒ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %1.</translation>
</message>
@@ -4397,18 +4407,18 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>Программа нормально завершилаÑÑŒ.</translation>
</message>
<message>
- <location line="-481"/>
+ <location line="-561"/>
<source>Running...</source>
<translation>Выполнение...</translation>
</message>
<message>
- <location line="+256"/>
+ <location line="+319"/>
<location line="+8"/>
<source>Executable failed: %1</source>
<translation>Программа завершилаÑÑŒ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹: %1</translation>
</message>
<message>
- <location line="+489"/>
+ <location line="+537"/>
<source>Execution Error</source>
<translation>Ошибка выполнениÑ</translation>
</message>
@@ -4420,7 +4430,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location line="+217"/>
+ <location line="+214"/>
<source>Running requested...</source>
<translation>Потребован запуÑк...</translation>
</message>
@@ -4460,12 +4470,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>Потребовано выполнение до функции %1...</translation>
</message>
<message>
- <location line="+706"/>
+ <location line="+712"/>
<source>Jumping out of bogus frame...</source>
<translation type="unfinished">Выход из подложного кадра...</translation>
</message>
<message numerus="yes">
- <location line="+409"/>
+ <location line="+415"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
<translation>
<numerusform>Получение наблюдаемых данных (%n Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ‚ÑÑ)...</numerusform>
@@ -4484,7 +4494,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished">Помощники отладчика не найдены.</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+121"/>
<source>Custom dumper setup: %1</source>
<translation type="unfinished">ÐаÑтройка пользовательÑкого дампера: %1</translation>
</message>
@@ -4509,7 +4519,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation><затенено></translation>
</message>
<message>
- <location line="+133"/>
+ <location line="+134"/>
<source><n/a></source>
<translation><н/д></translation>
</message>
@@ -4525,14 +4535,14 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation><нет информации></translation>
</message>
<message>
- <location line="+333"/>
+ <location line="+349"/>
<location line="+25"/>
<location line="+14"/>
<source>Disassembler failed: %1</source>
<translation>Ðе удалоÑÑŒ дизаÑÑемблировать: %1</translation>
</message>
<message>
- <location line="+145"/>
+ <location line="+152"/>
<source>Gdb I/O Error</source>
<translation>Ошибка вводы/вывода gdb</translation>
</message>
@@ -4557,17 +4567,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>код %1</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+50"/>
<source>Setting breakpoints...</source>
<translation>УÑтановка точек оÑтанова...</translation>
</message>
<message>
- <location line="-8"/>
+ <location line="-23"/>
<source>Starting inferior...</source>
<translation type="unfinished">ЗапуÑк подчинённого...</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+65"/>
<source>Adapter crashed</source>
<translation>Ðдаптер аварийно завершилÑÑ</translation>
</message>
@@ -4725,12 +4735,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::PlainGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+70"/>
+ <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+79"/>
<source>Cannot set up communication with child process: %1</source>
<translation>Ðе удалоÑÑŒ уÑтановить ÑвÑзь Ñ Ð´Ð¾Ñ‡ÐµÑ€Ð½Ð¸Ð¼ процеÑÑом: %1</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+43"/>
<source>Starting executable failed:
</source>
<translation>Ðе удалоÑÑŒ запуÑтить программу:
@@ -4806,7 +4816,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::RemoteGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+93"/>
+ <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+112"/>
<source>The upload process failed to start. Shell missing?</source>
<translation type="unfinished">Ðе удалоÑÑŒ запуÑтить процеÑÑ Ð²Ñ‹Ð³Ñ€ÑƒÐ·ÐºÐ¸. ОтÑутÑтвует оболочка?</translation>
</message>
@@ -4900,7 +4910,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+76"/>
<source>Source Files</source>
- <translation>ИÑходные файлы</translation>
+ <translation>Файлы иÑходных текÑтов</translation>
</message>
<message>
<location line="+27"/>
@@ -4921,7 +4931,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::StackHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+66"/>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+67"/>
<location line="+14"/>
<source>Address:</source>
<translation>ÐдреÑ:</translation>
@@ -5043,7 +5053,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>Стек</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+42"/>
<source>Copy contents to clipboard</source>
<translation>Скопировать Ñодержимое в буфер обмена</translation>
</message>
@@ -5125,30 +5135,20 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::TrkGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1597"/>
+ <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1605"/>
<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 line="+24"/>
+ <location line="+25"/>
<source>Connecting to TRK server adapter failed:
</source>
<translation>Ðе удалоÑÑŒ подключитьÑÑ Ðº адаптеру TRK Ñервера:
-</translation>
- </message>
- <message>
- <source>Connecting to trk server adapter failed:
-</source>
- <translation type="obsolete">Ðе удалоÑÑŒ подключитьÑÑ Ðº адаптеру trk Ñервера:
</translation>
</message>
</context>
<context>
<name>Debugger::Internal::TrkOptionsPage</name>
- <message>
- <source>Symbian Trk</source>
- <translation type="obsolete">Symbian Trk</translation>
- </message>
<message>
<location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
<source>Symbian TRK</source>
@@ -5201,7 +5201,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::WatchData</name>
<message>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+71"/>
+ <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+72"/>
<location line="+250"/>
<source><not in scope></source>
<translation><вне облаÑти></translation>
@@ -5255,12 +5255,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>Поколение</translation>
</message>
<message>
- <location line="+1115"/>
+ <location line="+1121"/>
<source><Edit></source>
<translation><Измените></translation>
</message>
<message>
- <location line="-1084"/>
+ <location line="-1090"/>
<source>Root</source>
<translation type="unfinished">Корень</translation>
</message>
@@ -5283,7 +5283,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::WatchModel</name>
<message>
- <location line="+405"/>
+ <location line="+411"/>
<source>decimal</source>
<translation>деÑÑтичный</translation>
</message>
@@ -5538,7 +5538,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Designer::Internal::FormClassWizardPage</name>
<message>
- <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+148"/>
+ <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+149"/>
<source>%1 - Error</source>
<translation>%1 - Ошибка</translation>
</message>
@@ -5955,7 +5955,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location filename="../../../src/libs/extensionsystem/pluginerrorview.cpp" line="+79"/>
<source>Invalid</source>
- <translation>Ðеверный</translation>
+ <translation>Ðекорректный</translation>
</message>
<message>
<location line="+1"/>
@@ -6084,17 +6084,17 @@ Reason: %3</source>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+944"/>
+ <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+940"/>
<source>Not implemented in FakeVim</source>
<translation>Ðе реализовано в FakeVim</translation>
</message>
<message>
- <location line="-695"/>
+ <location line="-696"/>
<source>E20: Mark '%1' not set</source>
<translation>E20: Отметка '%1' не уÑтановлена</translation>
</message>
<message>
- <location line="+671"/>
+ <location line="+672"/>
<source>%1%2%</source>
<translation>%1%2%</translation>
</message>
@@ -6167,7 +6167,7 @@ Reason: %3</source>
<translation>Шаблон не найден: </translation>
</message>
<message>
- <location line="+570"/>
+ <location line="+573"/>
<source>Already at oldest change</source>
<translation>Уже на первом изменении</translation>
</message>
@@ -6507,7 +6507,7 @@ Reason: %3</source>
<translation>Результаты поиÑка</translation>
</message>
<message>
- <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+67"/>
+ <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+68"/>
<source>No matches found!</source>
<translation>Совпадений не найдено!</translation>
</message>
@@ -8090,7 +8090,7 @@ Perl через переменные Ñреды окружениÑ.</translation
<message>
<location line="+63"/>
<source>Copy &Link Location</source>
- <translation>Копировать размещение ÑÑ&ылки</translation>
+ <translation>Копировать размещение ÑÑÑ‹&лки</translation>
</message>
<message>
<location line="+3"/>
@@ -8121,7 +8121,7 @@ Perl через переменные Ñреды окружениÑ.</translation
<message>
<location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+76"/>
<source>Type Ctrl-<Return> to execute a line.</source>
- <translation>Ðажмите Ctrl-<Ввод> Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñтроки.</translation>
+ <translation>Ðажмите Ctrl-<Ввод> Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñтроки.</translation>
</message>
</context>
<context>
@@ -8292,7 +8292,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp.</translation>
<context>
<name>MimeType</name>
<message>
- <location filename="../../../build/46/share/qtcreator/translations/mime_tr.h" line="+1"/>
+ <location filename="mime_tr.h" line="+1"/>
<source>unknown</source>
<translation>неизвеÑтный</translation>
</message>
@@ -8304,7 +8304,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp.</translation>
<message>
<location line="+1"/>
<source>C Source file</source>
- <translation>ИÑходный файл C</translation>
+ <translation>Файл иÑходных текÑтов C</translation>
</message>
<message>
<location line="+1"/>
@@ -8324,17 +8324,17 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp.</translation>
<message>
<location line="+1"/>
<source>C++ Source file</source>
- <translation>ИÑходный файл C++</translation>
+ <translation>Файл иÑходных текÑтов C++</translation>
</message>
<message>
<location line="+1"/>
<source>C++ source code</source>
- <translation>ИÑходный файл C++</translation>
+ <translation>Файл иÑходных текÑтов C++</translation>
</message>
<message>
<location line="+1"/>
<source>Objective-C source code</source>
- <translation>ИÑходный файл Objective-C</translation>
+ <translation>Файл иÑходных текÑтов Objective-C</translation>
</message>
<message>
<location line="+1"/>
@@ -8447,173 +8447,173 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp.</translation>
<message>
<location line="+90"/>
<source>Invalid encoding</source>
- <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°</translation>
+ <translation>ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°</translation>
</message>
<message>
<location line="+54"/>
<source>Invalid name</source>
- <translation>Ðеверное имÑ</translation>
+ <translation>Ðекорректное имÑ</translation>
</message>
<message>
<location line="+40"/>
<location line="+9"/>
<source>Invalid nested-name</source>
- <translation>Ðеверный nested-name</translation>
+ <translation>Ðекорректный nested-name</translation>
</message>
<message>
<location line="+111"/>
<location line="+8"/>
<source>Invalid template args</source>
- <translation>Ðеверные аргументы шаблона</translation>
+ <translation>Ðекорректные аргументы шаблона</translation>
</message>
<message>
<location line="+18"/>
<location line="+8"/>
<source>Invalid template-param</source>
- <translation>Ðеверный template-param</translation>
+ <translation>Ðекорректный template-param</translation>
</message>
<message>
<location line="+19"/>
<source>Invalid qualifiers: unexpected 'volatile'</source>
- <translation>Ðеверный Ñпецификатор: неожиданный 'volatile'</translation>
+ <translation>Ðекорректный Ñпецификатор: неожиданный 'volatile'</translation>
</message>
<message>
<location line="+9"/>
<source>Invalid qualifiers: 'const' appears twice</source>
- <translation>Ðеверный Ñпецификатор: 'const' указан дважды</translation>
+ <translation>Ðекорректный Ñпецификатор: 'const' указан дважды</translation>
</message>
<message>
<location line="+43"/>
<source>Invalid non-negative number</source>
- <translation>Ðеверное неотрицательное чиÑло</translation>
+ <translation>Ðекорректное неотрицательное чиÑло</translation>
</message>
<message>
<location line="+58"/>
<location line="+9"/>
<location line="+2"/>
<source>Invalid template-arg</source>
- <translation>Ðеверный template-arg</translation>
+ <translation>Ðекорректный template-arg</translation>
</message>
<message>
<location line="+64"/>
<location line="+15"/>
<location line="+43"/>
<source>Invalid expression</source>
- <translation>Ðеверное выражение</translation>
+ <translation>Ðекорректное выражение</translation>
</message>
<message>
<location line="+20"/>
<source>Invalid primary expression</source>
- <translation>Ðеверное оÑновное выражение</translation>
+ <translation>Ðекорректное оÑновное выражение</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<location line="+3"/>
<source>Invalid expr-primary</source>
- <translation>Ðеверное expr-primary</translation>
+ <translation>Ðекорректное expr-primary</translation>
</message>
<message>
<location line="+135"/>
<location line="+5"/>
<location line="+68"/>
<source>Invalid type</source>
- <translation>Ðеверный тип</translation>
+ <translation>Ðекорректный тип</translation>
</message>
<message>
<location line="+138"/>
<source>Invalid built-in type</source>
- <translation>Ðеверный вÑтроенный тип</translation>
+ <translation>Ðекорректный вÑтроенный тип</translation>
</message>
<message>
<location line="+7"/>
<source>Invalid builtin-type</source>
- <translation>Ðеверный вÑтроенный тип</translation>
+ <translation>Ðекорректный вÑтроенный тип</translation>
</message>
<message>
<location line="+16"/>
<location line="+8"/>
<source>Invalid function type</source>
- <translation>Ðеверный тип функции</translation>
+ <translation>Ðекорректный тип функции</translation>
</message>
<message>
<location line="+80"/>
<location line="+328"/>
<source>Invalid unqualified-name</source>
- <translation>Ðеверный unqualified-name</translation>
+ <translation>Ðекорректный unqualified-name</translation>
</message>
<message>
<location line="-237"/>
<source>Invalid operator-name '%s'</source>
- <translation>Ðеверное Ð¸Ð¼Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð° '%s'</translation>
+ <translation>Ðекорректное Ð¸Ð¼Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð° '%s'</translation>
</message>
<message>
<location line="+22"/>
<location line="+10"/>
<source>Invalid array-type</source>
- <translation>Ðеверный array-type</translation>
+ <translation>Ðекорректный array-type</translation>
</message>
<message>
<location line="+17"/>
<source>Invalid pointer-to-member-type</source>
- <translation>Ðеверный тип ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° член клаÑÑа</translation>
+ <translation>Ðекорректный тип ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° член клаÑÑа</translation>
</message>
<message>
<location line="+47"/>
<location line="+10"/>
<location line="+36"/>
<source>Invalid substitution</source>
- <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¿Ð¾Ð´Ñтановка</translation>
+ <translation>ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð¿Ð¾Ð´Ñтановка</translation>
</message>
<message>
<location line="-42"/>
<source>Invalid substitution: element %1 was requested, but there are only %2</source>
- <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¿Ð¾Ð´Ñтановка: необходим Ñлемент %1, но еÑÑ‚ÑŒ только %2</translation>
+ <translation>ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð¿Ð¾Ð´Ñтановка: необходим Ñлемент %1, но еÑÑ‚ÑŒ только %2</translation>
</message>
<message>
<location line="+11"/>
<source>Invalid substitution: There are no elements</source>
- <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¿Ð¾Ð´Ñтановка: нет Ñлементов</translation>
+ <translation>ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð¿Ð¾Ð´Ñтановка: нет Ñлементов</translation>
</message>
<message>
<location line="+103"/>
<source>Invalid special-name</source>
- <translation>Ðеверный special-name</translation>
+ <translation>Ðекорректный special-name</translation>
</message>
<message>
<location line="+43"/>
<location line="+4"/>
<location line="+13"/>
<source>Invalid local-name</source>
- <translation>Ðеверный local-name</translation>
+ <translation>Ðекорректный local-name</translation>
</message>
<message>
<location line="+16"/>
<source>Invalid discriminator</source>
- <translation>Ðеверный клаÑÑификатор</translation>
+ <translation>Ðекорректный клаÑÑификатор</translation>
</message>
<message>
<location line="+32"/>
<location line="+11"/>
<location line="+4"/>
<source>Invalid ctor-dtor-name</source>
- <translation>Ðеверный ctor-dtor-name</translation>
+ <translation>Ðекорректное Ð¸Ð¼Ñ ÐºÐ¾Ð½Ñтруктора/деÑтруктора</translation>
</message>
<message>
<location line="+48"/>
<location line="+3"/>
<source>Invalid call-offset</source>
- <translation>Ðеверный call-offset</translation>
+ <translation>Ðекорректный call-offset</translation>
</message>
<message>
<location line="+22"/>
<source>Invalid v-offset</source>
- <translation>Ðеверный v-offset</translation>
+ <translation>Ðекорректный v-offset</translation>
</message>
<message>
<location line="+12"/>
<source>Invalid digit</source>
- <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ†Ð¸Ñ„Ñ€Ð°</translation>
+ <translation>ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ñ†Ð¸Ñ„Ñ€Ð°</translation>
</message>
<message>
<location line="+9"/>
@@ -9161,7 +9161,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+59"/>
<source>Invalid configuration: %1</source>
- <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ: %1</translation>
+ <translation>ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ: %1</translation>
</message>
<message>
<location line="+63"/>
@@ -9319,7 +9319,7 @@ p, li { white-space: pre-wrap; }
<location filename="../../../src/libs/extensionsystem/optionsparser.cpp" line="+106"/>
<location line="+18"/>
<source>The plugin '%1' does not exist.</source>
- <translation>Модуль '%1' отÑутÑтвует.</translation>
+ <translation>Модуль '%1' не ÑущеÑтвует.</translation>
</message>
<message>
<location line="+45"/>
@@ -9342,12 +9342,12 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+5"/>
<source>'%1' has invalid format</source>
- <translation>'%1' имеет неверный формат</translation>
+ <translation>'%1' имеет некорректный формат</translation>
</message>
<message>
<location line="+5"/>
<source>Invalid element '%1'</source>
- <translation>Ðеверный Ñлемент '%1'</translation>
+ <translation>Ðекорректный Ñлемент '%1'</translation>
</message>
<message>
<location line="+5"/>
@@ -9362,12 +9362,12 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+11"/>
<source>Expected element '%1' as top level element</source>
- <translation>ОжидаетÑÑ Ñлемент '%1' в качеÑтве корневого</translation>
+ <translation>ОжидаетÑÑ Ñлемент '%1' в качеÑтве корневого Ñлемента</translation>
</message>
<message>
<location line="+234"/>
<source>Resolving dependencies failed because state != Read</source>
- <translation>Разрешить завиÑимоÑти не удалоÑÑŒ, так как ÑоÑтоÑние != Read</translation>
+ <translation>Ðе удалоÑÑŒ разрешить завиÑимоÑти, так как state != Read</translation>
</message>
<message>
<location line="+17"/>
@@ -9377,22 +9377,22 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+24"/>
<source>Loading the library failed because state != Resolved</source>
- <translation>Ðе удалоÑÑŒ загрузить библиотеку, так как ÑоÑтоÑние != Resolved</translation>
+ <translation>Ðе удалоÑÑŒ загрузить библиотеку, так как state != Resolved</translation>
</message>
<message>
<location line="+35"/>
<source>Plugin is not valid (does not derive from IPlugin)</source>
- <translation>Модуль некорректен (не потомок IPlugin)</translation>
+ <translation>Ðекорретный модуль (не потомок IPlugin)</translation>
</message>
<message>
<location line="+21"/>
<source>Initializing the plugin failed because state != Loaded</source>
- <translation>Ðе удалоÑÑŒ инициализировать модуль, так как ÑоÑтоÑние != Loaded</translation>
+ <translation>Ðе удалоÑÑŒ инициализировать модуль, так как state != Loaded</translation>
</message>
<message>
<location line="+5"/>
<source>Internal error: have no plugin instance to initialize</source>
- <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: отÑутÑтвуют ÑкземлÑры Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸</translation>
+ <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: отÑутÑтвует ÑкземплÑÑ€ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸</translation>
</message>
<message>
<location line="+6"/>
@@ -9402,12 +9402,12 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+19"/>
<source>Cannot perform extensionsInitialized because state != Initialized</source>
- <translation>ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ extensionsInitialized, так как ÑоÑтоÑние != Initialized</translation>
+ <translation>Ðевозможно выполнить extensionsInitialized, так как state != Initialized</translation>
</message>
<message>
<location line="+5"/>
<source>Internal error: have no plugin instance to perform extensionsInitialized</source>
- <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: отÑутÑтвует ÑкземлÑÑ€ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ extensionsInitialized</translation>
+ <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: отÑутÑтвует ÑкземплÑÑ€ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ extensionsInitialized</translation>
</message>
</context>
<context>
@@ -9440,7 +9440,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+126"/>
<source>Failed to start program. Path or permissions wrong?</source>
- <translation>Ðе удалоÑÑŒ запуÑтить программу. Путь или права неверны?</translation>
+ <translation>Ðе удалоÑÑŒ запуÑтить программу. Путь или права недопуÑтимы?</translation>
</message>
<message>
<location line="+3"/>
@@ -9655,6 +9655,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::ActiveConfigurationWidget</name>
<message>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+2181"/>
<location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+181"/>
<source>Active run configuration</source>
<translation>ÐÐºÑ‚Ð¸Ð²Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿ÑƒÑка</translation>
@@ -10238,7 +10239,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::ProjectWelcomePage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+47"/>
+ <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+48"/>
<source>Develop</source>
<translation>Разработка</translation>
</message>
@@ -10361,7 +10362,7 @@ Reason: %2</source>
<translation>Удалить</translation>
</message>
<message>
- <location line="+133"/>
+ <location line="+138"/>
<source><a href="#">Make %1 active.</a></source>
<translation type="unfinished"><a href="#">Ðктивизировать %1.</a></translation>
</message>
@@ -10376,7 +10377,7 @@ Reason: %2</source>
<message>
<location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
<source>Session Manager</source>
- <translation>Управление ÑеÑÑией</translation>
+ <translation>Управление ÑеÑÑиÑми</translation>
</message>
<message>
<location/>
@@ -10443,12 +10444,12 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::Internal::WinGuiProcess</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+122"/>
+ <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+125"/>
<source>The process could not be started!</source>
<translation>Ðе удалоÑÑŒ запуÑтить процеÑÑ!</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+5"/>
<source>Cannot retrieve debugging output!</source>
<translation>Ðе удалоÑÑŒ получить отладочный вывод!</translation>
</message>
@@ -10492,7 +10493,7 @@ Reason: %2</source>
<context>
<name>ProjectExplorer::ProjectExplorerPlugin</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+257"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="-1923"/>
<source>Projects</source>
<translation>Проекты</translation>
</message>
@@ -10559,7 +10560,7 @@ Reason: %2</source>
<message>
<location line="+2"/>
<source>Show containing folder...</source>
- <translation type="unfinished">Показать Ñодержимое папки...</translation>
+ <translation>Открыть каталог в отдельном окне...</translation>
</message>
<message>
<location line="+13"/>
@@ -10589,7 +10590,8 @@ Reason: %2</source>
<message>
<location line="+10"/>
<source>Set Build Configuration</source>
- <translation>УÑтановить конфигурацию Ñборки</translation>
+ <translatorcomment>Было "УÑтановить конфигурацию Ñборки", выглÑдело не очень</translatorcomment>
+ <translation>ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñборки</translation>
</message>
<message>
<location line="+10"/>
@@ -10675,7 +10677,8 @@ Reason: %2</source>
<message>
<location line="+5"/>
<source>Set Run Configuration</source>
- <translation>УÑтановить конфигурацию запуÑка</translation>
+ <translatorcomment>Было "УÑтановить конфигурацию запуÑка", выглÑдело не очень</translatorcomment>
+ <translation>ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿ÑƒÑка</translation>
</message>
<message>
<location line="+16"/>
@@ -10725,7 +10728,7 @@ Reason: %2</source>
<translation>Ðовый проект</translation>
</message>
<message>
- <location line="+900"/>
+ <location line="+904"/>
<source>New File</source>
<comment>Title of dialog</comment>
<translation>Ðовый файл</translation>
@@ -10784,7 +10787,7 @@ to version control (%2)?</source>
<translation>Ðе удалоÑÑŒ найти explorer.exe по адреÑу Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка Проводника Windows.</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+18"/>
<source>Launching a file explorer failed</source>
<translation>Ðе удалоÑÑŒ запуÑтить проводник файлов</translation>
</message>
@@ -10847,12 +10850,12 @@ to version control (%2)?</source>
<translation>Ðто может произойти, еÑли Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñборки иÑпользует неверные Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ конфигурации запуÑка верÑию Qt и/или инÑтрументарий (например, Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð° ÑмулÑторе Symbian требуетÑÑ Ñборка Ñ Ð¸Ñпользованием инÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ñ WINSCW).</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+24"/>
<source>Choose build configuration:</source>
<translation>Выберите конфигурацию Ñборки:</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-9"/>
<source>No valid build configuration found.</source>
<translation>ÐšÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñборки не найдена.</translation>
</message>
@@ -10929,7 +10932,7 @@ to version control (%2)?</source>
<message>
<location/>
<source>Effective qmake call:</source>
- <translation>ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока вызова qmake:</translation>
+ <translation>Параметры вызова qmake:</translation>
</message>
</context>
<context>
@@ -10942,7 +10945,7 @@ to version control (%2)?</source>
<message>
<location line="+1"/>
<source>Expected Failure</source>
- <translation>ÐžÐ¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð°</translation>
+ <translation>ÐžÐ¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð°</translation>
</message>
<message>
<location line="+1"/>
@@ -10952,7 +10955,7 @@ to version control (%2)?</source>
<message>
<location line="+1"/>
<source>Expected Pass</source>
- <translation>Ожиданный уÑпех</translation>
+ <translation>Ожидаемый уÑпех</translation>
</message>
<message>
<location line="+9"/>
@@ -10988,7 +10991,7 @@ to version control (%2)?</source>
<location line="+1"/>
<source>Skipped</source>
<translatorcomment>не думаю, что Ñтоит переводить</translatorcomment>
- <translation>Skipped</translation>
+ <translation>Пропущено</translation>
</message>
<message>
<location line="+1"/>
@@ -11020,7 +11023,7 @@ to version control (%2)?</source>
<message>
<location line="+45"/>
<source>All Incidents</source>
- <translation type="unfinished">Ð’Ñе инциденты</translation>
+ <translation>Ð’Ñе проиÑшеÑтвиÑ</translation>
</message>
<message>
<location line="+9"/>
@@ -11301,12 +11304,12 @@ to version control (%2)?</source>
<message>
<location/>
<source>Create s&keleton</source>
- <translation>Создать Ñ&келет</translation>
+ <translation type="unfinished">Создать &оÑнову</translation>
</message>
<message>
<location/>
<source>Include pro&ject</source>
- <translation type="unfinished">Включить в про&ект</translation>
+ <translation type="unfinished">Включить про&ект</translation>
</message>
<message>
<location/>
@@ -11556,7 +11559,7 @@ to version control (%2)?</source>
<message>
<location line="+2"/>
<source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
- <translation>Укажите базовую информацию о клаÑÑах, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… желаете Ñоздать шаблоны иÑходных файлов.</translation>
+ <translation>Укажите базовую информацию о клаÑÑах, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… желаете Ñоздать шаблоны файлов иÑходных текÑтов.</translation>
</message>
</context>
<context>
@@ -11632,12 +11635,12 @@ to version control (%2)?</source>
<message>
<location line="+81"/>
<source>Copy Project to writable Location?</source>
- <translation type="unfinished">Скопировать проект туда, где разрешена запиÑÑŒ?</translation>
+ <translation type="unfinished">Скопировать проект в каталог Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ на запиÑÑŒ?</translation>
</message>
<message>
<location line="+3"/>
<source><p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p></source>
- <translation type="unfinished"><p>Открываемый проект находитÑÑ Ð² защищённом от запиÑи папке:</p><blockquote>%1</blockquote><p>Выберите ниже папку, в которую разрешена запиÑÑŒ, и щёлкните "Скопировать и открыть", Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½Ñемой копии проекта, или "Открыть Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ", чтобы открыть в текущей папке.</p><p><b>Замечание:</b> Ð½ÐµÐ»ÑŒÐ·Ñ Ð¼ÐµÐ½ÑÑ‚ÑŒ и компилировать проект раÑположенный в текущей папке.</p></translation>
+ <translation type="unfinished"><p>Открываемый проект находитÑÑ Ð² защищённом от запиÑи каталоге:</p><blockquote>%1</blockquote><p>Ðиже выберите каталог, в который разрешена запиÑÑŒ, и щёлкните "Скопировать и открыть", Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½Ñемой копии проекта, или "Открыть Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ", чтобы открыть проект в текущем каталоге.</p><p><b>Замечание:</b> изменение и Ñборка проекта, раÑположенного в данном каталоге, недоÑтупны.</p></translation>
</message>
<message>
<location line="+8"/>
@@ -11662,7 +11665,7 @@ to version control (%2)?</source>
<message>
<location line="+1"/>
<source>The specified location already exists. Please specify a valid location.</source>
- <translation type="unfinished">Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° уже ÑущеÑтвует. Укажите другую папку.</translation>
+ <translation type="unfinished">Указанный каталог уже ÑущеÑтвует. Укажите другой каталог.</translation>
</message>
<message>
<location line="+61"/>
@@ -11686,18 +11689,17 @@ to version control (%2)?</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><li></li><li>6 - Output</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><li></li><li>6 - Вывод</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><li></li><li>6 - Вывод</li></ul></translation>
</message>
<message>
<location line="+4"/>
<source>You can show and hide the side bar using <tt>%1+0<tt>.</source>
- <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
- <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"/>
@@ -11707,7 +11709,7 @@ to version control (%2)?</source>
<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 type="unfinished">Ðвтодополнение кода ориентировано на ВерблюжийРегиÑÑ‚Ñ€. Ðапример, чтобы получить <tt>namespaceUri</tt> вы можете проÑто ввеÑти <tt>nU</tt> и нажать <tt>Ctrl+Space</tt>.</translation>
</message>
<message>
<location line="+2"/>
@@ -11717,23 +11719,22 @@ to version control (%2)?</source>
<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>
- <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
- <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"/>
@@ -11743,31 +11744,22 @@ to version control (%2)?</source>
<message>
<location line="+2"/>
<source>Within a session, you can add <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies">dependencies</a> between projects.</source>
- <translation>Внутри одной ÑеÑÑии вы можете добавлÑÑ‚ÑŒ <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies">завиÑимоÑти</a> проектов друг от друга.</translation>
+ <translation>Ð’ пределах одной ÑеÑÑии вы можете добавлÑÑ‚ÑŒ <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.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 modify the binary that is being executed when you press the <tt>Run</tt> button: Add a <tt>Custom Executable</tt> by clicking the <tt>+</tt> button in <tt>Projects -> Run Settings -> Run Configuration</tt> and then select the new target in the combo box.</source>
- <translation>Ð’Ñ‹ можете Ñменить программу, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð·Ð°Ð¿ÑƒÑкаетÑÑ Ð¿Ñ€Ð¸ нажатии на кнопку <tt>Run</tt>: Добавьте <tt>Другую программу</tt> нажатием на кнопку <tt>+</tt> в <tt>Проекты - ÐаÑтройки запуÑка - ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿ÑƒÑка</tt> и выберите новую цель в выпадающем ÑпиÑке.</translation>
- </message>
- <message>
- <location line="+3"/>
<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>
</message>
<message>
<location line="+2"/>
<source>In the editor, <tt>F2</tt> follows symbol definition, <tt>Shift+F2</tt> toggles declaration and definition while <tt>F4</tt> toggles header file and source file.</source>
- <translation>Ð’ редакторе: <tt>F2</tt> делает переход к определению Ñимвола, <tt>Shift+F2</tt> переключает объÑвление и определение, а <tt>F4</tt> - заголовочный и иÑходный файл.</translation>
- </message>
- <message>
- <source>In the editor, <tt>F2</tt> toggles declaration and definition while <tt>F4</tt> toggles header file and source file.</source>
- <translation type="obsolete">Ð’ редакторе клавиша <tt>F2</tt> переключает объÑвление и определение, а <tt>F4</tt> - заголовочный и иÑходный файл.</translation>
+ <translation>Ð’ редакторе: <tt>F2</tt> делает переход к определению Ñимвола, <tt>Shift+F2</tt> переключает объÑвление и определение, а <tt>F4</tt> переключает заголовочный файл и файл иÑходных текÑтов.</translation>
</message>
</context>
<context>
@@ -11785,7 +11777,7 @@ to version control (%2)?</source>
<message>
<location line="+125"/>
<source>The template file '%1' could not be opened for reading: %2</source>
- <translation>Шаблонный файл '%1' не открываетÑÑ Ð½Ð° чтение: %2</translation>
+ <translation>Файл шаблона '%1' не может быть открыт Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ: %2</translation>
</message>
</context>
<context>
@@ -11793,7 +11785,7 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp" line="+63"/>
<source>This wizard generates a Qt4 GUI application project. The application derives by default from QApplication and includes an empty widget.</source>
- <translation>Ðтот маÑтер ÑоздаÑÑ‚ проект графичеÑкого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt4. По умолчанию, оно будет потомком QApplication, а так же будет включать пуÑтой виджет.</translation>
+ <translation>Ðтот маÑтер ÑоздаÑÑ‚ проект графичеÑкого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt4. По умолчанию приложение будет базироватьÑÑ Ð½Ð° QApplication и будет включать пуÑтой виджет.</translation>
</message>
</context>
<context>
@@ -12124,7 +12116,7 @@ to version control (%2)?</source>
<message>
<location/>
<source>This Qt-Version is invalid.</source>
- <translation>Ðеверный профиль Qt.</translation>
+ <translation>Ðекорректный профиль Qt.</translation>
</message>
<message>
<location/>
@@ -12191,7 +12183,7 @@ to version control (%2)?</source>
<name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+72"/>
- <location line="+458"/>
+ <location line="+459"/>
<source>Qt4RunConfiguration</source>
<translation>Qt4RunConfiguration</translation>
</message>
@@ -12339,7 +12331,7 @@ to version control (%2)?</source>
<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="+124"/>
+ <location line="+126"/>
<source>The Qt Version identified by %1 is not installed. Run make install</source>
<translation>ВерÑÐ¸Ñ Qt, Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ðº %1, не уÑтановлена. Выполните make install</translation>
</message>
@@ -12452,8 +12444,8 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <source>CLS/GCCE Directory:</source>
- <translation>Каталог CLS/GCCE:</translation>
+ <source>CSL/GCCE Directory:</source>
+ <translation>Каталог CSL/GCCE:</translation>
</message>
</context>
<context>
@@ -12571,10 +12563,6 @@ p, li { white-space: pre-wrap; }
<source>Connecting...</source>
<translation>Подключение...</translation>
</message>
- <message>
- <source>A timeout occurred while querying the device. Check whether Trk is running</source>
- <translation type="obsolete">ИÑтекло Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ от уÑтройÑтва. Проверьте, запущена Trk или нет</translation>
- </message>
<message>
<location line="-198"/>
<source>Self-signed certificate</source>
@@ -12671,12 +12659,6 @@ Check if the phone is connected and App TRK is running.</source>
Deploying application to '%2'...</source>
<translation>Пакет: %1
УÑтановка Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ð° '%2'...</translation>
- </message>
- <message>
- <source>Could not connect to phone on port '%1': %2
-Check if the phone is connected and the TRK application is running.</source>
- <translation type="obsolete">Ðе удалоÑÑŒ подключитьÑÑ Ðº телефону через порт '%1': %2
-УбедитеÑÑŒ, что телефон подключён, и на нём работает приложение TRK.</translation>
</message>
<message>
<location line="+30"/>
@@ -13113,7 +13095,7 @@ Check if the phone is connected and the TRK application is running.</source>
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+351"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+347"/>
<source><not found></source>
<translation><не найдена></translation>
</message>
@@ -13124,7 +13106,7 @@ Check if the phone is connected and the TRK application is running.</source>
<translation>Qt в PATH</translation>
</message>
<message>
- <location line="+147"/>
+ <location line="+144"/>
<source>Name:</source>
<translation>Ðазвание:</translation>
</message>
@@ -13149,7 +13131,7 @@ Check if the phone is connected and the TRK application is running.</source>
<translation>По умолчанию:</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Compiler:</source>
<translation>КомпилÑтор:</translation>
</message>
@@ -13167,9 +13149,9 @@ Check if the phone is connected and the TRK application is running.</source>
<context>
<name>QApplication</name>
<message>
- <location line="+872"/>
+ <location line="+870"/>
<source>The Qt Version has no toolchain.</source>
- <translation>У Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Qt нет инÑтрументариÑ.</translation>
+ <translation type="unfinished">У Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Qt нет инÑтрументариÑ.</translation>
</message>
</context>
<context>
@@ -13202,7 +13184,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>Classes for network programming</source>
- <translation>КлаÑÑÑ‹, необходимые Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ Ñетью</translation>
+ <translation>КлаÑÑÑ‹ Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ Ñетью</translation>
</message>
<message>
<location line="+3"/>
@@ -13212,7 +13194,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>OpenGL support classes</source>
- <translation>КлаÑÑÑ‹ поддержки OpenGL</translation>
+ <translation>КлаÑÑÑ‹ Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ OpenGL</translation>
</message>
<message>
<location line="+3"/>
@@ -13302,7 +13284,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>Classes for low-level multimedia functionality</source>
- <translation>КлаÑÑÑ‹ Ð´Ð»Ñ Ð½Ð¸Ð·ÐºÐ¾ÑƒÑ€Ð¾Ð²Ð½ÐµÐ²Ð¾Ð¹ работы Ñ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ð¸ÐµÐ¹</translation>
+ <translation>КлаÑÑÑ‹ Ð´Ð»Ñ Ð½Ð¸Ð·ÐºÐ¾ÑƒÑ€Ð¾Ð²Ð½ÐµÐ²Ð¾Ð¹ работы Ñ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ð¸Ð°-Ñодержимым</translation>
</message>
<message>
<location line="+3"/>
@@ -13332,21 +13314,13 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>Classes for Inter-Process Communication using the D-Bus</source>
- <translation>КлаÑÑÑ‹ Ð´Ð»Ñ Ð¼ÐµÐ¶Ð¿Ñ€Ð¾Ñ†ÐµÑÑорного взаимодейÑÑ‚Ð²Ð¸Ñ Ñ Ð¸Ñпользованием D-Bus</translation>
- </message>
-</context>
-<context>
- <name>QtScriptEditor::Internal::QtScriptEditorActionHandler</name>
- <message>
- <location filename="../../../src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp" line="+96"/>
- <source>Qt Script Error</source>
- <translation>Ошибка Ñкрипта Qt</translation>
+ <translation>КлаÑÑÑ‹ Ð´Ð»Ñ Ð¼ÐµÐ¶Ð¿Ñ€Ð¾Ñ†ÐµÑÑного взаимодейÑÑ‚Ð²Ð¸Ñ Ñ Ð¸Ñпользованием D-Bus</translation>
</message>
</context>
<context>
<name>QtScriptEditor::Internal::QtScriptEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/qtscripteditor/qtscripteditorplugin.cpp" line="+97"/>
+ <location filename="../../../src/plugins/qtscripteditor/qtscripteditorplugin.cpp" line="+102"/>
<source>Creates a Qt Script file.</source>
<translation>Создание файла ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ Qt.</translation>
</message>
@@ -13360,21 +13334,11 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Qt</source>
<translation>Qt</translation>
</message>
- <message>
- <location line="+56"/>
- <source>Run</source>
- <translation>Выполнить</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Ctrl+R</source>
- <translation>Ctrl+R</translation>
- </message>
</context>
<context>
<name>QtScriptEditor::Internal::ScriptEditor</name>
<message>
- <location filename="../../../src/plugins/qtscripteditor/qtscripteditor.cpp" line="+228"/>
+ <location filename="../../../src/plugins/qtscripteditor/qtscripteditor.cpp" line="+229"/>
<source><Select Symbol></source>
<translation><Выберите Ñимвол></translation>
</message>
@@ -13689,7 +13653,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location line="+4"/>
<source>Match:</source>
- <translation type="unfinished">СоответÑтвие:</translation>
+ <translation>СоответÑтвие:</translation>
</message>
<message>
<location line="+13"/>
@@ -13806,7 +13770,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location line="+156"/>
<source>Invalid file</source>
- <translation>Ðеверный файл</translation>
+ <translation>Ðекорректный файл</translation>
</message>
<message>
<location line="+2"/>
@@ -13826,7 +13790,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<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>
+ <translation>Файл %1 не найден в подкаталоге реÑурÑного файла. ЕÑли продолжить, будет Ñоздан некорректный файл реÑурÑов.</translation>
</message>
<message>
<location line="+15"/>
@@ -14373,7 +14337,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<name>TextEditor::BaseFileFind</name>
<message>
<location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+119"/>
- <location line="+20"/>
+ <location line="+21"/>
<source>%1 found</source>
<translation>%1 найдено</translation>
</message>
@@ -14404,7 +14368,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>TextEditor::BaseTextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+252"/>
+ <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+254"/>
<source>Print Document</source>
<translation>Печать документа</translation>
</message>
@@ -14422,7 +14386,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+4275"/>
+ <location line="+4324"/>
<source>Line: %1, Col: %2</source>
<translation>Строка: %1, Столбец: %2</translation>
</message>
@@ -15282,12 +15246,7 @@ The following encodings are likely to fit:</source>
<translation>Intel C++ Compiler (Linux)</translation>
</message>
<message>
- <location line="+2"/>
- <source>MinGW</source>
- <translation>MinGW</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Microsoft Visual C++</source>
<translation>Microsoft Visual C++</translation>
</message>
@@ -15324,7 +15283,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source><Invalid></source>
- <translation><Ðеверный></translation>
+ <translation><Ðекорректный></translation>
</message>
<message>
<location line="+6"/>
@@ -15446,7 +15405,7 @@ The following encodings are likely to fit:</source>
<translation>Извлечение запущено...</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Failed.</source>
<translation>Сбой.</translation>
</message>
@@ -15487,7 +15446,12 @@ The following encodings are likely to fit:</source>
<context>
<name>VCSBase::ProcessCheckoutJob</name>
<message>
- <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+109"/>
+ <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+101"/>
+ <source>Unable to start %1: %2</source>
+ <translation>Ðе удалоÑÑŒ запуÑтить %1: %2</translation>
+ </message>
+ <message>
+ <location line="+15"/>
<source>The process terminated with exit code %1.</source>
<translation>ПроцеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ возврата %1.</translation>
</message>
@@ -15754,12 +15718,12 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+1"/>
<source>Qt Centre</source>
- <translation>Центр Qt</translation>
+ <translation>Qt Centre</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Apps</source>
- <translation>ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt</translation>
+ <translation>Qt Apps</translation>
</message>
<message>
<location line="+1"/>
@@ -15799,7 +15763,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Help us make Qt Creator even better</source>
- <translation>Помогите нам Ñделать Qt Creator еще лучше</translation>
+ <translation>Помогите нам Ñделать Qt Creator лучше</translation>
</message>
<message>
<location/>
@@ -15885,7 +15849,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Debugger::Internal::TermGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+142"/>
+ <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+176"/>
<source>Debugger Error</source>
<translation>Ошибка отладчика</translation>
</message>
@@ -15986,7 +15950,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+87"/>
<source>Illegal syntax for exponential number</source>
- <translation>Ðеверный формат Ñкпоненциального чиÑла</translation>
+ <translation>ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð° Ñкпоненциального чиÑла</translation>
</message>
<message>
<location line="+26"/>
@@ -16001,15 +15965,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+24"/>
<source>Invalid regular expression flag '%0'</source>
- <translation>Ðеверный флаг регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ '%0'</translation>
- </message>
- <message>
- <source>Unexpected token `%1'</source>
- <translation type="obsolete">ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ Ð»ÐµÐºÑема '%1'</translation>
- </message>
- <message>
- <source>Expected token `%1'</source>
- <translation type="obsolete">ÐžÐ¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ð»ÐµÐºÑема '%1'</translation>
+ <translation>Ðекорректный флаг регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ '%0'</translation>
</message>
<message>
<location filename="../../../src/plugins/qmleditor/parser/qmljsparser.cpp" line="+1752"/>
@@ -16035,14 +15991,6 @@ p, li { white-space: pre-wrap; }
<source>Connection on %1 canceled.</source>
<translation type="unfinished">Подключение на %1 отменено.</translation>
</message>
- <message>
- <source>Waiting for TRK</source>
- <translation type="obsolete">Ожидание TRK</translation>
- </message>
- <message>
- <source>Waiting for TRK to start on %1...</source>
- <translation type="obsolete">Ожидание TRK Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка на %1...</translation>
- </message>
<message>
<location line="+16"/>
<source>Waiting for App TRK</source>
@@ -16086,4 +16034,46 @@ p, li { white-space: pre-wrap; }
<translation>%1: Попытка подключитьÑÑ %2 не удалаÑÑŒ: %3 (повтор)...</translation>
</message>
</context>
+<context>
+ <name>trk::Session</name>
+ <message>
+ <location filename="../../../src/shared/trk/trkutils.cpp" line="+79"/>
+ <source>CPU: v%1.%2%3%4</source>
+ <extracomment>CPU description of an S60 device %1 major verison, %2 minor version %3 real name of major verison, %4 real name of minor version</extracomment>
+ <translation>ПроцеÑÑор: v%1.%2%3%4</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>App TRK: v%1.%2 TRK protocol: v%3.%4</source>
+ <translation>App TRK: v%1.%2 протокол TRK: v%3.%4</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>%1, %2%3%4, %5</source>
+ <extracomment>s60description description of an S60 device %1 CPU description, %2 endianness %3 default type size (if any), %4 float size (if any) %5 TRK version</extracomment>
+ <translation>%1, %2%3%4, %5</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>big endian</source>
+ <translation>big endian</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>little endian</source>
+ <translation>little endian</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>, type size: %1</source>
+ <extracomment>will be inserted into s60description</extracomment>
+ <translation type="unfinished">, размер целого: %1</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>, float size: %1</source>
+ <extracomment>will be inserted into s60description</extracomment>
+ <translation type="unfinished">, размер float: %1</translation>
+ </message>
+</context>
</TS>
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index b0edd855459329dff239e5680bcb6e0f5392b3e6..1e499f9a3923d4d04719ce9397148197fcdbf262 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -280,7 +280,7 @@ void BreakWindow::deleteBreakpoints(QList<int> list)
const int firstRow = list.front();
qSort(list.begin(), list.end());
for (int i = list.size(); --i >= 0; )
- emit breakpointDeleted(i);
+ emit breakpointDeleted(list.at(i));
const int row = qMax(firstRow, model()->rowCount() - list.size() - 1);
if (row >= 0)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 1665061aad78efe156123905768862ab887e0b1b..9365e54ee4a1606f5f021a1d9448b03c81376ec8 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1161,6 +1161,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
}
setState(InferiorStopped);
+#if 0 // See http://vladimir_prus.blogspot.com/2007/12/debugger-stories-pending-breakpoints.html
// Due to LD_PRELOADing the dumpers, these events can occur even before
// reaching the entry point. So handle it before the entry point hacks below.
if (reason.isEmpty() && m_gdbVersion < 70000 && !m_isMacGdb) {
@@ -1187,6 +1188,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
return;
}
}
+#endif
#ifdef Q_OS_LINUX
if (!m_entryPoint.isEmpty()) {
@@ -1252,7 +1254,9 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
|| m_debuggingHelperState == DebuggingHelperLoadTried;
// Don't load helpers on stops triggered by signals unless it's
// an intentional trap.
- if (initHelpers && reason == "signal-received") {
+ if (initHelpers
+ && m_gdbAdapter->dumperHandling() != AbstractGdbAdapter::DumperLoadedByGdbPreload
+ && reason == "signal-received") {
QByteArray name = data.findChild("signal-name").data();
if (name != STOP_SIGNAL
&& (startParameters().startMode != StartRemote
@@ -1284,6 +1288,12 @@ void GdbEngine::handleStop1(const GdbMi &data)
if (m_sourcesListOutdated)
reloadSourceFilesInternal(); // This needs to be done before fullName() may need it
+ // Older gdb versions do not produce "library loaded" messages
+ // so the breakpoint update is not triggered.
+ if (m_gdbVersion < 70000 && !m_isMacGdb && !m_sourcesListUpdating
+ && manager()->breakHandler()->size() > 0)
+ postCommand(_("-break-list"), CB(handleBreakList));
+
QByteArray reason = data.findChild("reason").data();
if (reason == "breakpoint-hit") {
showStatusMessage(tr("Stopped at breakpoint."));
@@ -2261,8 +2271,10 @@ void GdbEngine::reloadModulesInternal()
{
m_modulesListOutdated = false;
postCommand(_("info shared"), NeedsStop, CB(handleModulesList));
+#if 0
if (m_gdbVersion < 70000 && !m_isMacGdb)
postCommand(_("set stop-on-solib-events 1"));
+#endif
}
void GdbEngine::handleModulesList(const GdbResponse &response)
@@ -2331,8 +2343,10 @@ void GdbEngine::reloadSourceFilesInternal()
m_sourcesListOutdated = false;
postCommand(_("-file-list-exec-source-files"), NeedsStop, CB(handleQuerySources));
postCommand(_("-break-list"), CB(handleBreakList));
+#if 0
if (m_gdbVersion < 70000 && !m_isMacGdb)
postCommand(_("set stop-on-solib-events 1"));
+#endif
}
@@ -3429,7 +3443,11 @@ void GdbEngine::handleChildren(const WatchData &data0, const GdbMi &item,
data1.name = _(name.data());
else
data1.name = QString::number(i);
- data1.iname = data.iname + _c('.') + data1.name;
+ GdbMi iname = child.findChild("iname");
+ if (iname.isValid())
+ data1.iname = _(iname.data());
+ else
+ data1.iname = data.iname + _c('.') + data1.name;
if (!data1.name.isEmpty() && data1.name.at(0).isDigit())
data1.name = _c('[') + data1.name + _c(']');
QByteArray key = child.findChild("key").data();
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index fbcf96c860530d3a2c662e25b8ce144ab0eaeb39..c0e0908666ddaadc52474d09ed667bcc0ecef2ab 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -60,7 +60,8 @@ PlainGdbAdapter::PlainGdbAdapter(GdbEngine *engine, QObject *parent)
AbstractGdbAdapter::DumperHandling PlainGdbAdapter::dumperHandling() const
{
-#ifdef Q_OS_WIN
+ // LD_PRELOAD fails for System-Qt on Mac.
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
return DumperLoadedByGdb;
#else
return DumperLoadedByGdbPreload;
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index 5461d175bf23069f2f3fa1f6ebd6b43803d1635f..613aaa79f30b0a5d6e72ea741e52329acea572cc 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -71,7 +71,8 @@ TermGdbAdapter::~TermGdbAdapter()
AbstractGdbAdapter::DumperHandling TermGdbAdapter::dumperHandling() const
{
-#ifdef Q_OS_WIN
+ // LD_PRELOAD fails for System-Qt on Mac.
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
return DumperLoadedByGdb;
#else
return DumperLoadedByAdapter; // Handles loading itself via LD_PRELOAD
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 87a087caf3fc6325c358018c1f21aba5613e0919..31ecc39d2b35a1db5889948b7e20686db1fdce9f 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -368,13 +368,13 @@ static int findClassEndPosition(const QString &headerContents, int classStartPos
if (contents.mid(idx, 2) == QLatin1String("//")) {
idx = contents.indexOf(QLatin1Char('\n'), idx + 2) + 1; // drop everything up to the end of line
} else if (contents.mid(idx, 2) == QLatin1String("/*")) {
- idx = contents.indexOf(QLatin1String("*/"), idx + 2) + 1; // drop everything up to the nearest */
+ idx = contents.indexOf(QLatin1String("*/"), idx + 2) + 2; // drop everything up to the nearest */
} else if (contents.mid(idx, 4) == QLatin1String("'\\\"'")) {
idx += 4; // drop it
} else if (contents.at(idx) == QLatin1Char('\"')) {
do {
idx = contents.indexOf(QLatin1Char('\"'), idx + 1); // drop everything up to the nearest "
- } while (idx > 0 && !isEndingQuote(contents, idx)); // if the nearest " is preceeded by \ (or by \\\ or by \\\\\, but not by \\ nor \\\\) we find next one
+ } while (idx > 0 && !isEndingQuote(contents, idx)); // if the nearest " is preceded by \ (or by \\\ or by \\\\\, but not by \\ nor \\\\) we find next one
if (idx < 0)
break;
idx++;
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index de4c5abb095ab344049e28219dd58a25db4d69f9..bbb450eabf8f03d8825f4278b9e99d30c664918c 100644
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -115,6 +115,10 @@ QString DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(const QStrin
{
const QString dumperSourcePath = Core::ICore::instance()->resourcePath() + QLatin1String("/gdbmacros/");
QDateTime lastModified = QFileInfo(dumperSourcePath + "gdbmacros.cpp").lastModified();
+ // We pretend that the lastmodified of gdbmacros.cpp is 5 minutes before what the file system says
+ // Because afer a installation from the package the modified dates of gdbmacros.cpp
+ // and the actual library are close to each other, but not deterministic in one direction
+ lastModified = lastModified.addSecs(-300);
QFileInfo fileInfo;
foreach(const QString &directory, debuggingHelperLibraryDirectories(qtInstallData)) {
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index 4c5f6acf25d4c1686fdbc41e76806061c5a68ff8..3cb3d40d8582bddb02522dab2c4356a742938551 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -206,7 +206,7 @@ p, li { white-space: pre-wrap; }
<item row="6" column="0">
<widget class="QLabel" name="gcceLabel">
<property name="text">
- <string>CLS/GCCE Directory:</string>
+ <string>CSL/GCCE Directory:</string>
</property>
</widget>
</item>
diff --git a/src/tools/qpatch/files-to-patch-windows b/src/tools/qpatch/files-to-patch-windows
index a1fd431f9a2bc76147228a1eb4f108e9f4395f22..14be6f4366976cabc1b50fb42e14dc1e54fa2579 100644
--- a/src/tools/qpatch/files-to-patch-windows
+++ b/src/tools/qpatch/files-to-patch-windows
@@ -4,24 +4,43 @@ bin/QtCored4.dll
%%
mkspecs/default/qmake.conf
demos/shared/libdemo_shared.prl
-lib/libQt3Support.prl
-lib/libQtAssistantClient.prl
-lib/libQtCLucene.prl
-lib/libQtCore.prl
-lib/libQtDBus.prl
-lib/libQtDesignerComponents.prl
-lib/libQtDesigner.prl
-lib/libQtGui.prl
-lib/libQtHelp.prl
-lib/libQtMultimedia.prl
-lib/libQtNetwork.prl
-lib/libQtOpenGL.prl
-lib/libQtScript.prl
-lib/libQtScriptTools.prl
-lib/libQtSql.prl
-lib/libQtSvg.prl
-lib/libQtTest.prl
-lib/libQtUiTools.prl
-lib/libQtWebKit.prl
-lib/libQtXmlPatterns.prl
-lib/libQtXml.prl
+lib/Qt3Support.prl
+lib/QtAssistantClient.prl
+lib/QtCLucene.prl
+lib/QtCore.prl
+lib/QtDesignerComponents.prl
+lib/QtDesigner.prl
+lib/QtGui.prl
+lib/QtHelp.prl
+lib/QtMultimedia.prl
+lib/QtNetwork.prl
+lib/QtOpenGL.prl
+lib/QtScript.prl
+lib/QtScriptTools.prl
+lib/QtSql.prl
+lib/QtSvg.prl
+lib/QtTest.prl
+lib/QtUiTools.prl
+lib/QtWebKit.prl
+lib/QtXmlPatterns.prl
+lib/QtXml.prl
+lib/Qt3Supportd.prl
+lib/QtAssistantClientd.prl
+lib/QtCLucened.prl
+lib/QtCored.prl
+lib/QtDesignerComponentsd.prl
+lib/QtDesignerd.prl
+lib/QtGuid.prl
+lib/QtHelpd.prl
+lib/QtMultimediad.prl
+lib/QtNetworkd.prl
+lib/QtOpenGLd.prl
+lib/QtScriptd.prl
+lib/QtScriptToolsd.prl
+lib/QtSqld.prl
+lib/QtSvgd.prl
+lib/QtTestd.prl
+lib/QtUiToolsd.prl
+lib/QtWebKitd.prl
+lib/QtXmlPatternsd.prl
+lib/QtXmld.prl
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 79b66523761ca60cf9e91b2b354bcdce63b832af..a7ad46093ed4b03ae132209847544baefd61a3fa 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -7,6 +7,7 @@ bool checkUninitialized = false;
#include <QtCore/QThread>
#include <QtCore/QMutex>
+#include <QtCore/QSignalMapper>
#include <QtCore/QWaitCondition>
/*
@@ -105,10 +106,20 @@ private:
typedef QList<QByteArray> QByteArrayList;
struct Int3 {
- Int3() { i1 = 42; i2 = 43; i3 = 44; }
+ Int3(int base = 0) { i1 = 42 + base; i2 = 43 + base; i3 = 44 + base; }
int i1, i2, i3;
};
+uint qHash(const Int3 &i)
+{
+ return (i.i1 ^ i.i2) ^ i.i3;
+}
+
+bool operator==(const Int3 &a, const Int3 &b)
+{
+ return a.i1 == b.i1 && a.i2 == b.i2 && a.i3 == b.i3;
+}
+
struct QString3 {
QString3() { s1 = "a"; s2 = "b"; s3 = "c"; }
QString s1, s2, s3;
@@ -170,6 +181,7 @@ private slots:
void initTestCase();
void dump_array();
void dump_misc();
+ void dump_typedef();
void dump_std_list();
void dump_std_vector();
void dump_std_string();
@@ -179,6 +191,7 @@ private slots:
void dump_QChar();
void dump_QHash_int_int();
void dump_QHash_QString_QString();
+ void dump_QLinkedList_int();
void dump_QList_char();
void dump_QList_char_star();
void dump_QList_int();
@@ -186,14 +199,19 @@ private slots:
void dump_QList_QString();
void dump_QList_QString3();
void dump_QList_Int3();
+ void dump_QMap_int_int();
void dump_QMap_QString_QString();
+ void dump_QObject();
void dump_QPoint();
void dump_QRect();
void dump_QSharedPointer();
void dump_QSize();
+ void dump_QSet_int();
+ void dump_QSet_Int3();
void dump_QStack();
void dump_QString();
void dump_QStringList();
+ void dump_QTextCodec();
void dump_QVariant();
void dump_QVector();
void dump_QWeakPointer_11();
@@ -215,18 +233,7 @@ public slots:
void dump_QImageData();
void dump_QLinkedList();
void dump_QLocale();
- void dump_QMap();
- void dump_QMapNode();
- void dump_QObject();
- void dump_QObjectChildList();
- void dump_QObjectMethodList();
- void dump_QObjectPropertyList();
- void dump_QObjectSignal();
- void dump_QObjectSignalList();
- void dump_QObjectSlot();
- void dump_QObjectSlotList();
void dump_QPixmap();
- void dump_QTextCodec();
#endif
private:
@@ -830,6 +837,29 @@ void tst_Gdb::dump_misc()
"name='*s',type='int',value='1',numchild='0'}]}", "local.s", 0);
}
+
+///////////////////////////// typedef ////////////////////////////////////
+
+void dump_typedef()
+{
+ /* A */ typedef QMap<uint, double> T;
+ /* B */ T t;
+ /* C */ t[11] = 13.0;
+ /* D */ (void) 0;
+}
+
+void tst_Gdb::dump_typedef()
+{
+ prepare("dump_typedef");
+ next(2);
+ run("D","{iname='local.t',name='t',type='T',"
+ "basetype='"NS"QMap<unsigned int, double>',"
+ "value='-',numchild='1',"
+ "childtype='"NS"QMapNode<unsigned int, double>',children=["
+ "{type='unsigned int',name='11',type='double',"
+ "value='13',numchild='0',type='double'}]}", "local.t");
+}
+
#if 0
void tst_Gdb::dump_QAbstractItemHelper(QModelIndex &index)
{
@@ -1387,170 +1417,9 @@ void tst_Gdb::dump_QImageData()
img = QImage(100, 0, QImage::Format_Invalid);
dump_QImageDataHelper(img);
}
+#endif // 0
-template <typename T>
-void tst_Gdb::dump_QLinkedListHelper(QLinkedList<T> &l)
-{
- const int size = qMin(l.size(), 1000);
- const QString &sizeStr = N(size);
- const QByteArray elemTypeStr = typeToString<T>();
- QByteArray expected = QByteArray("value='<").append(sizeStr).
- append(" items>',valuedisabled='true',numchild='").append(sizeStr).
- append("',childtype='").append(elemTypeStr).append("',childnumchild='").
- append(typeToNumchild<T>()).append("',children=[");
- typename QLinkedList<T>::const_iterator iter = l.constBegin();
- for (int i = 0; i < size; ++i, ++iter) {
- expected.append("{");
- const T &curElem = *iter;
- if (isPointer<T>()) {
- const QString typeStr = stripPtrType(typeToString<T>());
- const QByteArray addrStr = valToString(curElem);
- if (curElem != 0) {
- expected.append("addr='").append(addrStr).append("',saddr='").
- append(addrStr).append("',type='").append(typeStr).
- append("',value='").
- append(derefValToString(curElem)).append("'");
- } else {
- expected.append("addr='").append(ptrToBa(&curElem)).append("',type='").
- append(typeStr).append("',value='<null>',numchild='0'");
- }
- } else {
- expected.append("addr='").append(ptrToBa(&curElem)).
- append("',value='").append(valToString(curElem)).append("'");
- }
- expected.append("}");
- if (i < size - 1)
- expected.append(",");
- }
- if (size < l.size())
- expected.append(",...");
- expected.append("]");
- testDumper(expected, &l, NS"QLinkedList", true, elemTypeStr);
-}
-
-void tst_Gdb::dump_QLinkedList()
-{
- // Case 1: Simple element type.
- QLinkedList<int> l;
-
- // Case 1.1: Empty list.
- dump_QLinkedListHelper(l);
-
- // Case 1.2: One element.
- l.append(2);
- dump_QLinkedListHelper(l);
-
- // Case 1.3: Two elements
- l.append(3);
- dump_QLinkedListHelper(l);
-
- // Case 2: Composite element type.
- QLinkedList<QString> l2;
-
- // Case 2.1: Empty list.
- dump_QLinkedListHelper(l2);
-
- // Case 2.2: One element.
- l2.append("Teststring 1");
- dump_QLinkedListHelper(l2);
-
- // Case 2.3: Two elements.
- l2.append("Teststring 2");
- dump_QLinkedListHelper(l2);
-
- // Case 2.4: > 1000 elements.
- for (int i = 3; i <= 1002; ++i)
- l2.append("Test " + N(i));
-
- // Case 3: Pointer type.
- QLinkedList<int *> l3;
- l3.append(new int(5));
- l3.append(new int(7));
- l3.append(0);
- dump_QLinkedListHelper(l3);
-}
-
- #if 0
- void tst_Gdb::dump_QLinkedList()
- {
- // Case 1: Simple element type.
- QLinkedList<int> l;
-
- // Case 1.1: Empty list.
- testDumper("value='<0 items>',valuedisabled='true',numchild='0',"
- "childtype='int',childnumchild='0',children=[]",
- &l, NS"QLinkedList", true, "int");
-
- // Case 1.2: One element.
- l.append(2);
- testDumper("value='<1 items>',valuedisabled='true',numchild='1',"
- "childtype='int',childnumchild='0',children=[{addr='%',value='2'}]"
- << ptrToBa(l.constBegin().operator->()),
- &l, NS"QLinkedList", true, "int");
-
- // Case 1.3: Two elements
- l.append(3);
- QByteArray it0 = ptrToBa(l.constBegin().operator->());
- QByteArray it1 = ptrToBa(l.constBegin().operator++().operator->());
- testDumper("value='<2 items>',valuedisabled='true',numchild='2',"
- "childtype='int',childnumchild='0',children=[{addr='%',value='2'},"
- "{addr='%',value='3'}]" << it0 << it1,
- &l, NS"QLinkedList", true, "int");
-
- // Case 2: Composite element type.
- QLinkedList<QString> l2;
- QLinkedList<QString>::const_iterator iter;
-
- // Case 2.1: Empty list.
- testDumper("value='<0 items>',valuedisabled='true',numchild='0',"
- "childtype='"NS"QString',childnumchild='0',children=[]",
- &l2, NS"QLinkedList", true, NS"QString");
-
- // Case 2.2: One element.
- l2.append("Teststring 1");
- iter = l2.constBegin();
- qDebug() << *iter;
- testDumper("value='<1 items>',valuedisabled='true',numchild='1',"
- "childtype='"NS"QString',childnumchild='0',children=[{addr='%',value='%',}]"
- << ptrToBa(iter.operator->()) << utfToBase64(*iter),
- &l2, NS"QLinkedList", true, NS"QString");
-
- // Case 2.3: Two elements.
- QByteArray expected = "value='<2 items>',valuedisabled='true',numchild='2',"
- "childtype='int',childnumchild='0',children=[";
- iter = l2.constBegin();
- expected.append("{addr='%',%},"
- << ptrToBa(iter.operator->()) << utfToBase64(*iter));
- ++iter;
- expected.append("{addr='%',%}]"
- << ptrToBa(iter.operator->()) << utfToBase64(*iter));
- testDumper(expected,
- &l, NS"QLinkedList", true, NS"QString");
-
- // Case 2.4: > 1000 elements.
- for (int i = 3; i <= 1002; ++i)
- l2.append("Test " + N(i));
-
- expected = "value='<1002 items>',valuedisabled='true',"
- "numchild='1002',childtype='"NS"QString',childnumchild='0',children=['";
- iter = l2.constBegin();
- for (int i = 0; i < 1002; ++i, ++iter)
- expected.append("{addr='%',value='%'},"
- << ptrToBa(iter.operator->()) << utfToBase64(*iter));
- expected.append(",...]");
- testDumper(expected, &l, NS"QLinkedList", true, NS"QString");
-
-
- // Case 3: Pointer type.
- QLinkedList<int *> l3;
- l3.append(new int(5));
- l3.append(new int(7));
- l3.append(0);
- //dump_QLinkedListHelper(l3);
- testDumper("", &l, NS"QLinkedList", true, NS"QString");
- }
- #endif
-
+#if 0
void tst_Gdb::dump_QLocaleHelper(QLocale &loc)
{
QByteArray expected = QByteArray("value='%',type='$T',numchild='8',"
@@ -1649,116 +1518,63 @@ template <typename K, typename V>
true, getMapType<K,V>(), "", 0, 0, nodeSize, valOff);
}
-void tst_Gdb::dump_QMap()
-{
- // Case 1: Simple type -> simple type.
- QMap<int, int> map1;
-
- // Case 1.1: Empty map.
- dump_QMapHelper(map1);
-
- // Case 1.2: One element.
- map1[2] = 3;
- dump_QMapHelper(map1);
-
- // Case 1.3: Two elements.
- map1[3] = 5;
- dump_QMapHelper(map1);
-
- // Case 2: Simple type -> composite type.
- QMap<int, QString> map2;
-
- // Case 2.1: Empty Map.
- dump_QMapHelper(map2);
-
- // Case 2.2: One element.
- map2[5] = "String 7";
- dump_QMapHelper(map2);
-
- // Case 2.3: Two elements.
- map2[7] = "String 11";
- dump_QMapHelper(map2);
-
- // Case 3: Composite type -> simple type.
- QMap<QString, int> map3;
-
- // Case 3.1: Empty map.
- dump_QMapHelper(map3);
-
- // Case 3.2: One element.
- map3["String 13"] = 11;
- dump_QMapHelper(map3);
-
- // Case 3.3: Two elements.
- map3["String 17"] = 13;
- dump_QMapHelper(map3);
-
- // Case 4: Composite type -> composite type.
- QMap<QString, QString> map4;
-
- // Case 4.1: Empty map.
- dump_QMapHelper(map4);
-
- // Case 4.2: One element.
- map4["String 19"] = "String 23";
- dump_QMapHelper(map4);
-
- // Case 4.3: Two elements.
- map4["String 29"] = "String 31";
- dump_QMapHelper(map4);
-
- // Case 4.4: Different value, same key (multimap functionality).
- map4["String 29"] = "String 37";
- dump_QMapHelper(map4);
-}
+#endif
-template <typename K, typename V>
- void tst_Gdb::dump_QMapNodeHelper(QMap<K, V> &m)
-{
- typename QMap<K, V>::iterator it = m.begin();
- const K &key = it.key();
- const V &val = it.value();
- //const char * const keyType = typeToString(key);
- QByteArray expected = QByteArray("value='',numchild='2',"
- "children=[{name='key',addr='").append(ptrToBa(&key)).
- append("',type='").append(typeToString<K>()).append("',value='").
- append(valToString(key)).append("'},{name='value',addr='").
- append(ptrToBa(&val)).append("',type='").append(typeToString<V>()).
- append("',value='").append(valToString(val)).
- append("'}]");
- size_t nodeSize;
- size_t valOffset;
- getMapNodeParams<K, V>(nodeSize, valOffset);
- testDumper(expected, *reinterpret_cast<QMapData **>(&it), NS"QMapNode",
- true, getMapType<K,V>(), "", 0, 0, nodeSize, valOffset);
-}
-void tst_Gdb::dump_QMapNode()
+void dump_QObject()
{
- // Case 1: simple type -> simple type.
- QMap<int, int> map;
- map[2] = 3;
- dump_QMapNodeHelper(map);
+ /* B */ QObject ob;
+ /* D */ ob.setObjectName("An Object");
+ /* E */ QObject::connect(&ob, SIGNAL(destroyed()), qApp, SLOT(quit()));
+ /* F */ QObject::disconnect(&ob, SIGNAL(destroyed()), qApp, SLOT(quit()));
+ /* G */ ob.setObjectName("A renamed Object");
+ /* H */ (void) 0; }
- // Case 2: simple type -> composite type.
- QMap<int, QString> map2;
- map2[3] = "String 5";
- dump_QMapNodeHelper(map2);
-
- // Case 3: composite type -> simple type.
- QMap<QString, int> map3;
- map3["String 7"] = 11;
- dump_QMapNodeHelper(map3);
-
- // Case 4: composite type -> composite type.
- QMap<QString, QString> map4;
- map4["String 13"] = "String 17";
- dump_QMapNodeHelper(map4);
+void dump_QObject1()
+{
+ /* A */ QObject parent;
+ /* B */ QObject child(&parent);
+ /* C */ parent.setObjectName("A Parent");
+ /* D */ child.setObjectName("A Child");
+ /* H */ (void) 0;
}
void tst_Gdb::dump_QObject()
{
- QObject parent;
+ prepare("dump_QObject");
+ if (checkUninitialized)
+ run("A","{iname='local.ob',name='ob',"
+ "type='"NS"QObject',value='<not in scope>',"
+ "numchild='0'}");
+ next(3);
+
+ run("F","{iname='local.ob',name='ob',type='"NS"QObject',valueencoded='7',"
+ "value='41006e0020004f0062006a00650063007400',numchild='4',children=["
+ "{name='parent',type='"NS"QObject *',"
+ "value='0x0',numchild='0'},"
+ "{name='children',type='"NS"QObject::QObjectList',"
+ "value='<0 items>',numchild='0',children=[]},"
+ "{name='properties',value='<1 items>',type='',numchild='1',children=["
+ "{name='objectName',type='"NS"QString',valueencoded='7',"
+ "value='41006e0020004f0062006a00650063007400',numchild='0'}]},"
+ "{name='connections',value='<0 items>',type='',numchild='0',"
+ "children=[]},"
+ "{name='signals',value='<2 items>',type='',numchild='2',"
+ "childnumchild='0',children=["
+ "{name='signal 0',type='',value='destroyed(QObject*)'},"
+ "{name='signal 1',type='',value='destroyed()'}]},"
+ "{name='slots',value='<2 items>',type='',numchild='2',"
+ "childnumchild='0',children=["
+ "{name='slot 0',type='',value='deleteLater()'},"
+ "{name='slot 1',type='',value='_q_reregisterTimers(void*)'}]}]}",
+ "local.ob"
+ ",local.ob.children"
+ ",local.ob.properties"
+ ",local.ob.connections"
+ ",local.ob.signals"
+ ",local.ob.slots"
+ );
+#if 0
testDumper("value='',valueencoded='2',type='$T',displayedtype='QObject',"
"numchild='4'",
&parent, NS"QObject", false);
@@ -1813,8 +1629,10 @@ void tst_Gdb::dump_QObject()
testDumper("value='QQAgAHIAZQBuAGEAbQBlAGQAIABDAGgAaQBsAGQA',valueencoded='2',"
"type='$T',displayedtype='QObject',numchild='4'",
&child, NS"QObject", false);
+#endif
}
+#if 0
void tst_Gdb::dump_QObjectChildListHelper(QObject &o)
{
const QObjectList children = o.children();
@@ -2235,159 +2053,6 @@ void tst_Gdb::dump_QPixmap()
#endif // #if 0
-///////////////////////////// std::list<int> //////////////////////////////
-
-void dump_std_list()
-{
- /* A */ std::list<int> list;
- /* B */ list.push_back(45);
- /* C */ list.push_back(46);
- /* D */ list.push_back(47);
- /* E */ (void) 0;
-}
-
-void tst_Gdb::dump_std_list()
-{
- prepare("dump_std_list");
- if (checkUninitialized)
- run("A","{iname='local.list',name='list',"
- "numchild='0'}");
- next();
- run("B", "{iname='local.list',name='list',"
- "type='std::list<int, std::allocator<int> >',"
- "value='<0 items>',numchild='0',children=[]}",
- "local.list");
- next();
- run("C", "{iname='local.list',name='list',"
- "type='std::list<int, std::allocator<int> >',"
- "value='<1 items>',numchild='1',"
- "childtype='int',childnumchild='0',children=[{value='45'}]}",
- "local.list");
- next();
- run("D", "{iname='local.list',name='list',"
- "type='std::list<int, std::allocator<int> >',"
- "value='<2 items>',numchild='2',"
- "childtype='int',childnumchild='0',children=["
- "{value='45'},{value='46'}]}",
- "local.list");
- next();
- run("E", "{iname='local.list',name='list',"
- "type='std::list<int, std::allocator<int> >',"
- "value='<3 items>',numchild='3',"
- "childtype='int',childnumchild='0',children=["
- "{value='45'},{value='46'},{value='47'}]}",
- "local.list");
-}
-
-
-///////////////////////////// std::string //////////////////////////////////
-
-void dump_std_string()
-{
- /* A */ std::string str;
- /* B */ str = "Hallo";
- /* C */ (void) 0;
-}
-
-void tst_Gdb::dump_std_string()
-{
- prepare("dump_std_string");
- if (checkUninitialized)
- run("A","{iname='local.str',name='str',"
- "numchild='0'}");
- next();
- run("B","{iname='local.str',name='str',type='std::string',"
- "valueencoded='6',value='',numchild='0'}");
- next();
- run("C","{iname='local.str',name='str',type='std::string',"
- "valueencoded='6',value='48616c6c6f',numchild='0'}");
-}
-
-
-///////////////////////////// std::wstring //////////////////////////////////
-
-void dump_std_wstring()
-{
- /* A */ std::wstring str;
- /* B */ str = L"Hallo";
- /* C */ (void) 0;
-}
-
-void tst_Gdb::dump_std_wstring()
-{
- prepare("dump_std_wstring");
- if (checkUninitialized)
- run("A","{iname='local.str',name='str',"
- "numchild='0'}");
- next();
- run("B","{iname='local.str',name='str',type='std::string',valueencoded='6',"
- "value='',numchild='0'}");
- next();
- if (sizeof(wchar_t) == 2)
- run("C","{iname='local.str',name='str',type='std::string',valueencoded='6',"
- "value='00480061006c006c006f',numchild='0'}");
- else
- run("C","{iname='local.str',name='str',type='std::string',valueencoded='6',"
- "value='00000048000000610000006c0000006c0000006f',numchild='0'}");
-}
-
-
-///////////////////////////// std::vector<int> //////////////////////////////
-
-void dump_std_vector()
-{
- /* A */ std::vector<std::list<int> *> vector;
- std::list<int> list;
- /* B */ list.push_back(45);
- /* C */ vector.push_back(new std::list<int>(list));
- /* D */ vector.push_back(0);
- /* E */ (void) 0;
-}
-
-void tst_Gdb::dump_std_vector()
-{
- #define LIST "std::list<int, std::allocator<int> >"
- #define VECTOR "std::vector<"LIST"*, std::allocator<"LIST"*> >"
-
- prepare("dump_std_vector");
- if (checkUninitialized)
- run("A","{iname='local.vector',name='vector',"
- "numchild='0'}");
- next(2);
- run("B","{iname='local.vector',name='vector',type='"VECTOR"',"
- "value='<0 items>',numchild='0'},"
- "{iname='local.list',name='list',type='"LIST"',"
- "value='<0 items>',numchild='0'}");
- next(3);
- run("E","{iname='local.vector',name='vector',type='"VECTOR"',"
- "value='<2 items>',numchild='2',childtype='"LIST" *',"
- "childnumchild='1',children=[{type='"LIST"',value='<2 items>',"
- "numchild='2'},{value='<null>',numchild='0'}]},"
- "{iname='local.list',name='list',type='"LIST"',"
- "value='<0 items>',numchild='0'}",
- "local.vector,local.vector.0");
-}
-
-#if 0
-void tst_Gdb::dump_QTextCodecHelper(QTextCodec *codec)
-{
- const QByteArray name = codec->name().toBase64();
- QByteArray expected = QByteArray("value='%',valueencoded='1',type='$T',"
- "numchild='2',children=[{name='name',value='%',type='"NS"QByteArray',"
- "numchild='0',valueencoded='1'},{name='mibEnum',%}]")
- << name << name << generateIntSpec(codec->mibEnum());
- testDumper(expected, codec, NS"QTextCodec", true);
-}
-
-void tst_Gdb::dump_QTextCodec()
-{
- const QList<QByteArray> &codecNames = QTextCodec::availableCodecs();
- foreach (const QByteArray &codecName, codecNames)
- dump_QTextCodecHelper(QTextCodec::codecForName(codecName));
-}
-
-#endif // #if 0
-
///////////////////////////// QHash<int, int> //////////////////////////////
void dump_QHash_int_int()
@@ -2471,6 +2136,31 @@ void tst_Gdb::dump_QHash_QString_QString()
}
+///////////////////////////// QLinkedList<int> ///////////////////////////////////
+
+void dump_QLinkedList_int()
+{
+ /* A */ QLinkedList<int> h;
+ /* B */ h.append(42);
+ /* C */ h.append(44);
+ /* D */ (void) 0;
+}
+
+void tst_Gdb::dump_QLinkedList_int()
+{
+ prepare("dump_QLinkedList_int");
+ if (checkUninitialized)
+ run("A","{iname='local.h',name='h',"
+ "type='"NS"QLinkedList<int>',value='<not in scope>',"
+ "numchild='0'}");
+ next(3);
+ run("D","{iname='local.h',name='h',"
+ "type='"NS"QLinkedList<int>',value='<2 items>',numchild='2',"
+ "childtype='int',childnumchild='0',children=["
+ "{value='42'},{value='44'}]}", "local.h");
+}
+
+
///////////////////////////// QList<int> /////////////////////////////////
void dump_QList_int()
@@ -2702,6 +2392,40 @@ void tst_Gdb::dump_QList_Int3()
}
+///////////////////////////// QMap<int, int> //////////////////////////////
+
+void dump_QMap_int_int()
+{
+ /* A */ QMap<int, int> h;
+ /* B */ h[12] = 34;
+ /* C */ h[14] = 54;
+ /* D */ (void) 0;
+}
+
+void tst_Gdb::dump_QMap_int_int()
+{
+ prepare("dump_QMap_int_int");
+ if (checkUninitialized)
+ run("A","{iname='local.h',name='h',"
+ "type='"NS"QMap<int, int>',value='<not in scope>',"
+ "numchild='0'}");
+ next();
+ run("B","{iname='local.h',name='h',"
+ "type='"NS"QMap<int, int>',value='<0 items>',"
+ "numchild='0'}");
+ next();
+ next();
+ run("D","{iname='local.h',name='h',"
+ "type='"NS"QMap<int, int>',value='<2 items>',"
+ "numchild='2'}");
+ run("D","{iname='local.h',name='h',"
+ "type='"NS"QMap<int, int>',value='<2 items>',"
+ "numchild='2',childtype='int',childnumchild='0',"
+ "children=[{name='12',value='34'},{name='14',value='54'}]}",
+ "local.h,local.h.0,local.h.1");
+}
+
+
///////////////////////////// QMap<QString, QString> //////////////////////////////
void dump_QMap_QString_QString()
@@ -2793,6 +2517,57 @@ void tst_Gdb::dump_QRect()
"local.p,local.f");
}
+
+///////////////////////////// QSet<int> ///////////////////////////////////
+
+void dump_QSet_int()
+{
+ /* A */ QSet<int> h;
+ /* B */ h.insert(42);
+ /* C */ h.insert(44);
+ /* D */ (void) 0;
+}
+
+void tst_Gdb::dump_QSet_int()
+{
+ prepare("dump_QSet_int");
+ if (checkUninitialized)
+ run("A","{iname='local.h',name='h',"
+ "type='"NS"QSet<int>',value='<not in scope>',"
+ "numchild='0'}");
+ next(3);
+ run("D","{iname='local.h',name='h',"
+ "type='"NS"QSet<int>',value='<2 items>',numchild='2',"
+ "childtype='int',childnumchild='0',children=["
+ "{value='42'},{value='44'}]}", "local.h");
+}
+
+
+///////////////////////////// QSet<Int3> ///////////////////////////////////
+
+void dump_QSet_Int3()
+{
+ /* A */ QSet<Int3> h;
+ /* B */ h.insert(Int3(42));
+ /* C */ h.insert(Int3(44));
+ /* D */ (void) 0;
+}
+
+void tst_Gdb::dump_QSet_Int3()
+{
+ prepare("dump_QSet_Int3");
+ if (checkUninitialized)
+ run("A","{iname='local.h',name='h',"
+ "type='"NS"QSet<Int3>',value='<not in scope>',"
+ "numchild='0'}");
+ next(3);
+ run("D","{iname='local.h',name='h',"
+ "type='"NS"QSet<Int3>',value='<2 items>',numchild='2',"
+ "childtype='Int3',children=["
+ "{value='{...}',numchild='3'},{value='{...}',numchild='3'}]}", "local.h");
+}
+
+
///////////////////////////// QSize /////////////////////////////////
#if QT_VERSION >= 0x040500
@@ -3038,6 +2813,26 @@ void tst_Gdb::dump_QStringList()
}
+///////////////////////////// QTextCodec /////////////////////////////////
+
+void dump_QTextCodec()
+{
+ /* A */ QTextCodec *codec = QTextCodec::codecForName("UTF-16");
+ /* D */ (void) codec; }
+
+void tst_Gdb::dump_QTextCodec()
+{
+ // FIXME
+ prepare("dump_QTextCodec");
+ next();
+ run("D","{iname='local.codec',name='codec',type='"NS"QTextCodec *',"
+ "value='-',numchild='1',children=[{iname='local.codec.*',"
+ "name='*codec',type='"NS"QTextCodec',"
+ "value='{...}',numchild='0',children=[]}]}",
+ "local.codec,local.codec.*");
+}
+
+
///////////////////////////// QVector /////////////////////////////////
void dump_QVector()
@@ -3452,6 +3247,140 @@ void tst_Gdb::dump_QWeakPointer_2() {}
#endif
+///////////////////////////// std::list<int> //////////////////////////////
+
+void dump_std_list()
+{
+ /* A */ std::list<int> list;
+ /* B */ list.push_back(45);
+ /* C */ list.push_back(46);
+ /* D */ list.push_back(47);
+ /* E */ (void) 0;
+}
+
+void tst_Gdb::dump_std_list()
+{
+ prepare("dump_std_list");
+ if (checkUninitialized)
+ run("A","{iname='local.list',name='list',"
+ "numchild='0'}");
+ next();
+ run("B", "{iname='local.list',name='list',"
+ "type='std::list<int, std::allocator<int> >',"
+ "value='<0 items>',numchild='0',children=[]}",
+ "local.list");
+ next();
+ run("C", "{iname='local.list',name='list',"
+ "type='std::list<int, std::allocator<int> >',"
+ "value='<1 items>',numchild='1',"
+ "childtype='int',childnumchild='0',children=[{value='45'}]}",
+ "local.list");
+ next();
+ run("D", "{iname='local.list',name='list',"
+ "type='std::list<int, std::allocator<int> >',"
+ "value='<2 items>',numchild='2',"
+ "childtype='int',childnumchild='0',children=["
+ "{value='45'},{value='46'}]}",
+ "local.list");
+ next();
+ run("E", "{iname='local.list',name='list',"
+ "type='std::list<int, std::allocator<int> >',"
+ "value='<3 items>',numchild='3',"
+ "childtype='int',childnumchild='0',children=["
+ "{value='45'},{value='46'},{value='47'}]}",
+ "local.list");
+}
+
+
+///////////////////////////// std::string //////////////////////////////////
+
+void dump_std_string()
+{
+ /* A */ std::string str;
+ /* B */ str = "Hallo";
+ /* C */ (void) 0;
+}
+
+void tst_Gdb::dump_std_string()
+{
+ prepare("dump_std_string");
+ if (checkUninitialized)
+ run("A","{iname='local.str',name='str',"
+ "numchild='0'}");
+ next();
+ run("B","{iname='local.str',name='str',type='std::string',"
+ "valueencoded='6',value='',numchild='0'}");
+ next();
+ run("C","{iname='local.str',name='str',type='std::string',"
+ "valueencoded='6',value='48616c6c6f',numchild='0'}");
+}
+
+
+///////////////////////////// std::wstring //////////////////////////////////
+
+void dump_std_wstring()
+{
+ /* A */ std::wstring str;
+ /* B */ str = L"Hallo";
+ /* C */ (void) 0;
+}
+
+void tst_Gdb::dump_std_wstring()
+{
+ prepare("dump_std_wstring");
+ if (checkUninitialized)
+ run("A","{iname='local.str',name='str',"
+ "numchild='0'}");
+ next();
+ run("B","{iname='local.str',name='str',type='std::string',valueencoded='6',"
+ "value='',numchild='0'}");
+ next();
+ if (sizeof(wchar_t) == 2)
+ run("C","{iname='local.str',name='str',type='std::string',valueencoded='6',"
+ "value='00480061006c006c006f',numchild='0'}");
+ else
+ run("C","{iname='local.str',name='str',type='std::string',valueencoded='6',"
+ "value='00000048000000610000006c0000006c0000006f',numchild='0'}");
+}
+
+
+///////////////////////////// std::vector<int> //////////////////////////////
+
+void dump_std_vector()
+{
+ /* A */ std::vector<std::list<int> *> vector;
+ std::list<int> list;
+ /* B */ list.push_back(45);
+ /* C */ vector.push_back(new std::list<int>(list));
+ /* D */ vector.push_back(0);
+ /* E */ (void) 0;
+}
+
+void tst_Gdb::dump_std_vector()
+{
+ #define LIST "std::list<int, std::allocator<int> >"
+ #define VECTOR "std::vector<"LIST"*, std::allocator<"LIST"*> >"
+
+ prepare("dump_std_vector");
+ if (checkUninitialized)
+ run("A","{iname='local.vector',name='vector',"
+ "numchild='0'}");
+ next(2);
+ run("B","{iname='local.vector',name='vector',type='"VECTOR"',"
+ "value='<0 items>',numchild='0'},"
+ "{iname='local.list',name='list',type='"LIST"',"
+ "value='<0 items>',numchild='0'}");
+ next(3);
+ run("E","{iname='local.vector',name='vector',type='"VECTOR"',"
+ "value='<2 items>',numchild='2',childtype='"LIST" *',"
+ "childnumchild='1',children=[{type='"LIST"',value='<2 items>',"
+ "numchild='2'},{value='<null>',numchild='0'}]},"
+ "{iname='local.list',name='list',type='"LIST"',"
+ "value='<0 items>',numchild='0'}",
+ "local.vector,local.vector.0");
+}
+
+
/////////////////////////////////////////////////////////////////////////
//
// Main
@@ -3475,10 +3404,12 @@ int main(int argc, char *argv[])
dump_std_wstring();
dump_Foo();
dump_misc();
+ dump_typedef();
dump_QByteArray();
dump_QChar();
dump_QHash_int_int();
dump_QHash_QString_QString();
+ dump_QLinkedList_int();
dump_QList_char();
dump_QList_char_star();
dump_QList_int();
@@ -3486,14 +3417,19 @@ int main(int argc, char *argv[])
dump_QList_Int3();
dump_QList_QString();
dump_QList_QString3();
+ dump_QMap_int_int();
dump_QMap_QString_QString();
+ dump_QObject();
dump_QPoint();
dump_QRect();
+ dump_QSet_int();
+ dump_QSet_Int3();
dump_QSharedPointer();
dump_QSize();
dump_QStack();
dump_QString();
dump_QStringList();
+ dump_QTextCodec();
dump_QVariant();
dump_QVector();
dump_QWeakPointer_11();