diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 8574e9637cd1bdbd12be9c8baa1cdee0f791e1fc..2994df2c699328a9cf8bcd5ec8579089979443ee 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -12,7 +12,7 @@
the Linux, Mac OS X and Windows platforms.
\note Please report bugs and suggestions to the
- \l{http://qt.nokia.com/developer/task-tracker}{Qt task tracker}.
+ \l{http://bugreports.qt.nokia.com}{Qt Bug Tracker}.
You can also join the Qt Creator mailing list. To subscribe,
send a message with the word \e subscribe to
\l{mailto:qt-creator-request@trolltech.com}
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 7746670f381edef376d3696c6e5571a7d1c92888..ecaee41ec3ac5bb0d663c64429c16ca2f9058bb7 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -57,12 +57,6 @@
#include <QtCore/QTextStream>
#include <QtCore/QVector>
-#if (QT_POINTER_SIZE==4) // How to printf/scanf a pointer (uintptr_t)
-# define POINTER_PRINTFORMAT "0x%x"
-#else
-# define POINTER_PRINTFORMAT "0x%lx"
-#endif
-
#ifndef QT_BOOTSTRAPPED
#include <QtCore/QModelIndex>
@@ -637,7 +631,9 @@ QDumper &QDumper::put(int i)
QDumper &QDumper::put(const void *p)
{
if (p) {
- pos += sprintf(outBuffer + pos, POINTER_PRINTFORMAT, reinterpret_cast<uintptr_t>(p));
+ // Pointer is 'long long' on WIN_64, only
+ static const char *printFormat = sizeof(quintptr) == sizeof(long) ? "0x%lx" : "0x%llx";
+ pos += sprintf(outBuffer + pos, printFormat, reinterpret_cast<uintptr_t>(p));
} else {
pos += sprintf(outBuffer + pos, "<null>");
}
@@ -1069,8 +1065,10 @@ static void qDumpQAbstractItem(QDumper &d)
{
ModelIndex *mm = reinterpret_cast<ModelIndex *>(&mi);
mm->r = mm->c = 0;
- mm->p = mm->m = 0;
- sscanf(d.templateParameters[0], "%d,%d,"POINTER_PRINTFORMAT","POINTER_PRINTFORMAT, &mm->r, &mm->c,
+ mm->p = mm->m = 0;
+ static const char *printFormat = sizeof(quintptr) == sizeof(long) ?
+ "%d,%d,0x%lx,0x%lx" : "%d,%d,0x%llx,0x%llx";
+ sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c,
reinterpret_cast<uintptr_t*>(&mm->p), reinterpret_cast<uintptr_t*>(&mm->m));
}
const QAbstractItemModel *m = mi.model();
@@ -1638,7 +1636,7 @@ static void qDumpQList(QDumper &d)
if (innerTypeIsPointer)
for (int i = 0; i != n; ++i)
if (const void *p = ldata.d->array + i + pdata->begin)
- qCheckAccess(deref(p));
+ qCheckPointer(deref(p));
}
qCheckAccess(pdata);
@@ -2148,10 +2146,14 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
break;
#endif
default: {
+ static const char *qTypeFormat = sizeof(quintptr) == 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(quintptr) == 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')
- ? "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)"POINTER_PRINTFORMAT")"
- : "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)"POINTER_PRINTFORMAT")";
+ const char *format = (v->typeName()[0] == 'Q') ? qTypeFormat : nonQTypeFormat;
qsnprintf(buf, sizeof(buf) - 1, format, v->typeName(), v->typeName(), v);
*exp = QLatin1String(buf);
*numchild = 1;
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 9b57adaf1f7b493570116cc33fe3ffb9266570e3..3d1fa7c834765218a8979ce30392045a42646115 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -4,7 +4,7 @@
<context>
<name>Application</name>
<message>
- <location filename="../../../src/app/main.cpp" line="+147"/>
+ <location filename="../../../src/app/main.cpp" line="+129"/>
<source>Failed to load core: %1</source>
<translation>Das Core-Plugin konnte nicht geladen werden: %1</translation>
</message>
@@ -350,7 +350,7 @@
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+699"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+702"/>
<source>&Change</source>
<translation>&Ändern</translation>
</message>
@@ -484,13 +484,13 @@
<translation>MinGW-Generator</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+56"/>
<source>No valid cmake executable specified.</source>
<translation>Es wurde keine ausführbare cmake-Datei angegeben.
</translation>
</message>
<message>
- <location line="-95"/>
+ <location line="-96"/>
<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 muss cmake im Build-Verzeichnis aufrufen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich.</translation>
</message>
@@ -498,7 +498,7 @@
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+248"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+246"/>
<location line="+10"/>
<source>CMake</source>
<translation>CMake</translation>
@@ -520,7 +520,7 @@
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+163"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+165"/>
<source>Additional arguments:</source>
<translation>Zusätzliche Argumente:</translation>
</message>
@@ -1011,7 +1011,17 @@
<context>
<name>CodePaster::CodePasterProtocol</name>
<message>
- <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+129"/>
+ <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+70"/>
+ <source>No Server defined in the CodePaster preferences.</source>
+ <translation>Es wurde kein Server in den CodePaster-Einstellungen angegeben.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No Server defined in the CodePaster options.</source>
+ <translation>Es wurde kein Server in den CodePaster-Einstellungen angegeben.</translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>No such paste</source>
<translation>Angeforderter Ausschnitt existiert nicht</translation>
</message>
@@ -1020,22 +1030,35 @@
<name>CodePaster::CodePasterSettingsPage</name>
<message>
<location filename="../../../src/plugins/cpaster/codepastersettings.cpp" line="+59"/>
- <location line="+10"/>
<source>CodePaster</source>
<translation>CodePaster</translation>
</message>
+ <message>
+ <location line="+10"/>
+ <source>Code Pasting</source>
+ <translation>Code Pasting</translation>
+ </message>
<message>
<location line="+6"/>
<source>Server:</source>
<translation>Server:</translation>
</message>
+ <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>Hinweis: Geben Sie den Namen des Servers für den CodePaster-Service ohne Protokollpräfix ein (zum Beispiel codepaster.mycompany.com).</translation>
+ </message>
</context>
<context>
<name>CodePaster::CodepasterPlugin</name>
<message>
- <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
<source>&CodePaster</source>
- <translation>&CodePaster</translation>
+ <translation type="obsolete">&CodePaster</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
+ <source>&Code Pasting</source>
+ <translation>&Code Pasting</translation>
</message>
<message>
<location line="+5"/>
@@ -1100,13 +1123,12 @@
</message>
<message>
<location/>
- <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+62"/>
+ <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+67"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
<location/>
- <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
<source>CodePaster</source>
<translation>CodePaster</translation>
</message>
@@ -1125,6 +1147,11 @@
<source>Pastebin.com</source>
<translation>Pastebin.com</translation>
</message>
+ <message>
+ <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
+ <source>Code Pasting</source>
+ <translation>Code Pasting</translation>
+ </message>
</context>
<context>
<name>CommonOptionsPage</name>
@@ -1308,12 +1335,12 @@ Sollen sie überschrieben werden?</translation>
<name>Core::EditorManager</name>
<message>
<location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+187"/>
- <location line="+1491"/>
+ <location line="+1493"/>
<source>Revert to Saved</source>
<translation>Wiederherstellen</translation>
</message>
<message>
- <location line="-1488"/>
+ <location line="-1490"/>
<location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+531"/>
<source>Close</source>
<translation>Schließen</translation>
@@ -1325,12 +1352,12 @@ Sollen sie überschrieben werden?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1290"/>
+ <location line="+1292"/>
<source>Close Others</source>
<translation>Andere schließen</translation>
</message>
<message>
- <location line="-1285"/>
+ <location line="-1287"/>
<source>Open in External Editor</source>
<translation>Öffne in externem Editor</translation>
</message>
@@ -1476,7 +1503,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Speichern als...</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+8"/>
<source>Failed!</source>
<translation>Fehler</translation>
@@ -1497,13 +1524,13 @@ Sollen sie überschrieben werden?</translation>
<translation><b>Hinweis:</b> Sie sind im Begriff, eine schreibgeschützte Datei zu ändern.</translation>
</message>
<message>
- <location line="-131"/>
- <location line="+132"/>
+ <location line="-133"/>
+ <location line="+134"/>
<source>Make writable</source>
<translation>Schreibbar machen</translation>
</message>
<message>
- <location line="-1266"/>
+ <location line="-1268"/>
<source>Next Open Document in History</source>
<translation>Nächstes geöffnetes Dokument im Verlauf</translation>
</message>
@@ -1548,7 +1575,7 @@ Sollen sie überschrieben werden?</translation>
<translation>%1,o</translation>
</message>
<message>
- <location line="+1113"/>
+ <location line="+1115"/>
<source>Save %1 As...</source>
<translation>Speicher '%1' unter...</translation>
</message>
@@ -1717,6 +1744,11 @@ Sollen sie überschrieben werden?</translation>
<source>Go Back</source>
<translation>Vorheriges</translation>
</message>
+ <message>
+ <location line="+0"/>
+ <source>Go Back</source>
+ <translation>Vorheriges</translation>
+ </message>
<message>
<location line="+2"/>
<source>Go Forward</source>
@@ -2314,12 +2346,12 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::CPPEditor</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+611"/>
+ <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+615"/>
<source>Sort alphabetically</source>
<translation>Alphabetisch sortieren</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+163"/>
<source>This change cannot be undone.</source>
<translation>Diese Änderung kann nicht rückgängig gemacht werden.</translation>
</message>
@@ -2342,7 +2374,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Die Dateinamen werden aus dem Klassennamen generiert</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Configure...</source>
<translation>Einstellungen...</translation>
</message>
@@ -2350,7 +2382,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::CppClassWizard</name>
<message>
- <location line="+116"/>
+ <location line="+117"/>
<source>Error while generating file contents.</source>
<translation>Fehler beim Generieren der Dateien.</translation>
</message>
@@ -2358,7 +2390,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::CppClassWizardDialog</name>
<message>
- <location line="-66"/>
+ <location line="-67"/>
<source>C++ Class Wizard</source>
<translation>Neue C++ Klasse</translation>
</message>
@@ -2374,7 +2406,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::CppPlugin</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+175"/>
+ <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+174"/>
<source>C++</source>
<translation>C++</translation>
</message>
@@ -2465,7 +2497,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppPreprocessor</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+541"/>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+540"/>
<source>%1: No such file or directory</source>
<translation>%1: Es existiert keine Datei oder kein Verzeichnis dieses Namens</translation>
</message>
@@ -2555,7 +2587,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppFindReferences</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+624"/>
+ <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+238"/>
<source>Searching...</source>
<translation>Suche...</translation>
</message>
@@ -2605,7 +2637,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::FunctionArgumentWidget</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+433"/>
+ <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+434"/>
<source>%1 of %2</source>
<translation>%1 von %2</translation>
</message>
@@ -2623,26 +2655,51 @@ Sollen sie überschrieben werden?</translation>
<translation>Debugger</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+432"/>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+654"/>
<source><Encoding error></source>
<translation><Encoding-Fehler></translation>
</message>
</context>
+<context>
+ <name>QtDumperHelper</name>
+ <message>
+ <location line="+103"/>
+ <source>Found an outdated version of the debugging helper library (%1); version %2 is required.</source>
+ <translation>Es wurde eine veraltete Version (%1) der Ausgabe-Hilfsbibliothek gefunden. Version %2 ist erforderlich.</translation>
+ </message>
+ <message>
+ <source>Found a too-old version of the debugging helper library (%1); version %2 is required.</source>
+ <translation type="obsolete">Es wurde eine veraltete Version (%1) der Ausgabe-Hilfsbibliothek gefunden. Version %2 ist erforderlich.</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+37"/>
+ <source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
+ <translation>
+ <numerusform>Ein unterstützter Datentyp, Qt-Version: %1, Namensraum: %2, Version: %3</numerusform>
+ <numerusform>%n unterstützte Datentypen, Qt-Version: %1, Namensraum: %2, Version: %3</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source><none></source>
+ <translation><kein></translation>
+ </message>
+</context>
<context>
<name>Debugger::DebuggerManager</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+462"/>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+451"/>
<source>Continue</source>
<translation>Fortsetzen</translation>
</message>
<message>
<location line="+3"/>
- <location line="+1197"/>
+ <location line="+1207"/>
<source>Interrupt</source>
<translation>Anhalten</translation>
</message>
<message>
- <location line="-1194"/>
+ <location line="-1204"/>
<source>Reset Debugger</source>
<translation>Debugger zurücksetzen</translation>
</message>
@@ -2692,7 +2749,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Umgekehrte Richtung</translation>
</message>
<message>
- <location line="+223"/>
+ <location line="+235"/>
<source>Stopped.</source>
<translation>Angehalten.</translation>
</message>
@@ -2728,17 +2785,32 @@ Sollen sie überschrieben werden?</translation>
<translation>Warnung</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="+488"/>
+ <source>Turn off helper usage</source>
+ <translation>Ausgabe-Hilfsbibliothek deaktivieren</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The debugger could not load the debugging helper library.</source>
+ <translation>Der Debugger konnte die Ausgabe-Hilfsbibliothek nicht finden.</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>Die Ausgabe-Hilfsbibliothek dient zur Ausgabe der Werte einiger Datentypen aus Qt- und den Standardbibliotheken. Sie muss mit jeder benutzten Qt-Version compiliert werden. Das geschieht in der Seite 'Qt-Einstellungen' durch Auswahl der Qt-Installation und Klicken auf 'Erstellen' für die Ausgabe-Hilfsbibliothek.</translation>
+ </message>
+ <message>
+ <location line="-497"/>
<source>Cannot debug '%1' (tool chain: '%2'): %3</source>
<translation>Der Debugger kann nicht mit '%1' (Toolchain '%2') gestartet werden: %3</translation>
</message>
<message>
- <location line="+177"/>
+ <location line="+178"/>
<source>Save Debugger Log</source>
<translation>Debugger Log speichern</translation>
</message>
<message>
- <location line="+297"/>
+ <location line="+301"/>
<source>%1 (explicitly set in the Debugger Options)</source>
<translation>%1 (explizit in den Debugger-Einstellungen gesetzt)</translation>
</message>
@@ -2748,12 +2820,11 @@ Sollen sie überschrieben werden?</translation>
<translation>Qt-Versionseinstellungen öffnen</translation>
</message>
<message>
- <location line="+2"/>
<source>Turn helper usage off</source>
- <translation>Ausgabe-Hilfsbibliothek deaktivieren</translation>
+ <translation type="obsolete">Ausgabe-Hilfsbibliothek deaktivieren</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Continue anyway</source>
<translation>Trotzdem fortsetzen</translation>
</message>
@@ -2763,17 +2834,15 @@ Sollen sie überschrieben werden?</translation>
<translation>Ausgabe-Hilfsbibliothek nicht gefunden</translation>
</message>
<message>
- <location line="+1"/>
<source>The debugger did not find the debugging helper library.</source>
- <translation>Der Debugger konnte die Ausgabe-Hilfsbibliothek nicht finden.</translation>
+ <translation type="obsolete">Der Debugger konnte die Ausgabe-Hilfsbibliothek nicht finden.</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 Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper.</source>
- <translation>Die Ausgabe-Hilfsbibliothek dient zur Ausgabe der Werte einiger Datentypen aus Qt- und den Standardbibliotheken. Sie muss mit jeder benutzten Qt-Version compiliert werden. Das geschieht in der Seite 'Qt-Einstellungen' durch Auswahl der Qt-Installation und Klicken auf 'Erstellen' für die Ausgabe-Hilfsbibliothek.</translation>
+ <translation type="obsolete">Die Ausgabe-Hilfsbibliothek dient zur Ausgabe der Werte einiger Datentypen aus Qt- und den Standardbibliotheken. Sie muss mit jeder benutzten Qt-Version compiliert werden. Das geschieht in der Seite 'Qt-Einstellungen' durch Auswahl der Qt-Installation und Klicken auf 'Erstellen' für die Ausgabe-Hilfsbibliothek.</translation>
</message>
<message>
- <location line="+171"/>
+ <location line="+166"/>
<source>Stop Debugger</source>
<translation>Debugger anhalten</translation>
</message>
@@ -3026,7 +3095,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::CdbDebugEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+132"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+133"/>
<source>Unable to load the debugger engine library '%1': %2</source>
<translation>Die Debugger-Bibliothek konnte '%1' nicht geladen werden: %2</translation>
</message>
@@ -3042,7 +3111,7 @@ Sollen sie überschrieben werden?</translation>
<translation>'%1' konnte in der Debugger-Bibliothek '%2' nicht gefunden werden</translation>
</message>
<message>
- <location line="+346"/>
+ <location line="+349"/>
<source>Version: %1</source>
<translation>Version: %1</translation>
</message>
@@ -3057,12 +3126,12 @@ Sollen sie überschrieben werden?</translation>
<translation>Debugger</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+33"/>
<source>The dumper library was not found at %1.</source>
<translation>Es konnte keine Ausgabe-Hilfsbibliothek unter %1 gefunden werden.</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+33"/>
<source>The console stub process was unable to start '%1'.</source>
<translation>Der Konsolenprozess konnte '%1' nicht ausführen.</translation>
</message>
@@ -3077,7 +3146,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Debugger läuft</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Attaching to a process failed for process id %1: %2</source>
<translation>Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation>
</message>
@@ -3092,7 +3161,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Es konnte kein Prozess mit '%1' gestartet werden: %2</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+43"/>
<source>The process exited with exit code %1.</source>
<translation>Der Prozess wurde beendet, Rückgabewert %1.</translation>
</message>
@@ -3111,13 +3180,18 @@ Sollen sie überschrieben werden?</translation>
<source>Reverse stepping is not implemented.</source>
<translation>Die Funktionalität für 'Einzelschritt rückwärts' ist nicht implementiert.</translation>
</message>
+ <message>
+ <location line="+6"/>
+ <source>Thread %1 cannot be stepped.</source>
+ <translation>Für den Thread %1 ist kein Einzelschritt möglich.</translation>
+ </message>
<message>
<location line="+27"/>
<source>Stepping %1</source>
<translation>Führe Schritt aus (%1)</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+63"/>
<source>Running to 0x%1...</source>
<translation>Ausführung bis zur Adresse 0x%1...</translation>
</message>
@@ -3127,7 +3201,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Fortsetzung angefordert...</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+59"/>
<source>Running up to %1:%2...</source>
<translation>Ausführung bis %1:%2...</translation>
</message>
@@ -3163,17 +3237,27 @@ Sollen sie überschrieben werden?</translation>
<translation>Debugger-Fehler</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+27"/>
+ <source>Ignoring initial breakpoint...</source>
+ <translation>Anfänglicher Haltepunkt wurde übergangen...</translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source>Interrupted in thread %1, current thread: %2</source>
+ <translation>Angehalten im Thread: %1, aktueller Thread: %2</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Stopped, current thread: %1</source>
<translation>Angehalten, Thread: %1</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Changing threads: %1 -> %2</source>
<translation>Wechsel von Thread %1 zu %2</translation>
</message>
<message>
- <location line="+77"/>
+ <location line="+80"/>
<source>Thread %1: Missing debug information for top stack frame (%2).</source>
<translation>Thread %1: Es ist keine Debug-Information für obersten Stack-Rahmen (%2) vorhanden.</translation>
</message>
@@ -3186,7 +3270,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::CdbDumperHelper</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+203"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+209"/>
<source>injection</source>
<translation>Injektion</translation>
</message>
@@ -3211,32 +3295,36 @@ Sollen sie überschrieben werden?</translation>
<translation>Die Ausgabe-Hilfsbibliothek '%1' (%2) wurde geladen.</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+62"/>
+ <source>Stopped / Custom dumper library initialized.</source>
+ <translation>Angehalten / Ausgabe-Hilfsbibliothek initialisiert.</translation>
+ </message>
+ <message>
+ <location line="+77"/>
<source>Disabling dumpers due to debuggee crash...</source>
<translation>Ausgabe-Hilfsbibliothek deaktiviert wegen Absturz der zu debuggenden Anwendung...</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="-43"/>
<source>The debuggee does not appear to be Qt application.</source>
<translation>Die zu debuggende Anwendung scheint nicht Qt zu benutzen.</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+10"/>
<source>Initializing dumpers...</source>
<translation>Ausgabe-Hilfsbibliothek initialisieren...</translation>
</message>
<message>
- <location line="+3"/>
<source>Custom dumper library initialized.</source>
- <translation>Ausgabe-Hilfsbibliothek wurde initialisiert.</translation>
+ <translation type="obsolete">Ausgabe-Hilfsbibliothek wurde initialisiert.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-39"/>
<source>The custom dumper library could not be initialized: %1</source>
<translation>Die Ausgabe-Hilfsbibliothek konnte nicht initialisiert werden: %1</translation>
</message>
<message>
- <location line="+252"/>
+ <location line="+411"/>
<source>Querying dumpers for '%1'/'%2' (%3)</source>
<translation>Abfrage der Ausgabe-Hilfsbibliothek für '%1'/'%2' (%3)</translation>
</message>
@@ -3292,44 +3380,72 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::CoreGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+182"/>
+ <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+158"/>
<source>Attached to core.</source>
<translation>Debugge core-Datei.</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-50"/>
<source>Symbols found.</source>
<translation>Die Symbole wurden gefunden.</translation>
</message>
<message>
- <location line="-44"/>
+ <location line="-23"/>
+ <location line="+27"/>
+ <location line="+42"/>
+ <source>Error Loading Symbols</source>
+ <translation>Fehler beim Laden der Symbole</translation>
+ </message>
+ <message>
+ <location line="-68"/>
+ <source>No executable to load symbols from specified.</source>
+ <translation>Es wurde keine ausführbare Datei zum Laden der Symbole angegeben.</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Loading symbols from "%1" failed:
+</source>
+ <translation>Das Laden der Symbole von "%1" schlug fehl:
+</translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Attached to core temporarily.</source>
<translation>Debugge core-Datei temporär.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
+ <source>Unable to determine executable from core file.</source>
+ <translation>Es konnte keine ausführbare Datei aus der core-Datei bestimmt werden.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Attach to core "%1" failed:
+</source>
+ <translation>Das Debuggen der core-Datei "%1" schlug fehl:
+</translation>
+ </message>
+ <message>
<source>No binary found.</source>
- <translation>Es konnte keine ausführbare Datei gefunden werden.</translation>
+ <translation type="obsolete">Es konnte keine ausführbare Datei gefunden werden.</translation>
</message>
<message>
- <location line="+44"/>
<source>Symbols not found in "%1" failed:
%2</source>
- <translation>In "%1" konnten keine Symbole gefunden werden; Fehler:
+ <translation type="obsolete">In "%1" konnten keine Symbole gefunden werden; Fehler:
%2</translation>
</message>
<message>
- <location line="+17"/>
<source>Attach to core "%1" failed:
%2</source>
- <translation>Das Debuggen der core-Datei "%1" schlug fehl:
+ <translation type="obsolete">Das Debuggen der core-Datei "%1" schlug fehl:
%2</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebugMode</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+195"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+196"/>
<source>Debug</source>
<translation>Debuggen</translation>
</message>
@@ -3342,10 +3458,28 @@ Sollen sie überschrieben werden?</translation>
<translation>Debugger</translation>
</message>
</context>
+<context>
+ <name>Debugger::Internal::DebuggerListener</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+36"/>
+ <source>Close Debugging Session</source>
+ <translation>Debuggen beenden</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>A debugging session is still in progress. Would you like to terminate it?</source>
+ <translation>Der Debugger läuft noch. Möchten Sie ihn beenden?</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>Der Debugger läuft noch. Das Beenden im gegenwärtigen Zustand (%1) könnte zu einem inkonsistenten Zustand des untersuchten Prozesses führen. Möchten Sie ihn trotzdem beenden?</translation>
+ </message>
+</context>
<context>
<name>Debugger::Internal::DebuggerPlugin</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+265"/>
+ <location line="+269"/>
<source>Option '%1' is missing the parameter.</source>
<translation>Das Kommandozeilenargument %1erfordert ein Argument.</translation>
</message>
@@ -3555,6 +3689,11 @@ Sollen sie überschrieben werden?</translation>
</message>
<message>
<location line="+8"/>
+ <source>Use code model</source>
+ <translation>Code-Modell verwenden</translation>
+ </message>
+ <message>
+ <location line="+7"/>
<source>Recheck debugging helper availability</source>
<translation>Verfügbarkeit der Ausgabe-Hilfsbibliothek prüfen</translation>
</message>
@@ -3647,7 +3786,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::DebuggingHelperOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-909"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-912"/>
<source>Debugging Helper</source>
<translation>Ausgabe-Hilfsbibliothek</translation>
</message>
@@ -3657,7 +3796,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Pfad zur Ausgabe-Hilfsbibliothek einstellen</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>Ctrl+Shift+F11</source>
<translation></translation>
</message>
@@ -3665,7 +3804,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::GdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+294"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+293"/>
<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>Der Start des Gdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei '%1' oder die Berechtigungen sind nicht ausreichend.</translation>
</message>
@@ -3690,22 +3829,21 @@ Sollen sie überschrieben werden?</translation>
<translation>Ein Fehler trat beim Versuch des Lesens vom Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht.</translation>
</message>
<message>
- <location line="+1019"/>
<source>Error</source>
- <translation>Fehler</translation>
+ <translation type="obsolete">Fehler</translation>
</message>
<message>
- <location line="-902"/>
+ <location line="+117"/>
<source>Library %1 loaded.</source>
<translation>Bibliothek %1 geladen.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Library %1 unloaded.</source>
<translation>Bibliothek %1 entladen.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Thread group %1 created.</source>
<translation>Thread-Gruppe %1 erzeugt.</translation>
</message>
@@ -3730,17 +3868,17 @@ Sollen sie überschrieben werden?</translation>
<translation>Thread %1 ausgewählt.</translation>
</message>
<message>
- <location line="+263"/>
+ <location line="+269"/>
<source>Stopping temporarily.</source>
<translation>Temporär Anhalten.</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+54"/>
<source>Process failed to start.</source>
<translation>Der Prozess konnte nicht gestartet werden.</translation>
</message>
<message>
- <location line="+412"/>
+ <location line="+387"/>
<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><p>Der Prozess wurde nach Erhalt eines Signals vom Betriebssystem angehalten.<p><table><tr><td>Name des Signals : </td><td>%1</td></tr><tr><td>Bedeutung : </td><td>%2</td></tr></table></translation>
</message>
@@ -3756,42 +3894,40 @@ Sollen sie überschrieben werden?</translation>
<translation>Signal erhalten</translation>
</message>
<message>
- <location line="+2488"/>
<source>The dumper library was not found at %1.</source>
- <translation>Es konnte keine Ausgabe-Hilfsbibliothek unter %1 gefunden werden.</translation>
+ <translation type="obsolete">Es konnte keine Ausgabe-Hilfsbibliothek unter %1 gefunden werden.</translation>
</message>
<message>
- <location line="-3182"/>
+ <location line="-671"/>
<source>Reading %1...</source>
<translation>Lese %1...</translation>
</message>
<message>
- <location line="+416"/>
+ <location line="+415"/>
<source>Jumped. Stopped.</source>
<translation>Sprung ausgeführt/ Angehalten.</translation>
</message>
<message>
- <location line="+218"/>
<source>Run to Function finished. Stopped.</source>
- <translation>Ausgeführung bis zu Funktion beendet. Angehalten.</translation>
+ <translation type="obsolete">Ausgeführung bis zu Funktion beendet. Angehalten.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="+161"/>
<source>Loading %1...</source>
<translation>Lade %1...</translation>
</message>
<message>
- <location line="+101"/>
+ <location line="+79"/>
<source>Stopped at breakpoint.</source>
<translation>An Haltepunkt angehalten.</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+23"/>
<source>Stopped: "%1"</source>
<translation>Angehalten: "%1"</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+52"/>
<source>The debugger you are using identifies itself as:</source>
<translation>Der benutzte Debugger ist:</translation>
</message>
@@ -3805,26 +3941,46 @@ Das Debuggen wird wahrscheinlich nicht richtig funktionieren.
Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
</message>
<message>
- <location line="+52"/>
<source>Starting executable failed:
</source>
- <translation>Das Starten der ausführbaren Datei schlug fehl:
+ <translation type="obsolete">Das Starten der ausführbaren Datei schlug fehl:
</translation>
</message>
<message>
- <location line="-297"/>
+ <location line="-210"/>
<source>Processing queued commands.</source>
<translation>Kommando-Warteschlange wird abgearbeitet.</translation>
</message>
<message>
- <location line="+167"/>
- <location line="+20"/>
- <location line="+104"/>
+ <location line="+154"/>
+ <location line="+101"/>
<source>Stopped.</source>
<translation>Angehalten.</translation>
</message>
<message>
- <location line="+2782"/>
+ <location line="+5"/>
+ <source>Execution Error</source>
+ <translation>Fehler bei der Ausführung</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot continue debugged process:
+</source>
+ <translation>Der zu debuggende Prozess kann nicht fortgesetzt werden:
+</translation>
+ </message>
+ <message>
+ <location line="+2505"/>
+ <source>The debugging helper library was not found at %1.</source>
+ <translation>Die Ausgabe-Hilfsbibliothek konnte nicht unter %1 gefunden werden.</translation>
+ </message>
+ <message>
+ <location line="+335"/>
+ <source>Unable to start gdb '%1': %2</source>
+ <translation>Der gdb-Debugger '%1' kann nicht ausgeführt werden: %2</translation>
+ </message>
+ <message>
+ <location line="+91"/>
<source>Cannot find debugger initialization script</source>
<translation>Das Initalisierungsskript konnte nicht gefunden werden</translation>
</message>
@@ -3834,30 +3990,29 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Auf die in den Debugger-Einstellungen angegebene Skriptdatei '%1' kann nicht zugegriffen werden. Wenn kein Skript benötigt wird, können Sie die Einstellung rücksetzen, um diese Warnung zu umgehen.</translation>
</message>
<message>
- <location line="-2033"/>
+ <location line="-2138"/>
<source>Unable to run '%1': %2</source>
<translation>'%1' kann nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source><unknown></source>
<extracomment>End address of loaded module</extracomment>
<translation><unbekannt></translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+45"/>
<location line="+8"/>
<source>Retrieving data for stack view...</source>
<translation>Daten der Stack-Anzeige werden empfangen...</translation>
</message>
<message>
- <location line="+402"/>
<source><not in scope></source>
<extracomment>Variable</extracomment>
- <translation><nicht im Bereich></translation>
+ <translation type="obsolete"><nicht im Bereich></translation>
</message>
<message numerus="yes">
- <location line="+109"/>
+ <location line="+495"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
<translation>
<numerusform>Daten der für die Anzeige der lokalen Variablen werden empfangen (noch eine austehende Anfrage) ...</numerusform>
@@ -3865,7 +4020,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+620"/>
+ <location line="+633"/>
<source><%n items></source>
<extracomment>In string list</extracomment>
<translation>
@@ -3874,7 +4029,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
</translation>
</message>
<message>
- <location line="-330"/>
+ <location line="-309"/>
<source>Finished retrieving data.</source>
<translation>Alle Daten erhalten.</translation>
</message>
@@ -3892,17 +4047,17 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
</translation>
</message>
<message>
- <location line="-2703"/>
+ <location line="-2752"/>
<source>An unknown error in the Gdb process occurred. </source>
<translation>Im Gdb-Prozess trat ein unbekannter Fehler auf.</translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+236"/>
<source>Running...</source>
<translation>Läuft...</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+91"/>
<source>Stop requested...</source>
<translation>Stop angefordert...</translation>
</message>
@@ -3918,12 +4073,11 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Fehler bei Ausführung: %1</translation>
</message>
<message>
- <location line="+151"/>
<source>Function reached. Stopped.</source>
- <translation>Die Funktion wurde erreicht. Angehalten.</translation>
+ <translation type="obsolete">Die Funktion wurde erreicht. Angehalten.</translation>
</message>
<message>
- <location line="+72"/>
+ <location line="+211"/>
<source>Program exited with exit code %1.</source>
<translation>Das Programm wurde beendet, Rückgabewert %1.</translation>
</message>
@@ -3938,17 +4092,16 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Das Programm wurde normal beendet.</translation>
</message>
<message>
- <location line="+286"/>
<source>Starting executable failed</source>
- <translation>Das Starten der ausführbaren Datei schlug fehl</translation>
+ <translation type="obsolete">Das Starten der ausführbaren Datei schlug fehl</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+482"/>
<source>Continuing after temporary stop...</source>
<translation>Setze nach temporärem Anhalten fort...</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+8"/>
<source>Running requested...</source>
<translation>Fortsetzung angefordert...</translation>
</message>
@@ -3973,7 +4126,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Einzelschritt angefordert...</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+18"/>
<source>Step next instruction requested...</source>
<translation>Einzelschritt über Anweisung angefordert...</translation>
</message>
@@ -3983,34 +4136,37 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Ausführung bis Zeile %1 angefordert...</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+13"/>
<source>Run to function %1 requested...</source>
<translation>Ausführung bis Funktion %1 angefordert...</translation>
</message>
<message>
- <location line="+1582"/>
+ <location line="+706"/>
+ <source>Jumping out of bogus frame...</source>
+ <translation>Verlasse ungültigen Stack-Frame...</translation>
+ </message>
+ <message>
+ <location line="+907"/>
<source>Custom dumper setup: %1</source>
<translation>Ausgabe-Hilfsbibliothek-Initialisierung: %1</translation>
</message>
<message>
- <location line="+149"/>
+ <location line="+128"/>
<source><0 items></source>
<translation><leer></translation>
</message>
<message>
- <location line="+141"/>
<source>%1 <shadowed %2></source>
<extracomment>Variable %1 is the variable name, %2 is a simple count</extracomment>
- <translation>%1 <überlagert %2></translation>
+ <translation type="obsolete">%1 <überlagert %2></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+224"/>
<source><shadowed></source>
- <extracomment>Type of local variable or parameter shadowed by another</extracomment>
<translation><überlagert></translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+133"/>
<source><n/a></source>
<translation><k.a.></translation>
</message>
@@ -4026,76 +4182,94 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation><keine Angabe></translation>
</message>
<message>
- <location line="+16"/>
<source>Unknown error: </source>
- <translation>Unbekannter Fehler: </translation>
+ <translation type="obsolete">Unbekannter Fehler: </translation>
</message>
<message>
- <location line="+63"/>
<source>Dumper injection loading triggered (%1)...</source>
- <translation>Das Laden der Ausgabe-Hilfsbibliothek (%1) per Injektion wurde gestartet...</translation>
+ <translation type="obsolete">Das Laden der Ausgabe-Hilfsbibliothek (%1) per Injektion wurde gestartet...</translation>
</message>
<message>
- <location line="+2"/>
<source>Dumper loading (%1) failed: %2</source>
- <translation>Das Laden der Ausgabe-Hilfsbibliothek (%1) schlug fehl: %2</translation>
+ <translation type="obsolete">Das Laden der Ausgabe-Hilfsbibliothek (%1) schlug fehl: %2</translation>
</message>
<message>
- <location line="+7"/>
<source>Loading dumpers via debugger call (%1)...</source>
- <translation>Lade die Ausgabe-Hilfsbibliothek (%1) per Debugger-Aufruf...</translation>
+ <translation type="obsolete">Lade die Ausgabe-Hilfsbibliothek (%1) per Debugger-Aufruf...</translation>
</message>
<message>
- <location line="+243"/>
+ <location line="+333"/>
<location line="+25"/>
<location line="+14"/>
<source>Disassembler failed: %1</source>
<translation>Fehler beim Disassemblieren: %1</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+145"/>
+ <source>Gdb I/O Error</source>
+ <translation>Gdb Ein/Ausgabefehler</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Unexpected Gdb Exit</source>
+ <translation>Gdb unerwartet beendet</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The gdb process exited unexpectedly (%1).</source>
+ <translation>Der Gdb-Prozess wurde plötzlich beendet (%1).</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>crashed</source>
+ <translation>abgestürzt</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>code %1</source>
+ <translation>Rückgabewert %1</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Adapter start failed</source>
<translation>Der Start des Adapters schlug fehl</translation>
</message>
<message>
- <location line="+15"/>
<source>Inferior start preparation failed</source>
- <translation>Die Vorbereitung des zu debuggenden Prozesses schlug fehl</translation>
+ <translation type="obsolete">Die Vorbereitung des zu debuggenden Prozesses schlug fehl</translation>
</message>
<message>
- <location line="+9"/>
<source>Inferior prepared for startup.</source>
- <translation>Zu debuggender Prozess vorbereitet.</translation>
+ <translation type="obsolete">Zu debuggender Prozess vorbereitet.</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+24"/>
<source>Setting breakpoints...</source>
<translation>Setze Haltepunkte...</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-8"/>
<source>Starting inferior...</source>
<translation>Starte zu debuggenden Prozess...</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+30"/>
<source>Inferior start failed</source>
<translation>Der Start des zu debuggenden Prozesses schlug fehl</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="-2938"/>
<source>Inferior shutdown failed</source>
<translation>Das Beenden des zu debuggenden Prozesses schlug fehl</translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+2958"/>
<source>Adapter crashed</source>
<translation>Der Adapter ist abgestürzt</translation>
</message>
<message>
- <location line="+12"/>
<source>Adapter shutdown failed</source>
- <translation>Das Beenden des Adapter schlug fehl</translation>
+ <translation type="obsolete">Das Beenden des Adapter schlug fehl</translation>
</message>
</context>
<context>
@@ -4251,12 +4425,12 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<context>
<name>Debugger::Internal::PlainGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+79"/>
+ <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+70"/>
<source>Cannot set up communication with child process: %1</source>
<translation>Die Kommunikation mit dem untergeordneten Prozesss konnte nicht hergestellt werden: %1</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+36"/>
<source>Starting executable failed:
</source>
<translation>Das Starten der ausführbaren Datei schlug fehl:
@@ -4332,12 +4506,16 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<context>
<name>Debugger::Internal::RemoteGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+112"/>
<source>The upload process failed to start. Either the invoked script '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
- <translation>Das Hochladen konnte nicht gestartet weden. Entweder fehlt das Skript '%1', oder die Berechtigungen sind nicht ausreichend.</translation>
+ <translation type="obsolete">Das Hochladen konnte nicht gestartet weden. Entweder fehlt das Skript '%1', oder die Berechtigungen sind nicht ausreichend.</translation>
</message>
<message>
- <location line="+6"/>
+ <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+93"/>
+ <source>The upload process failed to start. Shell missing?</source>
+ <translation>Das Hochladen schlug fehl. Eine mögliche Ursache könnte ein fehlendes Shell-Programm sein.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>The upload process crashed some time after starting successfully.</source>
<translation>Das Hochladen ist nach dem Starten abgestürzt.</translation>
</message>
@@ -4372,7 +4550,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Der Adapter ist veraltet; er unterstützt den asynchronen Modus nicht.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+20"/>
<source>Starting remote executable failed:
</source>
<translation>Das Starten der ausführbaren Datei auf dem entfernten Rechner schlug fehl:
@@ -4434,7 +4612,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<context>
<name>Debugger::Internal::StackHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+114"/>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+142"/>
<source>...</source>
<translation></translation>
</message>
@@ -4444,7 +4622,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation><Mehr></translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-78"/>
<location line="+14"/>
<source>Address:</source>
<translation>Adresse:</translation>
@@ -4480,7 +4658,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Bis:</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+103"/>
<source>Level</source>
<translation>Tiefe</translation>
</message>
@@ -4620,12 +4798,12 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<context>
<name>Debugger::Internal::ThreadsWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+53"/>
+ <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+46"/>
<source>Thread</source>
<translation>Thread</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+21"/>
<source>Adjust column widths to contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
@@ -4638,10 +4816,21 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<context>
<name>Debugger::Internal::TrkGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1687"/>
+ <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1597"/>
+ <source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
+ <translation>Der Prozess wurde gestartet, PID: 0x%1, Thread-Id: 0x%2, Code-Segment: 0x%3, Datensegment: 0x%4.</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Connecting to TRK server adapter failed:
+</source>
+ <translation>Die Verbindung zum TRK-Server-Adapter schlug fehl:
+</translation>
+ </message>
+ <message>
<source>Connecting to trk server adapter failed:
</source>
- <translation>Die Verbindung zum Trk-Server-Adapter schlug fehl:
+ <translation type="obsolete">Die Verbindung zum Trk-Server-Adapter schlug fehl:
</translation>
</message>
</context>
@@ -4691,15 +4880,21 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<context>
<name>Debugger::Internal::WatchData</name>
<message>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+70"/>
+ <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+71"/>
+ <location line="+250"/>
<source><not in scope></source>
<translation><nicht im Bereich></translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>%1 <shadowed %2></source>
+ <translation>%1 <überlagert %2></translation>
+ </message>
</context>
<context>
<name>Debugger::Internal::WatchHandler</name>
<message>
- <location line="+224"/>
+ <location line="-27"/>
<source>Expression</source>
<translation>Ausdruck</translation>
</message>
@@ -4724,12 +4919,12 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Interner Name</translation>
</message>
<message>
- <location line="+1075"/>
+ <location line="+1116"/>
<source><Edit></source>
<translation><Editieren></translation>
</message>
<message>
- <location line="-1056"/>
+ <location line="-1084"/>
<source>Root</source>
<translation>Wurzelelement</translation>
</message>
@@ -4749,7 +4944,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Überwachte Ausdrücke</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-46"/>
<source>Value</source>
<translation>Wert</translation>
</message>
@@ -4767,7 +4962,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<context>
<name>Debugger::Internal::WatchModel</name>
<message>
- <location line="+433"/>
+ <location line="+447"/>
<source>decimal</source>
<translation>dezimal</translation>
</message>
@@ -4787,7 +4982,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>oktal</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+86"/>
<source>Name</source>
<translation>Name</translation>
</message>
@@ -4830,12 +5025,17 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Format für den Ausdruck ändern</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+12"/>
<source>Open memory editor...</source>
<translation>Speicher-Editor öffnen...</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+21"/>
+ <source>Refresh code model snapshot</source>
+ <translation>Code-Modell Stand auf aktuellen Stand bringen.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>Adjust column widths to contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
@@ -4845,7 +5045,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-38"/>
<source>Insert new watch item</source>
<translation>Neuen Überwachten Ausdruck einfügen</translation>
</message>
@@ -4855,7 +5055,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Widget zwecks Überwachung ausgewählen</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Open memory editor at %1</source>
<translation>Speicher-Editor bei %1 öffnen</translation>
</message>
@@ -4910,6 +5110,16 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<source>Debugging helper</source>
<translation>Ausgabe-Hilfsbibliothek</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>Benutzt das Code-Modell von Qt Creator um herauszufinden, ob eine Variable an der Stelle der Unterbrechung durch den Debugger bereits einen Wert hat.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use code model</source>
+ <translation>Code-Modell verwenden</translation>
+ </message>
</context>
<context>
<name>DependenciesModel</name>
@@ -5557,7 +5767,7 @@ Grund: %3</translation>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+940"/>
+ <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+944"/>
<source>Not implemented in FakeVim</source>
<translation>In FakeVim nicht implementiert</translation>
</message>
@@ -5577,7 +5787,7 @@ Grund: %3</translation>
<translation>%1Alle</translation>
</message>
<message>
- <location line="+1023"/>
+ <location line="+1025"/>
<source>File '%1' exists (add ! to override)</source>
<translation>Die '%1' existiert bereits (Fügen Sie ! an, um sie zu überschreiben)</translation>
</message>
@@ -5645,7 +5855,7 @@ Grund: %3</translation>
<translation>Älteste Änderung erreicht</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>Already at newest change</source>
<translation>Letzte Änderung erreicht</translation>
</message>
@@ -6240,7 +6450,7 @@ Grund: %3</translation>
<context>
<name>GenericProjectManager::Internal::GenericMakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+189"/>
+ <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+190"/>
<source>Override %1:</source>
<translation>Ãœberschreibe %1:</translation>
</message>
@@ -7427,7 +7637,12 @@ Grund: %3</translation>
<translation>Ctrl+0</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
+ <source>Go to Help Mode</source>
+ <translation>Schalte in Hilfsmodus</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Previous</source>
<translation>Vorige</translation>
</message>
@@ -7892,7 +8107,7 @@ in your .pro file.</source>
<context>
<name>NameDemanglerPrivate</name>
<message>
- <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+310"/>
+ <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+331"/>
<source>Premature end of input</source>
<translation type="unfinished"></translation>
</message>
@@ -7902,7 +8117,7 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Invalid name</source>
<translation type="unfinished"></translation>
</message>
@@ -7968,7 +8183,7 @@ in your .pro file.</source>
<message>
<location line="+135"/>
<location line="+5"/>
- <location line="+67"/>
+ <location line="+68"/>
<source>Invalid type</source>
<translation type="unfinished"></translation>
</message>
@@ -7989,13 +8204,13 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+79"/>
- <location line="+320"/>
+ <location line="+80"/>
+ <location line="+328"/>
<source>Invalid unqualified-name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-232"/>
+ <location line="-237"/>
<source>Invalid operator-name '%s'</source>
<translation type="unfinished"></translation>
</message>
@@ -8006,19 +8221,19 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>Invalid pointer-to-member-type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+45"/>
+ <location line="+47"/>
<location line="+10"/>
- <location line="+35"/>
+ <location line="+36"/>
<source>Invalid substitution</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-41"/>
+ <location line="-42"/>
<source>Invalid substitution: element %1 was requested, but there are only %2</source>
<translation type="unfinished"></translation>
</message>
@@ -8028,14 +8243,14 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+101"/>
+ <location line="+103"/>
<source>Invalid special-name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+43"/>
<location line="+4"/>
- <location line="+11"/>
+ <location line="+13"/>
<source>Invalid local-name</source>
<translation type="unfinished"></translation>
</message>
@@ -8172,8 +8387,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+10"/>
+ <source>Code Pasting</source>
+ <translation>Code Pasting</translation>
+ </message>
+ <message>
<source>CodePaster</source>
- <translation>CodePaster</translation>
+ <translation type="obsolete">CodePaster</translation>
</message>
</context>
<context>
@@ -8890,7 +9109,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>ProjectExplorer::ApplicationLauncher</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+123"/>
+ <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+126"/>
<source>Failed to start program. Path or permissions wrong?</source>
<translation>Das Programm konnte nicht gestartet werden. Möglicherweise stimmt der Pfad nicht oder die Berechtigungen sind sind ausreichend?</translation>
</message>
@@ -9703,12 +9922,17 @@ Fehler: %2</translation>
<translation>Sitzung fortführen</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>%1 (last session)</source>
<translation>%1 (zuletzt benutzt)</translation>
</message>
<message>
- <location line="+45"/>
+ <location line="+3"/>
+ <source>%1 (current session)</source>
+ <translation>%1 (aktuelle Sitzung)</translation>
+ </message>
+ <message>
+ <location line="+46"/>
<source>New Project...</source>
<translation>Neues Projekt...</translation>
</message>
@@ -10350,7 +10574,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+9"/>
<source>Warning</source>
- <translation>Warnung</translation>
+ <translation type="unfinished">Warnung</translation>
</message>
<message>
<location line="+1"/>
@@ -10417,7 +10641,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QmlEditor::Internal::QmlEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+103"/>
+ <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+106"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
@@ -10489,7 +10713,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Projekte</translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+69"/>
<source>The project %1 could not be opened.</source>
<translation>Das Projekt %1 konnte nicht geöffnet werden.</translation>
</message>
@@ -10497,7 +10721,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QmlProjectManager::Internal::QmlNewProjectWizardDialog</name>
<message>
- <location line="-136"/>
+ <location line="-135"/>
<source>New QML Project</source>
<translation>Neues QML-Projekt</translation>
</message>
@@ -10557,7 +10781,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<name>QmlProjectManager::Internal::QmlRunConfiguration</name>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+339"/>
- <location line="+101"/>
+ <location line="+106"/>
<source>QML Viewer</source>
<translation>QML-Betrachter</translation>
</message>
@@ -10971,7 +11195,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Öffnen</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+56"/>
+ <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+62"/>
<source>Tutorials</source>
<translation>Anleitungen</translation>
</message>
@@ -11016,7 +11240,42 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Beispiel wählen...</translation>
</message>
<message>
- <location line="+103"/>
+ <location line="+81"/>
+ <source>Copy Project to writable Location?</source>
+ <translation>Soll das Projekt in ein schreibbares Verzeichnis kopiert werden?</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><p>Das zu öffnende Projekt befindet sich in einem schreibgeschützten Verzeichnis:</p><blockquote>%1</blockquote><p>Bitte geben Sie ein schreibbares Verzeichnis an und wählen dann "Projekt kopieren und öffnen", um eine modifizierbare Kopie des Projektes erhalten, oder "Projekt beibehalten und öffnen", um das Projekt im gegenwärtigen Verzeichnis zu öffnen</p><p><b>Hinweis:</b> Im gegenwärtigen.Verzeichnis kann das Projekt weder compiliert noch modifiziert werden.</p></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&Location:</source>
+ <translation>&Verzeichnis:</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&Copy Project and Open</source>
+ <translation>Projekt &kopieren und öffnen</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&Keep Project and Open</source>
+ <translation>Projekt &beibehalten und öffnen</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Warning</source>
+ <translation>Warnung</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The specified location already exists. Please specify a valid location.</source>
+ <translation>Das angegebene Verzeichnis existiert bereits. Bitte geben Sie ein gültiges Verzeichnis an.</translation>
+ </message>
+ <message>
+ <location line="+61"/>
<location line="+7"/>
<source>Cmd</source>
<comment>Shortcut key</comment>
@@ -11042,7 +11301,6 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<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>Sie können die Seitenleiste mit <tt>%1+0<tt> anzeigen oder zuklappen.</translation>
</message>
<message>
@@ -11078,7 +11336,6 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<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>Sie können ywischen den Ausgabepanelen umschalten, in dem Sie <tt>%1+n</tt> drücken, wobei n die Zahl ist, die auf den Schaltflächen am unteren Fensterrand befindet: <ul><li>1 - Build-Probleme</li><li>2 - Suchergebnisse</li><li>3 - Ausgabe der Anwendung</li><li>4 - Kompilierung</li></ul></translation>
</message>
<message>
@@ -11187,7 +11444,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::Internal::MakeStepFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+327"/>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+320"/>
<source>Make</source>
<translation>Make</translation>
</message>
@@ -11342,9 +11599,14 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+175"/>
<source>Import existing settings</source>
- <translation>Existierende Einstellungen importieren</translation>
+ <translation type="obsolete">Existierende Einstellungen importieren</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+51"/>
+ <location line="+125"/>
+ <source>Import existing build settings</source>
+ <translation>Existierende Build-Einstellungen importieren.</translation>
</message>
<message>
<location line="+8"/>
@@ -11493,13 +11755,13 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Shadow-Build-Verzeichnis</translation>
</message>
<message>
- <location line="+47"/>
- <location line="+65"/>
+ <location line="+23"/>
+ <location line="+115"/>
<source>Default Qt Version (%1)</source>
<translation>Vorgabe-Qt-Version (%1)</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-111"/>
<source>No Qt Version set</source>
<translation>Es ist keine Qt-Version gesetzt</translation>
</message>
@@ -11628,7 +11890,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::Internal::QtOptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+109"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+111"/>
<source><specify a name></source>
<translation><Geben Sie einen Namen an></translation>
</message>
@@ -11648,12 +11910,21 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Wählen Sie das MinGW-Verzeichnis aus</translation>
</message>
<message>
- <location line="+2"/>
<source>Select "x86build" Directory from Carbide Install</source>
- <translation>Geben Sie das "x86build"-Verzeichnis aus der Carbide-Installation an</translation>
+ <translation type="obsolete">Geben Sie das "x86build"-Verzeichnis aus der Carbide-Installation an</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
+ <source>Select Carbide Install Directory</source>
+ <translation>Carbide-Installationsordner auswählen</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Select S60 SDK Root</source>
+ <translation>Hauptordner des S60 SDK auswählen</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Auto-detected</source>
<translation>Automatisch bestimmt</translation>
</message>
@@ -11663,7 +11934,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Benutzerdefiniert</translation>
</message>
<message>
- <location line="+120"/>
+ <location line="+142"/>
<source>Building helpers</source>
<translation>Ausgabe-Hilfsbibliothek</translation>
</message>
@@ -11674,7 +11945,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation><html><body><table><tr><td>Datei:</td><td><pre>%1</pre></td></tr><tr><td>Letzte Änderung:</td><td>%2</td></tr><tr><td>Größe:</td><td>%3 Bytes</td></tr></table></body></html></translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+120"/>
<source>The Qt Version identified by %1 is not installed. Run make install</source>
<translation>Die Qt-Version %1 ist nicht installiert. Führen Sie make install aus</translation>
</message>
@@ -11765,9 +12036,8 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Die MSVC-Version konnte nicht bestimmt werden.</span></p></body></html></translation>
</message>
<message>
- <location/>
<source>MWC Directory:</source>
- <translation>MWC-Verzeichnis:</translation>
+ <translation type="obsolete">MWC-Verzeichnis:</translation>
</message>
<message>
<location/>
@@ -11779,6 +12049,16 @@ p, li { white-space: pre-wrap; }
<source>QMake Location:</source>
<translation>QMake-Pfad:</translation>
</message>
+ <message>
+ <location/>
+ <source>S60 SDK:</source>
+ <translation>S60 SDK:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Carbide Directory:</source>
+ <translation>Carbide-Ordner:</translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::QtWizard</name>
@@ -11791,7 +12071,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+855"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+828"/>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
<translation>Warnung: Die zu %1 gehörige Symboldatei konnte nicht gefunden werden.</translation>
</message>
@@ -11809,17 +12089,17 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfiguration</name>
<message>
- <location line="-790"/>
+ <location line="-756"/>
<source>QtS60DeviceRunConfiguration</source>
<translation>QtS60DeviceRunConfiguration</translation>
</message>
<message>
- <location line="+185"/>
+ <location line="+197"/>
<source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
<translation>%1 konnte nicht ausgewertet werden. Die Qt S60-Ausführungskonfiguration %2 kann nicht gestartet werden.</translation>
</message>
<message>
- <location line="-187"/>
+ <location line="-199"/>
<source>%1 on Symbian Device</source>
<translation>%1 auf Symbian-Gerät</translation>
</message>
@@ -11827,7 +12107,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
<message>
- <location line="+407"/>
+ <location line="+286"/>
<source>%1 on Symbian Device</source>
<translation>%1 auf Symbian-Gerät</translation>
</message>
@@ -11835,7 +12115,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
<message>
- <location line="-134"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp" line="+127"/>
<source>Self-signed certificate</source>
<translation>Selbstsigniertes Zertifikat</translation>
</message>
@@ -11845,22 +12125,32 @@ p, li { white-space: pre-wrap; }
<translation>Benutzerdefiniertes Zertifikat:</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-46"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-20"/>
+ <source>Device:</source>
+ <translation>Gerät:</translation>
+ </message>
+ <message>
+ <location line="+23"/>
<source>Install File:</source>
<translation>Installationspaket:</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>Device on Serial Port:</source>
<translation>Gerät auf serieller Schnittstelle:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+9"/>
+ <source>Queries the device for information</source>
+ <translation>Fragt Informationen vom Gerät ab</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>Choose certificate file (.cer)</source>
<translation>Geben Sie eine Datei mit einem Zertifikat (.cer) an</translation>
</message>
@@ -11874,11 +12164,37 @@ p, li { white-space: pre-wrap; }
<source>Key file:</source>
<translation>Datei mit Schlüssel:</translation>
</message>
+ <message>
+ <location line="+126"/>
+ <source><No Device></source>
+ <extracomment>Summary text of S60 device run configuration</extracomment>
+ <translation><Kein Gerät angeschlossen></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>(custom certificate)</source>
+ <translation>(benutzerdefiniertes Zertifikat)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(self-signed certificate)</source>
+ <translation>(selbstsigniertes Zertifikat)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Summary: Run on '%1' %2</source>
+ <translation>Führe auf '%1' aus %2</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Connecting...</source>
+ <translation>Verbinde...</translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunControl</name>
<message>
- <location line="+437"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+407"/>
<source>Could not start application: %1</source>
<translation>Die Anwendung konnte nicht gestartet werden: %1</translation>
</message>
@@ -11901,17 +12217,29 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunControlBase</name>
<message>
- <location line="-58"/>
+ <location line="-135"/>
+ <source>Could not connect to phone on port '%1': %2
+Check if the phone is connected and App TRK is running.</source>
+ <translation>Es konnte keine Verbindung zum Gerät über den Port '%1' hergestellt werden: %2
+Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK' läuft.</translation>
+ </message>
+ <message>
+ <location line="+45"/>
<source>Could not install from package %1 on device: %2</source>
<translation>Das Installation des Pakets %1 auf dem Gerät schlug fehl: %2</translation>
</message>
<message>
- <location line="-175"/>
+ <location line="-215"/>
<source>Creating %1.sisx ...</source>
<translation>Erstelle %1.sisx ...</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-5"/>
+ <source>There is no device plugged in.</source>
+ <translation>Es ist kein Gerät angeschlossen.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Executable file: %1</source>
<translation>Ausführbare Datei: %1</translation>
</message>
@@ -11922,12 +12250,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+12"/>
- <location line="+76"/>
+ <location line="+90"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<message>
- <location line="-41"/>
+ <location line="-42"/>
<source>Could not read template package file '%1'</source>
<translation>Die Vorlagedatei für die Paketbeschreibung ('%1') konnte nicht gelesen werden</translation>
</message>
@@ -11938,26 +12266,25 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+16"/>
- <location line="+28"/>
+ <location line="+29"/>
<source>An error occurred while creating the package.</source>
<translation>Bei der Erstellung des Installationspakets trat ein Fehler auf.</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+26"/>
<source>Package: %1
Deploying application to '%2'...</source>
<translation>Installationspaket: %1
Installiere Anwendung auf '%2'...</translation>
</message>
<message>
- <location line="+5"/>
<source>Could not connect to phone on port '%1': %2
Check if the phone is connected and the TRK application is running.</source>
- <translation>Die Verbindung zum Gerät über den Port '%1' konnte nicht hergestellt werden: %2
+ <translation type="obsolete">Die Verbindung zum Gerät über den Port '%1' konnte nicht hergestellt werden: %2
Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK' läuft.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+30"/>
<source>Could not create file %1 on device: %2</source>
<translation>Die Datei %1 konnte nicht auf dem Gerät erzeugt werden: %2</translation>
</message>
@@ -11973,6 +12300,11 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
</message>
<message>
<location line="+6"/>
+ <source>Could not connect to App TRK on device: %1. Restarting App TRK might help.</source>
+ <translation>Es konnte keine Verbindung zu App TRK über den Port '%1' hergestellt werden. Bitte versuchen Sie, App TRK neu zu starten.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
<source>Copying install file...</source>
<translation>Kopiere Installationspaket...</translation>
</message>
@@ -11987,7 +12319,22 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<translation>Installiere Anwendung...</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+17"/>
+ <source>Waiting for App TRK</source>
+ <translation>Warte auf App TRK</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Please start App TRK on %1.</source>
+ <translation>Bitte starten Sie App TRK auf %1.</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Canceled.</source>
+ <translation>Abgebrochen.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Failed to start %1.</source>
<translation>%1 konnte nicht gestartet werden.</translation>
</message>
@@ -12030,7 +12377,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<translation>Aktualisieren</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+91"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+96"/>
<source>S60 SDKs</source>
<translation>S60 SDKs</translation>
</message>
@@ -12038,7 +12385,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60DevicesWidget</name>
<message>
- <location line="-23"/>
+ <location line="-28"/>
<source>No Qt installed</source>
<translation>Qt ist nicht installiert'</translation>
</message>
@@ -12046,7 +12393,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+55"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+59"/>
<source>%1 in Symbian Emulator</source>
<translation>%1 im Symbian-Emulator</translation>
</message>
@@ -12064,7 +12411,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
<message>
- <location line="+98"/>
+ <location line="+113"/>
<source>%1 in Symbian Emulator</source>
<translation>%1 im Symbian-Emulator</translation>
</message>
@@ -12072,20 +12419,25 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
<message>
- <location line="-58"/>
+ <location line="-63"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
+ <message>
+ <location line="+21"/>
+ <source>Summary: Run %1 in emulator</source>
+ <translation>Führe %1 im Emulator aus</translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunControl</name>
<message>
- <location line="+100"/>
+ <location line="+85"/>
<source>Starting %1...</source>
<translation>Starte %1...</translation>
</message>
@@ -12103,7 +12455,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60Manager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+111"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+112"/>
<source>Run in Emulator</source>
<translation>Im Emulator ausführen</translation>
</message>
@@ -12219,12 +12571,12 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::MakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="-247"/>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="-244"/>
<source><font color="#ff0000">Could not find make command: %1 in the build environment</font></source>
<translation><font color="#ff0000">Das make-Kommando %1 konnte in der Build-Umgebung nicht gefunden werden</font></translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source><font color="#0000ff"><b>No Makefile found, assuming project is clean.</b></font></source>
<translation><font color="#0000ff"><b>Es wurde kein Makefile gefunden; das Projekt ist offenbar im bereinigten Zustand.</b></font></translation>
</message>
@@ -12232,12 +12584,12 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::MakeStepConfigWidget</name>
<message>
- <location line="+54"/>
+ <location line="+57"/>
<source>Override %1:</source>
<translation>Ãœberschreibe %1:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+18"/>
<source><b>Make Step:</b> %1 not found in the environment.</source>
<translation><b>Make-Schritt:</b> %1 konnte in der Umgebung nicht gefunden werden.</translation>
</message>
@@ -12361,7 +12713,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+326"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+349"/>
<source><not found></source>
<translation><nicht gefunden></translation>
</message>
@@ -12371,26 +12723,53 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<source>Qt in PATH</source>
<translation>Qt aus PATH</translation>
</message>
-</context>
-<context>
- <name>QtDumperHelper</name>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+103"/>
- <source>Found a too-old version of the debugging helper library (%1); version %2 is required.</source>
- <translation>Es wurde eine veraltete Version (%1) der Ausgabe-Hilfsbibliothek gefunden. Version %2 ist erforderlich.</translation>
+ <location line="+147"/>
+ <source>Name:</source>
+ <translation>Name:</translation>
</message>
- <message numerus="yes">
- <location line="+37"/>
- <source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
- <translation>
- <numerusform>Ein unterstützter Datentyp, Qt-Version: %1, Namensraum: %2, Version: %3</numerusform>
- <numerusform>%n unterstützte Datentypen, Qt-Version: %1, Namensraum: %2, Version: %3</numerusform>
- </translation>
+ <message>
+ <location line="+2"/>
+ <source>Source:</source>
+ <translation>Ordner:</translation>
</message>
<message>
- <location line="-1"/>
- <source><none></source>
- <translation><kein></translation>
+ <location line="+2"/>
+ <source>mkspec:</source>
+ <translation>mkspec:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>qmake:</source>
+ <translation>qmake:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Default:</source>
+ <translation>Vorgabe:</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Compiler:</source>
+ <translation>Compiler:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Version:</source>
+ <translation>Version:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Debugging helper:</source>
+ <translation>Ausgabe-Hilfsbibliothek:</translation>
+ </message>
+</context>
+<context>
+ <name>QApplication</name>
+ <message>
+ <location line="+862"/>
+ <source>The Qt Version has no toolchain.</source>
+ <translation>Dieser Qt-Version ist keine Toolchain zugeordnet.</translation>
</message>
</context>
<context>
@@ -12801,39 +13180,32 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::SettingsDialog</name>
<message>
- <location filename="../../../src/plugins/locator/settingswidget.ui"/>
<source>Configure Filters</source>
- <translation>Filter konfigurieren</translation>
+ <translation type="obsolete">Filter konfigurieren</translation>
</message>
<message>
- <location/>
<source>Add</source>
- <translation>Hinzufügen</translation>
+ <translation type="obsolete">Hinzufügen</translation>
</message>
<message>
- <location/>
<source>Remove</source>
- <translation>Entfernen</translation>
+ <translation type="obsolete">Entfernen</translation>
</message>
<message>
- <location/>
<source> min</source>
- <translation> minuten</translation>
+ <translation type="obsolete"> minuten</translation>
</message>
<message>
- <location/>
<source>Refresh now!</source>
- <translation>Jetzt aktualisieren!</translation>
+ <translation type="obsolete">Jetzt aktualisieren!</translation>
</message>
<message>
- <location/>
<source>Edit...</source>
- <translation>Ändern...</translation>
+ <translation type="obsolete">Ändern...</translation>
</message>
<message>
- <location/>
<source>Refresh Interval:</source>
- <translation>Aktualisierungsintervall:</translation>
+ <translation type="obsolete">Aktualisierungsintervall:</translation>
</message>
</context>
<context>
@@ -13634,7 +14006,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>SymbolGroup</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+49"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+52"/>
<source>Out of scope</source>
<translation>Nicht im Bereich</translation>
</message>
@@ -13692,7 +14064,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+4274"/>
+ <location line="+4275"/>
<source>Line: %1, Col: %2</source>
<translation>Zeile: %1, Spalte: %2</translation>
</message>
@@ -14789,7 +15161,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::NewClassWidget</name>
<message>
- <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+392"/>
+ <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+416"/>
<source>Invalid base class name</source>
<translation>Der Name der Basisklasse ist ungültig</translation>
</message>
@@ -14843,6 +15215,11 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
+ <message>
+ <location/>
+ <source>Inherits QObject</source>
+ <translation>Erbt von Klasse QObject</translation>
+ </message>
</context>
<context>
<name>Utils::PathChooser</name>
@@ -14857,7 +15234,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<translation>Auswählen...</translation>
</message>
<message>
- <location line="+122"/>
+ <location line="+123"/>
<source>Choose a directory</source>
<translation>Wählen Sie ein Verzeichnis</translation>
</message>
@@ -15363,7 +15740,7 @@ p, li { white-space: pre-wrap; }
<translation>Formular</translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+46"/>
+ <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+47"/>
<source>News From the Qt Labs</source>
<translation>Neuigkeiten aus den Qt Labs</translation>
</message>
@@ -15379,7 +15756,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Qt Home</source>
<translation>Qt Home</translation>
</message>
@@ -15399,6 +15776,11 @@ p, li { white-space: pre-wrap; }
<translation>
Qt Centre</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Apps</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+1"/>
<source>Qt for Symbian at Forum Nokia</source>
@@ -15434,7 +15816,7 @@ Qt Centre</translation>
<translation>Feedback</translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+115"/>
+ <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+116"/>
<source>Welcome</source>
<translation>Willkommen</translation>
</message>
@@ -15483,15 +15865,19 @@ Qt Centre</translation>
<context>
<name>Debugger::Internal::TrkOptionsPage</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
<source>Symbian Trk</source>
- <translation>Symbian-Trk</translation>
+ <translation type="obsolete">Symbian-Trk</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
+ <source>Symbian TRK</source>
+ <translation>Symbian TRK</translation>
</message>
</context>
<context>
<name>Debugger::Internal::AbstractGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/abstractgdbadapter.cpp" line="+88"/>
+ <location filename="../../../src/plugins/debugger/gdb/abstractgdbadapter.cpp" line="+74"/>
<source>The Gdb process could not be stopped:
%1</source>
<translation>Der Gdb-Prozess konnte nicht angehalten werden:
@@ -15527,4 +15913,191 @@ Qt Centre</translation>
%1</translation>
</message>
</context>
+<context>
+ <name>Debugger::Internal::TermGdbAdapter</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+142"/>
+ <source>Debugger Error</source>
+ <translation>Debugger-Fehler</translation>
+ </message>
+</context>
+<context>
+ <name>QmlParser</name>
+ <message>
+ <location filename="../../../src/plugins/qmleditor/parser/qmljslexer.cpp" line="+553"/>
+ <source>Illegal character</source>
+ <translation>Ungültiges Zeichen</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Unclosed string at end of line</source>
+ <translation>Zeichenkette am Zeilenende nicht geschlossen</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Illegal escape squence</source>
+ <translation>Ungültige Escape-Sequenz</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Illegal unicode escape sequence</source>
+ <translation>Ungültige Unicode-Escape-Sequenz</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Unclosed comment at end of file</source>
+ <translation>Kommentar am Dateiende nicht geschlossen</translation>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Illegal syntax for exponential number</source>
+ <translation>Ungültige Syntax des Exponenten der Zahl</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Identifier cannot start with numeric literal</source>
+ <translation>Bezeichner kann nicht mit numerischem Zeichen beginnen</translation>
+ </message>
+ <message>
+ <location line="+331"/>
+ <source>Unterminated regular expression literal</source>
+ <translation>Regulärer Ausdruck nicht abgeschlossen</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Invalid regular expression flag '%0'</source>
+ <translation>Ungültiger Modifizierer für regulären Ausdruck '%0'</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qmleditor/parser/qmljsparser.cpp" line="+1752"/>
+ <source>Unexpected token '%1'</source>
+ <translation>Unerwartetes Zeichen '%1'</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <location line="+23"/>
+ <source>Expected token '%1'</source>
+ <translation>Erwartet: '%1'</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Syntax error</source>
+ <translation>Syntaxfehler</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::S60Devices::Device</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devices.cpp" line="+66"/>
+ <source>Id:</source>
+ <translation>Id:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Name:</source>
+ <translation>Name:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>EPOC:</source>
+ <translation>EPOC:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Tools:</source>
+ <translation>Tools:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt:</source>
+ <translation>Qt:</translation>
+ </message>
+</context>
+<context>
+ <name>trk::BluetoothListener</name>
+ <message>
+ <location filename="../../../src/shared/trk/bluetoothlistener.cpp" line="+133"/>
+ <source>%1: Stopping listener %2...</source>
+ <translation>%1: Halte Prozess %2 an ...</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>%1: Starting Bluetooth listener %2...</source>
+ <translation>%1: Starte Prozess %2...</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Unable to run '%1': %2</source>
+ <translation>'%1' kann nicht ausgeführt werden: %2</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>%1: Bluetooth listener running (%2).</source>
+ <translation>%1: Prozess läuft (%2).</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>%1: Process %2 terminated with exit code %3.</source>
+ <translation>%1: Der Prozess %2 wurde beendet, Rückgabewert %3.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>%1: Process %2 crashed.</source>
+ <translation>%1: Der Prozess %2 ist abgestürzt.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1: Process error %2: %3</source>
+ <translation>%1: Fehler bei Prozess %2: %3</translation>
+ </message>
+</context>
+<context>
+ <name>trk::promptStartCommunication</name>
+ <message>
+ <location filename="../../../src/shared/trk/bluetoothlistener_gui.cpp" line="+68"/>
+ <source>Connection on %1 canceled.</source>
+ <translation>Die Verbindung auf %1 wurde abgebrochen.</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Waiting for App TRK</source>
+ <translation>Warte auf App TRK</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Waiting for App TRK to start on %1...</source>
+ <translation>Warte auf App TRK an %1...</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Waiting for Bluetooth Connection</source>
+ <translation>Warte auf Bluetooth-Verbindung</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Connecting to %1...</source>
+ <translation>Verbinde zu %1...</translation>
+ </message>
+</context>
+<context>
+ <name>trk::BaseCommunicationStarter</name>
+ <message numerus="yes">
+ <location filename="../../../src/shared/trk/communicationstarter.cpp" line="+165"/>
+ <source>%1: timed out after %n attempts using an interval of %2ms.</source>
+ <translation>
+ <numerusform>%1: Zeitüberschreitung nach einem Versuch (Interval %2ms).</numerusform>
+ <numerusform>%1: Zeitüberschreitung nach %n Versuchen (Interval %2ms).</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1: Connection attempt %2 succeeded.</source>
+ <translation>%1: Verbindung im Versuch %2 hergestellt.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1: Connection attempt %2 failed: %3 (retrying)...</source>
+ <translation>%1: Verbindung im Versuch %2 fehlgeschlagen: %3 (wird wiederholt)...</translation>
+ </message>
+</context>
</TS>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index e77be508a0ca569a4e3f674489ed6cacb5a0a69c..60d3782051b807288a630dc8b5d3baa9e47b9a75 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -4,7 +4,7 @@
<context>
<name>Application</name>
<message>
- <location filename="../../../src/app/main.cpp" line="+147"/>
+ <location filename="../../../src/app/main.cpp" line="+129"/>
<source>Failed to load core: %1</source>
<translatorcomment>traduire core ?</translatorcomment>
<translation type="unfinished">Échec dans le chargement du core : %1</translation>
@@ -17,12 +17,13 @@
<message>
<location line="+135"/>
<source>Could not find 'Core.pluginspec' in %1</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">'Core.pluginspec' introuvable dans %1</translation>
</message>
<message>
<location line="+36"/>
<source>Qt Creator - Plugin loader messages</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Un s à plugin ?</translatorcomment>
+ <translation type="unfinished">Qt Creator - Messages du chargeur de plugin</translation>
</message>
<message>
<source>Couldn't find 'Core.pluginspec' in %1</source>
@@ -355,7 +356,7 @@
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp" line="+49"/>
<source>Clear system environment</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nettoyer l'environnement système</translation>
</message>
<message>
<location line="+14"/>
@@ -368,23 +369,23 @@
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+89"/>
<source>Create</source>
- <translation type="unfinished"></translation>
+ <translation>Créer</translation>
</message>
<message>
<location line="+10"/>
<source>New configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Nouvelle configuration</translation>
</message>
<message>
<location line="+1"/>
<source>New Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nom de la nouvelle configuration :</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location line="+699"/>
+ <location line="+702"/>
<source>&Change</source>
<translation>&Modifier</translation>
</message>
@@ -471,22 +472,23 @@
<message>
<location line="+57"/>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Traduction de path, ici chemin ?</translatorcomment>
+ <translation type="unfinished">Veuillez spécifier le chemin de l'exécutable cmake. Aucun exécutable cmake n'a été trouvé dans le chemin.</translation>
</message>
<message>
<location line="+5"/>
<source> The cmake executable (%1) does not exist.</source>
- <translation type="unfinished"></translation>
+ <translation>L'exécutable cmake (%1) n'existe pas.</translation>
</message>
<message>
<location line="+2"/>
<source> The path %1 is not a executable.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">%1 n'est pas le chemin d'un exécutable.</translation>
</message>
<message>
<location line="+2"/>
<source> The path %1 is not a valid cmake.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">%1 n'est pas un cmake valide.</translation>
</message>
<message>
<location line="+17"/>
@@ -501,7 +503,8 @@
<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>
+ <translatorcomment>toolchain -> chaine de compilation ? terminer ou terminez ?</translatorcomment>
+ <translation type="unfinished">Le répertoire %1 contient déjà un fichier cbp, ce qui est assez récent. Vous pouvez passer des arguments spéciaux ou changez la chaine de compilation utilisée ici et réexécuter cmake. Ou simplement terminer l'assistant directement</translation>
</message>
<message>
<location line="+5"/>
@@ -526,28 +529,28 @@
<message>
<location line="+31"/>
<source>NMake Generator</source>
- <translation type="unfinished"></translation>
+ <translation>Générateur NMake</translation>
</message>
<message>
<location line="+3"/>
<source>NMake Generator (%1)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Générateur NMake (%1)</translation>
</message>
<message>
<location line="+6"/>
<source>MinGW Generator</source>
- <translation type="unfinished"></translation>
+ <translation>Générateur MinGW</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+56"/>
<source>No valid cmake executable specified.</source>
- <translation type="unfinished"></translation>
+ <translation>L'exécutable cmake spécifié est invalide.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+248"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+246"/>
<location line="+10"/>
<source>CMake</source>
<translation>CMake</translation>
@@ -561,25 +564,26 @@
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+163"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+165"/>
<source>Additional arguments:</source>
- <translation type="unfinished">Arguments supplémentaires :</translation>
+ <translation>Arguments supplémentaires :</translation>
</message>
<message>
<location line="+6"/>
<source>Targets:</source>
- <translation type="unfinished">Cibles :</translation>
+ <translation>Cibles :</translation>
</message>
<message>
<location line="+59"/>
<source><b>Make:</b> %1 %2</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Traduire Make ? Construire ?</translatorcomment>
+ <translation type="unfinished"><b>Make : </b>%1 %2</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-212"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-213"/>
<source>Please enter the directory in which you want to build your project. </source>
<translation>Veuillez spécifier le répertoire où vous voulez compiler votre projet. </translation>
</message>
@@ -591,7 +595,7 @@
<message>
<location line="+8"/>
<source>Build directory:</source>
- <translation type="unfinished">Répertoire de compilation :</translation>
+ <translation>Répertoire de compilation :</translation>
</message>
</context>
<context>
@@ -651,7 +655,7 @@
<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"><html><body><p>Spécifiez le chemin vers l'<a href="%1">outil de déboguage Windows</a> (%2) ici.</p><p><b>Note:</b> Il est nécessaire de redémarrer Qt Creator pour que ces changements prennent effet.</p></p></body></html></translation>
+ <translation><html><body><p>Spécifiez le chemin vers l'<a href="%1">outil de déboguage Windows</a> (%2) ici.</p><p><b>Note:</b> Il est nécessaire de redémarrer Qt Creator pour que ces changements prennent effet.</p></p></body></html></translation>
</message>
<message>
<location line="+5"/>
@@ -666,7 +670,7 @@
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
<source>Other options</source>
- <translation type="unfinished"></translation>
+ <translation>Autres options</translation>
</message>
<message>
<location/>
@@ -695,9 +699,13 @@
<context>
<name>CodePaster::CodepasterPlugin</name>
<message>
- <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
<source>&CodePaster</source>
- <translation type="unfinished">&CodePaster</translation>
+ <translation type="obsolete">&CodePaster</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
+ <source>&Code Pasting</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
@@ -705,24 +713,24 @@
<translation type="unfinished">Coller le fragment...</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+C,Alt+P</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Fetch Snippet...</source>
<translation type="unfinished">Récuperer le fragment...</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+C,Alt+F</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+87"/>
<source>This protocol supports no listing</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ce protocole ne prend en charge aucune liste</translation>
</message>
<message>
<location line="+13"/>
@@ -763,14 +771,14 @@
<message>
<location/>
<source>Protocol:</source>
- <translation type="unfinished"></translation>
+ <translation>Protocole :</translation>
</message>
</context>
<context>
<name>CodePaster::SettingsPage</name>
<message>
<location filename="../../../src/plugins/cpaster/settingspage.ui"/>
- <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+62"/>
+ <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+67"/>
<source>General</source>
<translation>Général</translation>
</message>
@@ -795,14 +803,13 @@
</message>
<message>
<location/>
- <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
<source>CodePaster</source>
<translation>CodePaster</translation>
</message>
<message>
<location/>
<source>Default Protocol:</source>
- <translation type="unfinished"></translation>
+ <translation>Protocole par défaut :</translation>
</message>
<message>
<location/>
@@ -814,6 +821,11 @@
<source>Pastebin.com</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
+ <source>Code Pasting</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CommonOptionsPage</name>
@@ -876,12 +888,13 @@
<message>
<location/>
<source>Show a message box when receiving a signal</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>message box -> message, boîte de message, fenêtre de message ?</translatorcomment>
+ <translation type="unfinished">Afficher un message à la réception d'un signal</translation>
</message>
<message>
<location/>
<source>Use tooltips in main editor while debugging</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Utiliser les info-bulles dans l'éditeur principal lors du déboguage</translation>
</message>
</context>
<context>
@@ -927,12 +940,12 @@
<message>
<location filename="../../../src/shared/help/contentwindow.cpp" line="+136"/>
<source>Open Link</source>
- <translation type="unfinished">Ouvrir le lien</translation>
+ <translation>Ouvrir le lien</translation>
</message>
<message>
<location line="+1"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished">Ouvrir le lien dans un nouvel onglet</translation>
+ <translation>Ouvrir le lien dans un nouvel onglet</translation>
</message>
</context>
<context>
@@ -940,17 +953,17 @@
<message>
<location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+158"/>
<source>Unable to create the directory %1.</source>
- <translation type="unfinished">Impossible de créer le répertoire %1.</translation>
+ <translation>Impossible de créer le répertoire %1.</translation>
</message>
<message>
<location line="+12"/>
<source>Unable to open %1 for writing: %2</source>
- <translation type="unfinished">Impossible d'ouvrir %1 pour écrire : %2</translation>
+ <translation>Impossible d'ouvrir %1 pour écrire : %2</translation>
</message>
<message>
<location line="+4"/>
<source>Error while writing to %1: %2</source>
- <translation type="unfinished">Erreur pendant l'écriture de %1 : %2</translation>
+ <translation>Erreur pendant l'écriture de %1 : %2</translation>
</message>
<message>
<location line="+296"/>
@@ -958,39 +971,39 @@
<location line="+7"/>
<location line="+6"/>
<source>File Generation Failure</source>
- <translation type="unfinished">Échec de la génération du fichier</translation>
+ <translation>Échec de la génération du fichier</translation>
</message>
<message>
<location line="-22"/>
<location line="+111"/>
<source>Existing files</source>
- <translation type="unfinished">Fichier existants</translation>
+ <translation type="unfinished">Fichiers existants</translation>
</message>
<message>
<location line="-62"/>
<source>Failed to open an editor for '%1'.</source>
- <translation type="unfinished">Échec de l'ouverture d'un éditeur pour '%1'.</translation>
+ <translation>Échec de l'ouverture d'un éditeur pour '%1'.</translation>
</message>
<message>
<location line="+18"/>
<source> [read only]</source>
- <translation type="unfinished"> [lecture seule]</translation>
+ <translation> [lecture seule]</translation>
</message>
<message>
<location line="+1"/>
<source> [directory]</source>
- <translation type="unfinished"> [répertoire]</translation>
+ <translation> [répertoire]</translation>
</message>
<message>
<location line="+1"/>
<source> [symbolic link]</source>
- <translation type="unfinished"> [lien symbolique]</translation>
+ <translation> [lien symbolique]</translation>
</message>
<message>
<location line="+34"/>
<source>The project directory %1 contains files which cannot be overwritten:
%2.</source>
- <translation type="unfinished">Le répertoire du projet %1 contient des fichiers qui ne peuvent être écrasés :
+ <translation>Le répertoire du projet %1 contient des fichiers qui ne peuvent être écrasés :
%2.</translation>
</message>
<message>
@@ -998,8 +1011,8 @@
<source>The following files already exist in the directory %1:
%2.
Would you like to overwrite them?</source>
- <translation type="unfinished">Les fichiers suivants existent déjà dans le répertoire %1 :
-%2,
+ <translation>Les fichiers suivants existent déjà dans le répertoire %1 :
+%2.
Voulez vous les écraser?</translation>
</message>
</context>
@@ -1007,15 +1020,15 @@ Voulez vous les écraser?</translation>
<name>Core::EditorManager</name>
<message>
<location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+187"/>
- <location line="+1495"/>
+ <location line="+1493"/>
<source>Revert to Saved</source>
<translation type="unfinished">Revenir à la version sauvegardée</translation>
</message>
<message>
- <location line="-1492"/>
+ <location line="-1490"/>
<location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+531"/>
<source>Close</source>
- <translation type="unfinished">Fermer</translation>
+ <translation>Fermer</translation>
</message>
<message>
<location line="+1"/>
@@ -1024,7 +1037,7 @@ Voulez vous les écraser?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1294"/>
+ <location line="+1292"/>
<source>Close Others</source>
<translation type="unfinished">Fermer les Autres Éditeurs</translation>
</message>
@@ -1037,7 +1050,7 @@ Voulez vous les écraser?</translation>
<translation type="obsolete">Document Précédent dans l'Historique</translation>
</message>
<message>
- <location line="-1293"/>
+ <location line="-1291"/>
<source>Next Open Document in History</source>
<translation type="unfinished"></translation>
</message>
@@ -1117,57 +1130,67 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Split</source>
- <translation type="unfinished">Scinder</translation>
+ <location line="+6"/>
+ <source>Meta+E</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Ctrl+E,2</source>
+ <location line="+2"/>
+ <source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Split Side by Side</source>
- <translation type="unfinished">Scinder Verticalement</translation>
+ <location line="+3"/>
+ <source>Split</source>
+ <translation type="unfinished">Scinder</translation>
</message>
<message>
- <location line="+3"/>
- <source>Ctrl+E,3</source>
- <translation type="unfinished"></translation>
+ <location line="+6"/>
+ <source>Split Side by Side</source>
+ <translation type="unfinished">Scinder Verticalement</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Remove Current Split</source>
<translation type="unfinished">Fermer la Vue Courante</translation>
</message>
<message>
- <location line="+3"/>
- <source>Ctrl+E,0</source>
+ <location line="+6"/>
+ <source>Remove All Splits</source>
+ <translation type="unfinished">Fermer toutes les vues</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Goto Other Split</source>
+ <translation type="unfinished">Changer de vue</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>%1,2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Remove All Splits</source>
- <translation type="unfinished">Fermer toutes les vues</translation>
+ <location line="+6"/>
+ <source>%1,3</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Ctrl+E,1</source>
+ <location line="+6"/>
+ <source>%1,0</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Goto Other Split</source>
- <translation type="unfinished">Changer de vue</translation>
+ <location line="+6"/>
+ <source>%1,1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Ctrl+E,o</source>
+ <location line="+6"/>
+ <source>%1,o</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>&Advanced</source>
<translation type="unfinished">&Avancé</translation>
</message>
@@ -1190,17 +1213,17 @@ Voulez vous les écraser?</translation>
<message>
<location line="-24"/>
<source>Cannot open file %1!</source>
- <translation type="unfinished">Impossible d'ouvrir le fichier %1!</translation>
+ <translation>Impossible d'ouvrir le fichier %1!</translation>
</message>
<message>
<location line="+40"/>
<source>Open File</source>
- <translation type="unfinished">Ouvrir le Fichier</translation>
+ <translation>Ouvrir le Fichier</translation>
</message>
<message>
<location line="+140"/>
<source>File is Read Only</source>
- <translation type="unfinished">Le Fichier est en Lecture Seule</translation>
+ <translation>Le Fichier est en Lecture Seule</translation>
</message>
<message>
<location line="+1"/>
@@ -1214,17 +1237,17 @@ Voulez vous les écraser?</translation>
</message>
<message>
<location line="+2"/>
- <location line="+132"/>
+ <location line="+134"/>
<source>Make writable</source>
<translation type="unfinished">Rendre Inscriptible</translation>
</message>
<message>
- <location line="-128"/>
+ <location line="-130"/>
<source>Save as ...</source>
- <translation type="unfinished">Enregistrer sous...</translation>
+ <translation>Enregistrer sous...</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+8"/>
<source>Failed!</source>
<translation type="unfinished">Échec!</translation>
@@ -1242,12 +1265,12 @@ Voulez vous les écraser?</translation>
<message>
<location line="+92"/>
<source><b>Warning:</b> You are changing a read-only file.</source>
- <translation type="unfinished"><b>Attention:</b> Vous apportez des modifications à un fichier en lecture seule.</translation>
+ <translation><b>Attention:</b> Vous apportez des modifications à un fichier en lecture seule.</translation>
</message>
<message>
<location line="+15"/>
<source>Save %1 As...</source>
- <translation type="unfinished">Enregistrer %1 sous...</translation>
+ <translation>Enregistrer %1 sous...</translation>
</message>
<message>
<location line="+1"/>
@@ -1262,7 +1285,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+4"/>
<source>Close %1</source>
- <translation type="unfinished">Fermer %1</translation>
+ <translation>Fermer %1</translation>
</message>
<message>
<location line="+3"/>
@@ -1282,7 +1305,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+1"/>
<source>Cancel</source>
- <translation type="unfinished">Annuler</translation>
+ <translation>Annuler</translation>
</message>
<message>
<location line="+44"/>
@@ -1303,12 +1326,13 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+306"/>
<source>Cannot save file</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>sauver ou sauvegarder ?</translatorcomment>
+ <translation type="unfinished">Impossible de sauver le fichier</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot save changes to '%1'. Do you want to continue and lose your changes?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Impossible de sauvegarder les modifications dans '%1'. Voulez vous continuer et perdre vos modifications?</translation>
</message>
<message>
<location line="+113"/>
@@ -1323,7 +1347,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+35"/>
<source>Save File As</source>
- <translation type="unfinished">Enregistrer sous</translation>
+ <translation>Enregistrer sous</translation>
</message>
</context>
<context>
@@ -1378,7 +1402,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+11"/>
<source>Previous Document</source>
- <translation type="unfinished">Document précédent</translation>
+ <translation>Document précédent</translation>
</message>
<message>
<location line="+2"/>
@@ -1388,7 +1412,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+5"/>
<source>Next Document</source>
- <translation type="unfinished">Document suivant</translation>
+ <translation>Document suivant</translation>
</message>
<message>
<location line="+2"/>
@@ -1398,33 +1422,32 @@ Voulez vous les écraser?</translation>
<message>
<location line="+6"/>
<source>Previous Group</source>
- <translation type="unfinished">Groupe précédent</translation>
+ <translation>Groupe précédent</translation>
</message>
<message>
<location line="+6"/>
<source>Next Group</source>
- <translation type="unfinished">Groupe suivant</translation>
+ <translation>Groupe suivant</translation>
</message>
<message>
<location line="+6"/>
<source>Move Document to Previous Group</source>
- <translation type="unfinished">Déplacer le document vers le groupe précédent</translation>
+ <translation>Déplacer le document vers le groupe précédent</translation>
</message>
<message>
<location line="+6"/>
<source>Move Document to Next Group</source>
- <translation type="unfinished">Déplacer le document vers le groupe suivant</translation>
+ <translation>Déplacer le document vers le groupe suivant</translation>
</message>
</context>
<context>
<name>Core::Internal::EditorView</name>
- <message id="===============EditorView====================">
- <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-442"/>
+ <message>
<source>Go Back</source>
- <translation type="unfinished">Précédent</translation>
+ <translation type="obsolete">Précédent</translation>
</message>
<message>
- <location line="+2"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-440"/>
<source>Go Forward</source>
<translation type="unfinished">Suivant</translation>
</message>
@@ -1480,70 +1503,71 @@ Voulez vous les écraser?</translation>
<message>
<location/>
<source>Terminal:</source>
- <translation type="unfinished">Terminal :</translation>
+ <translation>Terminal :</translation>
</message>
<message>
<location/>
<source>External editor:</source>
- <translation type="unfinished">Éditeur externe :</translation>
+ <translation>Éditeur externe :</translation>
</message>
<message>
<location/>
<source>?</source>
- <translation type="unfinished">?</translation>
+ <translation>?</translation>
</message>
<message>
<location filename="../../../src/plugins/coreplugin/generalsettings.cpp" line="+56"/>
<source>General</source>
- <translation type="unfinished">Général</translation>
+ <translation>Général</translation>
</message>
<message>
<location line="+10"/>
<source>Environment</source>
- <translation type="unfinished">Environnement</translation>
+ <translation>Environnement</translation>
</message>
<message>
<location line="+77"/>
<source>Variables</source>
- <translation type="unfinished">Variables</translation>
+ <translation>Variables</translation>
</message>
<message>
<location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
<source>When files are externally modified:</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>modifié à l'extérieur ?</translatorcomment>
+ <translation type="unfinished">Quand un fichier a été modifié à l'extérieur :</translation>
</message>
<message>
<location/>
<source>Always ask</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Demander quoi faire</translation>
</message>
<message>
<location/>
<source>Reload all modified files</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Recharger tous les fichiers modifiés</translation>
</message>
<message>
<location/>
<source>Ignore modifications</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ignorer les modifications</translation>
</message>
</context>
<context>
<name>Core::Internal::MainWindow</name>
<message>
- <location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+156"/>
+ <location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+157"/>
<source>Qt Creator</source>
- <translation type="unfinished">Qt Creator</translation>
+ <translation>Qt Creator</translation>
</message>
<message>
<location line="+143"/>
<source>Output</source>
- <translation type="unfinished">Sortie</translation>
+ <translation>Sortie</translation>
</message>
<message>
<location line="+161"/>
<source>&File</source>
- <translation type="unfinished">&Fichier</translation>
+ <translation>&Fichier</translation>
</message>
<message>
<location line="+14"/>
@@ -1580,22 +1604,22 @@ Voulez vous les écraser?</translation>
<message>
<location line="+62"/>
<source>&New File or Project...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">&Nouveau fichier ou projet...</translation>
</message>
<message>
<location line="+7"/>
<source>&Open File or Project...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">&Ouvrir le fichier ou le projet...</translation>
</message>
<message>
<location line="+7"/>
<source>&Open File With...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">&Ouvrir le fichier avec...</translation>
</message>
<message>
<location line="+8"/>
<source>Recent Files</source>
- <translation type="unfinished">Fichiers récents</translation>
+ <translation>Fichiers récents</translation>
</message>
<message>
<location line="+3"/>
@@ -1685,12 +1709,12 @@ Voulez vous les écraser?</translation>
<message>
<location line="+11"/>
<source>Minimize</source>
- <translation type="unfinished">Minimiser</translation>
+ <translation>Minimiser</translation>
</message>
<message>
<location line="+7"/>
<source>Zoom</source>
- <translation type="unfinished">Zoom</translation>
+ <translation>Zoom</translation>
</message>
<message>
<location line="+12"/>
@@ -1700,7 +1724,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+15"/>
<source>Full Screen</source>
- <translation type="unfinished">Plein écran</translation>
+ <translation>Plein écran</translation>
</message>
<message>
<location line="+10"/>
@@ -1723,6 +1747,11 @@ Voulez vous les écraser?</translation>
<comment>Title of dialog</comment>
<translation type="unfinished">Nouveau...</translation>
</message>
+ <message>
+ <location line="+511"/>
+ <source>Settings...</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Core::Internal::MessageOutputWindow</name>
@@ -1831,22 +1860,22 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+173"/>
<source>Output</source>
- <translation type="unfinished">Sortie</translation>
+ <translation>Sortie</translation>
</message>
<message>
<location line="+4"/>
<source>Clear</source>
- <translation type="unfinished">Effacer</translation>
+ <translation>Effacer</translation>
</message>
<message>
<location line="+5"/>
<source>Next Item</source>
- <translation type="unfinished">Élement suivant</translation>
+ <translation>Élement suivant</translation>
</message>
<message>
<location line="+5"/>
<source>Previous Item</source>
- <translation type="unfinished">Élement précédent</translation>
+ <translation>Élement précédent</translation>
</message>
<message>
<location line="+62"/>
@@ -1859,7 +1888,7 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/plugindialog.cpp" line="+54"/>
<source>Details</source>
- <translation type="unfinished">Détails</translation>
+ <translation>Détails</translation>
</message>
<message>
<location line="+1"/>
@@ -1869,21 +1898,23 @@ Voulez vous les écraser?</translation>
<message>
<location line="+1"/>
<source>Close</source>
- <translation type="unfinished">Fermer</translation>
+ <translation>Fermer</translation>
</message>
<message>
<location line="+15"/>
<source>Installed Plugins</source>
- <translation type="unfinished">Plugins installés</translation>
+ <translation>Plugins installés</translation>
</message>
<message>
<location line="+35"/>
<source>Plugin Details of %1</source>
+ <translatorcomment>Détail sur le plugin %1 ?</translatorcomment>
<translation type="unfinished">Détail sur plugin %1</translation>
</message>
<message>
<location line="+20"/>
<source>Plugin Errors of %1</source>
+ <translatorcomment>Pas de s</translatorcomment>
<translation type="unfinished">Erreurs du plugins %1</translation>
</message>
</context>
@@ -1904,22 +1935,22 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.cpp" line="+55"/>
<source>Do not Save</source>
- <translation type="unfinished"></translation>
+ <translation>Ne pas enregistrer</translation>
</message>
<message>
<location line="+44"/>
<source>Save All</source>
- <translation type="unfinished">Tout enregistrer</translation>
+ <translation>Tout enregistrer</translation>
</message>
<message>
<location line="+3"/>
<source>Save</source>
- <translation type="unfinished">Enregistrer</translation>
+ <translation>Enregistrer</translation>
</message>
<message>
<location line="+3"/>
<source>Save Selected</source>
- <translation type="unfinished">Enregistrer la selection</translation>
+ <translation>Enregistrer la sélection</translation>
</message>
</context>
<context>
@@ -1927,12 +1958,12 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/shortcutsettings.cpp" line="+72"/>
<source>Keyboard</source>
- <translation type="unfinished">Clavier</translation>
+ <translation>Clavier</translation>
</message>
<message>
<location line="+10"/>
<source>Environment</source>
- <translation type="unfinished">Environnement</translation>
+ <translation>Environnement</translation>
</message>
<message>
<location line="+157"/>
@@ -1961,7 +1992,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+5"/>
<source>Close</source>
- <translation type="unfinished">Fermer</translation>
+ <translation>Fermer</translation>
</message>
</context>
<context>
@@ -1969,7 +2000,7 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/versiondialog.cpp" line="+58"/>
<source>About Qt Creator</source>
- <translation type="unfinished">À propos de Qt Creator</translation>
+ <translation>À propos de Qt Creator</translation>
</message>
<message>
<location line="+11"/>
@@ -2129,7 +2160,7 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+145"/>
<source>Switch to %1 mode</source>
- <translation type="unfinished">Basculer vers le mode %1</translation>
+ <translation>Basculer vers le mode %1</translation>
</message>
</context>
<context>
@@ -2138,13 +2169,13 @@ Voulez vous les écraser?</translation>
<location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+228"/>
<source>Exception at line %1: %2
%3</source>
- <translation type="unfinished">Exception à la ligne %1 : %2
+ <translation>Exception à la ligne %1 : %2
%3</translation>
</message>
<message>
<location line="+66"/>
<source>Unknown error</source>
- <translation type="unfinished">Erreur inconnue</translation>
+ <translation>Erreur inconnue</translation>
</message>
</context>
<context>
@@ -2152,7 +2183,7 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+53"/>
<source>New %1</source>
- <translation type="unfinished">Nouveau %1</translation>
+ <translation>Nouveau %1</translation>
</message>
</context>
<context>
@@ -2241,7 +2272,7 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+125"/>
<source>The process '%1' could not be started: %2</source>
- <translation type="unfinished">Le processus '%1' ne peut pas être démarré : %2</translation>
+ <translation>Le processus '%1' ne peut pas être démarré : %2</translation>
</message>
<message>
<location line="+70"/>
@@ -2342,7 +2373,7 @@ Voulez vous les écraser?</translation>
<translation>Chemin :</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+392"/>
+ <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+416"/>
<source>Invalid base class name</source>
<translation>Nom de la classe parente invalide</translation>
</message>
@@ -2361,6 +2392,11 @@ Voulez vous les écraser?</translation>
<source>Invalid form file name: '%1'</source>
<translation>Nom du fichier d'interface invalide : '%1'</translation>
</message>
+ <message>
+ <location filename="../../../src/libs/utils/newclasswidget.ui"/>
+ <source>Inherits QObject</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils::PathChooser</name>
@@ -2375,14 +2411,14 @@ Voulez vous les écraser?</translation>
<translation>Parcourir...</translation>
</message>
<message>
- <location line="+122"/>
+ <location line="+123"/>
<source>Choose a directory</source>
- <translation>Selectionner un répertoire</translation>
+ <translation>Sélectionner un répertoire</translation>
</message>
<message>
<location line="+6"/>
<source>Choose a file</source>
- <translation type="unfinished">Sélectionner un fichier</translation>
+ <translation>Sélectionner un fichier</translation>
</message>
<message>
<location line="+33"/>
@@ -2525,7 +2561,7 @@ Voulez vous les écraser?</translation>
<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 type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
@@ -2536,19 +2572,19 @@ Voulez vous les écraser?</translation>
<context>
<name>CppEditor::Internal::CPPEditor</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+608"/>
+ <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+615"/>
<source>Sort alphabetically</source>
<translation>Trier par ordre alphabétique</translation>
</message>
<message>
- <location line="+265"/>
+ <location line="+163"/>
<source>This change cannot be undone.</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>Yes, I know what I am doing.</source>
- <translation type="unfinished"></translation>
+ <translation>Simplifier les déclarations</translation>
</message>
<message>
<source>Simplify Declarations</source>
@@ -2565,10 +2601,10 @@ Voulez vous les écraser?</translation>
<message>
<location line="+1"/>
<source>The header and source file names will be derived from the class name</source>
- <translation type="unfinished">Le nom du fichier source et du fichier d'en-tête seront dérivés du nom de la classe</translation>
+ <translation>Le nom du fichier source et du fichier d'en-tête seront dérivés du nom de la classe</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Configure...</source>
<translation>Configurer...</translation>
</message>
@@ -2576,7 +2612,7 @@ Voulez vous les écraser?</translation>
<context>
<name>CppEditor::Internal::CppClassWizard</name>
<message>
- <location line="+116"/>
+ <location line="+117"/>
<source>Error while generating file contents.</source>
<translation>Erreur a la génération du contenu du fichier.</translation>
</message>
@@ -2584,7 +2620,7 @@ Voulez vous les écraser?</translation>
<context>
<name>CppEditor::Internal::CppClassWizardDialog</name>
<message>
- <location line="-66"/>
+ <location line="-67"/>
<source>C++ Class Wizard</source>
<translation>Assistant de création de classe C++</translation>
</message>
@@ -2600,7 +2636,7 @@ Voulez vous les écraser?</translation>
<context>
<name>CppEditor::Internal::CppPlugin</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+175"/>
+ <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+174"/>
<source>C++</source>
<translation></translation>
</message>
@@ -2647,7 +2683,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+9"/>
<source>Find Usages</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Trouver des utilisations</translation>
</message>
<message>
<location line="+2"/>
@@ -2657,7 +2693,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+5"/>
<source>Rename Symbol under Cursor</source>
- <translation type="unfinished"></translation>
+ <translation>Renommer le symbole sous le curseur</translation>
</message>
</context>
<context>
@@ -2691,7 +2727,7 @@ Voulez vous les écraser?</translation>
<context>
<name>CppPreprocessor</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+542"/>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+540"/>
<source>%1: No such file or directory</source>
<translation>%1 : aucun fichier ou répertoire de ce type</translation>
</message>
@@ -2699,9 +2735,10 @@ Voulez vous les écraser?</translation>
<context>
<name>CppTools::Internal::CppModelManager</name>
<message>
- <location line="+290"/>
+ <location line="+295"/>
<source>Scanning</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Balayage ?</translatorcomment>
+ <translation type="unfinished">Numérisation</translation>
</message>
<message>
<location line="+42"/>
@@ -2763,7 +2800,7 @@ Voulez vous les écraser?</translation>
**************************************************************************/
</source>
<translation type="unfinished">/**************************************************************************
-** modèle de licence Qt Creator
+** Modèle de licence Qt Creator
** Mot-clés spéciaux: %USER% %DATE% %YEAR%
** Variables d'environnement : %$VARIABLE%
** Pour échaper un caractère pourcentage, utilisez '%%'.
@@ -2777,7 +2814,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+51"/>
<source>Choose a location for the new license template file</source>
- <translation type="unfinished"></translation>
+ <translation>Choisir un nouveau fichier pour le modèle de license</translation>
</message>
<message>
<source>Choose a new license template file</source>
@@ -2791,7 +2828,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+1"/>
<source>Cannot write to %1: %2</source>
- <translation type="unfinished">Impossible d'écrire %1 : %2</translation>
+ <translation>Impossible d'écrire %1 : %2</translation>
</message>
</context>
<context>
@@ -2813,7 +2850,7 @@ Voulez vous les écraser?</translation>
<context>
<name>CppTools::Internal::CppToolsPlugin</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+231"/>
+ <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+120"/>
<source>&C++</source>
<translation>&C++</translation>
</message>
@@ -2827,35 +2864,31 @@ Voulez vous les écraser?</translation>
<context>
<name>CppTools::Internal::FindClassDeclarations</name>
<message>
- <location line="-136"/>
<source>Search class</source>
- <translation>Rechercher la classe</translation>
+ <translation type="obsolete">Rechercher la classe</translation>
</message>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsplugin.h" line="+75"/>
<source>Class Declarations</source>
- <translation type="unfinished">Déclarations de classe</translation>
+ <translation type="obsolete">Déclarations de classe</translation>
</message>
</context>
<context>
<name>CppTools::Internal::FindFunctionCalls</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+53"/>
<source>Search functions</source>
- <translation type="unfinished">Rechercher fonctions</translation>
+ <translation type="obsolete">Rechercher les fonctions</translation>
</message>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsplugin.h" line="+25"/>
<source>Function calls</source>
- <translation type="unfinished">Appels de fonction</translation>
+ <translation type="obsolete">Appels de fonction</translation>
</message>
</context>
<context>
<name>CppTools::Internal::FunctionArgumentWidget</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+433"/>
+ <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+434"/>
<source>%1 of %2</source>
- <translation type="unfinished">%1 de %2</translation>
+ <translation>%1 de %2</translation>
</message>
</context>
<context>
@@ -2863,15 +2896,15 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggerconstants.h" line="+55"/>
<source>Common</source>
- <translation type="unfinished">Commun</translation>
+ <translation>Commun</translation>
</message>
<message>
<location line="+1"/>
<source>Debugger</source>
- <translation type="unfinished">Débogueur</translation>
+ <translation>Débogueur</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+432"/>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+654"/>
<source><Encoding error></source>
<translation><Erreur d'encodage></translation>
</message>
@@ -2879,8 +2912,12 @@ Voulez vous les écraser?</translation>
<context>
<name>QtDumperHelper</name>
<message>
- <location line="+103"/>
<source>Found a too-old version of the debugging helper library (%1); version %2 is required.</source>
+ <translation type="obsolete">Une version trop ancienne de la bibliothèque d'aide au déboguage a été trouvé(%1); La version %2 est nécessaire.</translation>
+ </message>
+ <message>
+ <location line="+103"/>
+ <source>Found an outdated version of the debugging helper library (%1); version %2 is required.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
@@ -2894,13 +2931,13 @@ Voulez vous les écraser?</translation>
<message>
<location line="-1"/>
<source><none></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
<name>Debugger::Internal::AttachCoreDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+136"/>
+ <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+135"/>
<source>Select Executable</source>
<translation>Selectionner l'exécutable</translation>
</message>
@@ -2938,20 +2975,12 @@ Voulez vous les écraser?</translation>
<message>
<location line="+220"/>
<source>Select start address</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Sélectionner l'adresse de départ</translation>
</message>
<message>
<location line="+3"/>
<source>Enter an address: </source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Debugger::MessageBox</name>
- <message>
- <location line="+61"/>
- <source>Settings...</source>
- <translation type="unfinished"></translation>
+ <translation>Entrer une adresse :</translation>
</message>
</context>
<context>
@@ -3028,7 +3057,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+2"/>
<source>Ignore Count:</source>
- <translation type="unfinished">Nombre de passages à ignorer :</translation>
+ <translation>Nombre de passages à ignorer :</translation>
</message>
<message>
<location line="+215"/>
@@ -3063,12 +3092,12 @@ Voulez vous les écraser?</translation>
<message>
<location line="+0"/>
<source>Address</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+62"/>
<source>Breakpoint will only be hit if this condition is met.</source>
- <translation type="unfinished">Le point d'arrêt ne sera respecté que si la condition est remplie.</translation>
+ <translation>Le point d'arrêt ne sera respecté que si la condition est remplie.</translation>
</message>
<message>
<location line="+6"/>
@@ -3081,164 +3110,188 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/debugger/breakwindow.cpp" line="+86"/>
<source>Breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Points d'arrêt</translation>
</message>
<message>
<location line="+61"/>
<source>Delete breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Supprimer le point d'arrêt</translation>
</message>
<message>
<location line="+3"/>
<source>Delete all breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Supprimer tous les points d'arrêt</translation>
</message>
<message>
<location line="+13"/>
<source>Delete breakpoints of "%1"</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Supprimer les points d'arrêt de "%1"</translation>
</message>
<message>
<location line="+6"/>
<source>Delete breakpoints of file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Supprimer les points d'arrêt du fichier</translation>
</message>
<message>
<location line="+4"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Toujours ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="+4"/>
<source>Edit condition...</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Changer ou Modifier ? Condition ou Etat ?</translatorcomment>
+ <translation type="unfinished">Modifier l'état...</translation>
</message>
<message>
<location line="+3"/>
<source>Synchronize breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Synchroniser les points d'arrêt</translation>
</message>
<message>
<location line="+6"/>
<source>Disable breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Désactiver le point d'arrêt</translation>
</message>
<message>
<location line="+0"/>
<source>Enable breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Activer le point d'arrêt</translation>
</message>
<message>
<location line="+5"/>
<source>Use short path</source>
- <translation type="unfinished"></translation>
+ <translation>Utiliser le chemin court</translation>
</message>
<message>
<location line="+0"/>
<source>Use full path</source>
- <translation type="unfinished"></translation>
+ <translation>Utiliser le chemin complet</translation>
</message>
<message>
<location line="+4"/>
<source>Set Breakpoint at Function...</source>
- <translation type="unfinished"></translation>
+ <translation>Placer un point d'arrêt à la fonction...</translation>
</message>
<message>
<location line="+1"/>
<source>Set Breakpoint at Function "main"</source>
- <translation type="unfinished"></translation>
+ <translation>Placer un point d'arrêt à la fonction "main"</translation>
</message>
<message>
<location line="+101"/>
<source>Conditions on Breakpoint %1</source>
- <translation type="unfinished"></translation>
+ <translation>Condition au point d'arrêt %1</translation>
</message>
</context>
<context>
<name>Debugger::Internal::CdbDebugEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+132"/>
+ <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 type="unfinished">Impossible de charger la bibliothèque de déboguage '%1': %2</translation>
</message>
<message>
<location line="+17"/>
<source>The function "%1()" failed: %2</source>
<extracomment>Function call failed</extracomment>
- <translation type="unfinished"></translation>
+ <translation>La fonction "%1()" a échoué : %2</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+112"/>
<source>Unable to resolve '%1' in the debugger engine library '%2'</source>
+ <translation type="unfinished">Impossible de résoudre '%1' dans la bibliothèque de déboguage '%2'</translation>
+ </message>
+ <message>
+ <location line="+349"/>
+ <source>Version: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source><html>The installed version of the <i>Debugging Tools for Windows</i> (%1) is rather old. Upgrading to version %2 is recommended for the proper display of Qt's data types.</html></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+355"/>
+ <location line="+4"/>
+ <source>Debugger</source>
+ <translation type="unfinished">Débogueur</translation>
+ </message>
+ <message>
+ <location line="+33"/>
<source>The dumper library was not found at %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+33"/>
<source>The console stub process was unable to start '%1'.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source>Attaching to core files is not supported!</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>A noun could be better instead of Attacher</translatorcomment>
+ <translation type="unfinished">Attacher à un fichier core n'est pas supporté!</translation>
</message>
<message>
<location line="+4"/>
<source>Debugger running</source>
- <translation type="unfinished"></translation>
+ <translation>Débogueur en fonctionnement</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Attaching to a process failed for process id %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Impossible d'attacher au processsus d'id %1: %2</translation>
</message>
<message>
<location line="+27"/>
<source>Unable to set the image path to %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Impossible de définir le chemin de l'image %1 : %2</translation>
</message>
<message>
<location line="+31"/>
<source>Unable to create a process '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Impossible de créer un processus '%1': %2</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+43"/>
<source>The process exited with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Ou avec le code de sortie ?</translatorcomment>
+ <translation type="unfinished">Le processus s'est terminé et a retourné le code %1.</translation>
</message>
<message>
<location line="+191"/>
<source>Continuing with '%1'...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Continue avec '%1'...</translation>
</message>
<message>
<location line="+8"/>
<source>Unable to continue: %1</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Impossible de continuer : %1</translation>
</message>
<message>
<location line="+24"/>
<source>Reverse stepping is not implemented.</source>
+ <translation type="unfinished">L'échelonnage inversé n'est pas implémenté.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Thread %1 cannot be stepped.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
<source>Stepping %1</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Intensification ?</translatorcomment>
+ <translation type="unfinished">Echellonage %1</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+63"/>
<source>Running to 0x%1...</source>
<translation type="unfinished"></translation>
</message>
@@ -3248,7 +3301,7 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+59"/>
<source>Running up to %1:%2...</source>
<translation type="unfinished"></translation>
</message>
@@ -3260,61 +3313,73 @@ Voulez vous les écraser?</translation>
<message>
<location line="+13"/>
<source>Jump to line is not implemented</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Aller à la ligne n'est pas implémenté</translation>
</message>
<message>
<location line="+27"/>
<source>Unable to assign the value '%1' to '%2': %3</source>
- <translation type="unfinished"></translation>
+ <translation>Impossible d'assigner la valeur '%1' Ã '%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 type="unfinished">Impossible de récupérer %1 octets de mémoire sur 0x%2 : %3</translation>
</message>
<message>
<location line="+32"/>
<source>Cannot retrieve symbols while the debuggee is running.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>note: debuggee is not a typo</translatorcomment>
+ <translation type="unfinished">Les symboles ne peuvent pas être obtenus lorsque le processus débogué est en fonctionnement.</translation>
</message>
<message>
<location line="+64"/>
<location line="+6"/>
<source>Debugger Error</source>
+ <translation>Erreur du débogueur</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Ignoring initial breakpoint...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+48"/>
- <source>Stopped, current thread: %1</source>
+ <location line="+55"/>
+ <source>Interrupted in thread %1, current thread: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+1"/>
+ <source>Stopped, current thread: %1</source>
+ <translation type="unfinished">Arrêté, thread courant : %1</translation>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Changing threads: %1 -> %2</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Changement de threads:%1 ->%2</translation>
</message>
<message>
- <location line="+77"/>
+ <location line="+80"/>
<source>Thread %1: Missing debug information for top stack frame (%2).</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>stack frame ?</translatorcomment>
+ <translation type="unfinished">Thread %1 : Manque d'informations de débogage sur le haut de la pile ????(%2).</translation>
</message>
<message>
<location line="+1"/>
<source>Thread %1: No debug information available (%2).</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Thread %1 : Aucune information de débogage disponible (%2).</translation>
</message>
</context>
<context>
<name>Debugger::Internal::CdbDumperHelper</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+203"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+209"/>
<source>injection</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">injection</translation>
</message>
<message>
<location line="+1"/>
<source>debugger call</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">appel au débogueur</translation>
</message>
<message>
<location line="+5"/>
@@ -3332,32 +3397,32 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+62"/>
+ <source>Stopped / Custom dumper library initialized.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+77"/>
<source>Disabling dumpers due to debuggee crash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+112"/>
+ <location line="-43"/>
<source>The debuggee does not appear to be Qt application.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+10"/>
<source>Initializing dumpers...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Custom dumper library initialized.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="-39"/>
<source>The custom dumper library could not be initialized: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+251"/>
+ <location line="+411"/>
<source>Querying dumpers for '%1'/'%2' (%3)</source>
<translation type="unfinished"></translation>
</message>
@@ -3367,28 +3432,30 @@ Voulez vous les écraser?</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>
+ <translatorcomment>Noun or verb?</translatorcomment>
+ <translation type="unfinished">Autodétecter</translation>
</message>
<message>
<location line="+35"/>
<source>"Debugging Tools for Windows" could not be found.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">"L'outil de débogage pour Windows" ne peut pas être trouvé.</translation>
</message>
<message>
<location line="+1"/>
<source>Checked:
%1</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Coché :
+%1</translation>
</message>
<message>
<location line="+1"/>
<source>Autodetection</source>
- <translation type="unfinished"></translation>
+ <translation>Autodétection</translation>
</message>
</context>
<context>
@@ -3396,79 +3463,82 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp" line="+42"/>
<source>Symbol Server...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Serveur de symbole...</translation>
</message>
<message>
<location line="+1"/>
<source>Adds the Microsoft symbol server providing symbols for operating system libraries.Requires specifying a local cache directory.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ajoute le serveur de symboles Microsoft pour fournir les symboles de la bilbiothèque du système d'exploitation. Exige de spécifier un répertoire local de cache.</translation>
</message>
<message>
<location line="+6"/>
<source>Pick a local cache directory</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Sélectionner un répertoire local de cache</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebugMode</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+195"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+196"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Déboguer</translation>
</message>
</context>
<context>
<name>Debugger::DebuggerManager</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+456"/>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+451"/>
<source>Continue</source>
- <translation type="unfinished"></translation>
+ <translation>Continue</translation>
</message>
<message>
<location line="+3"/>
- <location line="+1198"/>
+ <location line="+1207"/>
<source>Interrupt</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Interrompre</translation>
</message>
<message>
- <location line="-1195"/>
+ <location line="-1204"/>
<source>Reset Debugger</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Réinitialiser le débogueur</translation>
</message>
<message>
<location line="+2"/>
<source>Step Over</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Pas sur???</translatorcomment>
+ <translation type="unfinished">Aller au dela</translation>
</message>
<message>
<location line="+3"/>
<source>Step Into</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Pas sur???</translatorcomment>
+ <translation type="unfinished">Aller dans</translation>
</message>
<message>
<location line="+3"/>
<source>Step Out</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Pas sur ???</translatorcomment>
+ <translation type="unfinished">Sortir de</translation>
</message>
<message>
<location line="+3"/>
<source>Run to Line</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Exécuter jusqu'à la ligne</translation>
</message>
<message>
<location line="+2"/>
<source>Run to Outermost Function</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Exécuter jusqu'à la fonction la plus éloigné</translation>
</message>
<message>
<location line="+2"/>
<source>Jump to Line</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Aller jusqu'Ã la ligne</translation>
</message>
<message>
<location line="+2"/>
<source>Toggle Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Basculer le point d'arrêt</translation>
</message>
<message>
<location line="+2"/>
@@ -3481,95 +3551,110 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+223"/>
+ <location line="+235"/>
<source>Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Arrêté.</translation>
</message>
<message>
<location line="+6"/>
<source>Running...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">En cours d'éxecution...</translation>
</message>
<message>
<location line="+6"/>
<source>Exited.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Sorti.</translation>
</message>
<message>
<location line="+77"/>
<location line="+21"/>
<source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>fully ?</translatorcomment>
+ <translation type="unfinished">Changer l'état d'un point d'arrêt nécessite soir une application en cours d'éxecution soi une application totalement arrêté.</translation>
</message>
<message>
<location line="+30"/>
<source>The application requires the debugger engine '%1', which is disabled.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>On traduit engine ou pas ?</translatorcomment>
+ <translation type="unfinished">L'application nécessite le débogueur '%1' qui est desactivé.</translation>
</message>
<message>
- <location line="+83"/>
<source>Debugging VS executables is currently not enabled.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>On traduit VS ?</translatorcomment>
+ <translation type="obsolete">Le débogage contre l'exécutable n'est actuellement pas activé.</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+123"/>
<source>Starting debugger for tool chain '%1'...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Lancer le débogueur pour la chaîne d'outils '%1'...</translation>
</message>
<message>
<location line="+22"/>
<source>Warning</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Alerte?</translatorcomment>
+ <translation type="unfinished">Avertissement</translation>
</message>
<message>
<location line="-2"/>
<source>Cannot debug '%1' (tool chain: '%2'): %3</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Impossible de déboguer '%1' (chaîne d'outils : '%2') : %3</translation>
</message>
<message>
- <location line="+175"/>
+ <location line="+178"/>
<source>Save Debugger Log</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Sauvegarderle log du débogueur</translation>
</message>
<message>
- <location line="+486"/>
- <source>Stop Debugger</source>
- <translation type="unfinished"></translation>
+ <source>Turn helper usage off</source>
+ <translation type="obsolete">Arrêter l'utilisation de l'assistant</translation>
</message>
<message>
- <location line="-180"/>
- <source>Open Qt preferences</source>
- <translation type="unfinished"></translation>
+ <source>The debugger did not find the debugging helper library.</source>
+ <translation type="obsolete">Le débogueur n'a pas trouvé la bibliothèqe de l'assistant au déboguage.</translation>
</message>
<message>
- <location line="-9"/>
- <source>%1 (explicitly set in the Debugger Options)</source>
- <translation type="unfinished"></translation>
+ <source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper.</source>
+ <translation type="obsolete">L'assistant au déboguage est utilisé pour bien formater la valeur des types de données Qt et des bibliothèques standards.Il doit être compilé pour chaque version de Qt ce qui peut être fait dans les préférences de Qt en sélectionnant une installation de Qt et en cliquant sur 'Reconstruire' pour l'assistant de déboguage.</translation>
</message>
<message>
- <location line="+11"/>
- <source>Turn helper usage off</source>
+ <location line="+312"/>
+ <source>Turn off helper usage</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Continue anyway</source>
+ <location line="+6"/>
+ <source>The debugger could not load the debugging helper library.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Debugging helper missing</source>
+ <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>
</message>
<message>
- <location line="+1"/>
- <source>The debugger did not find the debugging helper library.</source>
- <translation type="unfinished"></translation>
+ <location line="+164"/>
+ <source>Stop Debugger</source>
+ <translation type="unfinished">Arrêté le déboguer</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 Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper.</source>
- <translation type="unfinished"></translation>
+ <location line="-173"/>
+ <source>Open Qt preferences</source>
+ <translation type="unfinished">Ouvrir les préférences Qt</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>%1 (explicitly set in the Debugger Options)</source>
+ <translation type="unfinished">%1 (définie explicitement dans les options du débogueur)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Continue anyway</source>
+ <translation type="unfinished">Continuer malgré tout</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Debugging helper missing</source>
+ <translation type="unfinished">Assistant au déboguage manquant</translation>
</message>
</context>
<context>
@@ -3577,125 +3662,148 @@ Voulez vous les écraser?</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+296"/>
<source>Debugger</source>
- <translation type="unfinished">Débogueur</translation>
+ <translation>Débogueur</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebuggerListener</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+36"/>
+ <source>Close Debugging Session</source>
+ <translation type="unfinished"></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>
+ </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>
</message>
</context>
<context>
<name>Debugger::Internal::DebuggerPlugin</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+265"/>
+ <location line="+269"/>
<source>Option '%1' is missing the parameter.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Option '%1' le paramètre est manquant.</translation>
</message>
<message>
<location line="+5"/>
<source>The parameter '%1' of option '%2' is not a number.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Le paramètre '%1' de l'option '%2' n'est pas un nombre.</translation>
</message>
<message>
<location line="+54"/>
<source>Invalid debugger option: %1</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Option du débogueur invalide : %1</translation>
</message>
<message>
<location line="+22"/>
<source>Error evaluating command line arguments: %1</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Erreur durant l'évaluation des arguments de la ligne de commande : %1</translation>
</message>
<message>
<location line="+41"/>
<source>Start and Debug External Application...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Démarrer et déboguer une application externe...</translation>
</message>
<message>
<location line="+5"/>
<source>Attach to Running External Application...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Attacher à l'application externe en cours d'éxecution...</translation>
</message>
<message>
<location line="+5"/>
<source>Attach to Core...</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>idem, core?</translatorcomment>
+ <translation type="unfinished">Attacher au core...</translation>
</message>
<message>
<location line="+5"/>
<source>Start and Attach to Remote Application...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Démarrer et attacher sur une application à distance...</translation>
</message>
<message>
<location line="+6"/>
<source>Detach Debugger</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Détacher le débogueur</translation>
</message>
<message>
<location line="+41"/>
<source>Stop Debugger/Interrupt Debugger</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Arrêter le débogueur/Interrompre le débogueur</translation>
</message>
<message>
<location line="+7"/>
<source>Reset Debugger</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Remise à zéro du débogueur</translation>
</message>
<message>
<location line="+75"/>
<source>&Views</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">&Vues</translation>
</message>
<message>
<location line="+3"/>
<source>Locked</source>
- <translation type="unfinished"></translation>
+ <translation>Verrouillé</translation>
</message>
<message>
<location line="+15"/>
<source>Reset to default layout</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Restaurer la disposition par défaut</translation>
</message>
<message>
<location line="+79"/>
<source>Threads:</source>
- <translation type="unfinished"></translation>
+ <translation>Threads :</translation>
</message>
<message>
<location line="+84"/>
<source>Attaching to PID %1.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Attachement ?</translatorcomment>
+ <translation type="unfinished">Attachement au PID %1.</translation>
</message>
<message>
<location line="+75"/>
<source>Remove Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Supprimer le point d'arrêt</translation>
</message>
<message>
<location line="+8"/>
<source>Disable Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Désactiver le point d'arrêt</translation>
</message>
<message>
<location line="+2"/>
<source>Enable Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Activer le point d'arrêt</translation>
</message>
<message>
<location line="+7"/>
<source>Set Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Définir un point d'arrêt</translation>
</message>
<message>
<location line="+229"/>
<source>Warning</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Alerte?</translatorcomment>
+ <translation type="unfinished">Avertissement</translation>
</message>
<message>
<location line="+0"/>
<source>Cannot attach to PID 0</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>de s'attacher ? Pas sur</translatorcomment>
+ <translation type="unfinished">Impossible de s'attacher au PID 0</translation>
</message>
<message>
<location line="+17"/>
<source>Attaching to core %1.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>core, toujours?</translatorcomment>
+ <translation type="unfinished">Attachement au core %1.</translation>
</message>
</context>
<context>
@@ -3708,12 +3816,12 @@ Voulez vous les écraser?</translation>
<message>
<location line="+6"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="+4"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Toujours ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="+5"/>
@@ -3723,7 +3831,7 @@ Voulez vous les écraser?</translation>
<message>
<location line="+7"/>
<source>Show a message box when receiving a signal</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Afficher un message à la réception d'un signal</translation>
</message>
<message>
<location line="+8"/>
@@ -3777,13 +3885,18 @@ Voulez vous les écraser?</translation>
</message>
<message>
<location line="+8"/>
+ <source>Use code model</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
<source>Recheck debugging helper availability</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<source>Synchronize breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Synchroniser les points d'arrêt</translation>
</message>
<message>
<location line="+30"/>
@@ -3869,7 +3982,7 @@ Voulez vous les écraser?</translation>
<context>
<name>Debugger::Internal::DebuggingHelperOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-909"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-912"/>
<source>Debugging Helper</source>
<translation type="unfinished"></translation>
</message>
@@ -3879,7 +3992,7 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>Ctrl+Shift+F11</source>
<translation type="unfinished"></translation>
</message>
@@ -3887,7 +4000,7 @@ Voulez vous les écraser?</translation>
<context>
<name>Debugger::Internal::GdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+304"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+293"/>
<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>
@@ -3912,27 +4025,22 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1016"/>
- <source>Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-899"/>
+ <location line="+117"/>
<source>Library %1 loaded.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Library %1 unloaded.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Thread group %1 created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Thread %1 created.</source>
<translation type="unfinished"></translation>
</message>
@@ -3952,65 +4060,53 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+46"/>
<source>Reading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+219"/>
+ <location line="+218"/>
<source>Stopping temporarily.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+122"/>
- <source>Continuing after temporary stop.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+75"/>
+ <location line="+198"/>
<source>Jumped. Stopped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+223"/>
- <source>Run to Function finished. Stopped.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-99"/>
+ <location line="+107"/>
<source>Processing queued commands.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+54"/>
<source>Loading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+100"/>
+ <location line="+76"/>
<source>Stopped at breakpoint.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-123"/>
- <location line="+168"/>
- <location line="+20"/>
- <location line="+104"/>
+ <location line="+25"/>
+ <location line="+110"/>
<source>Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Arrêté.</translation>
</message>
<message>
- <location line="-1008"/>
+ <location line="-980"/>
<source>An unknown error in the Gdb process occurred. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+221"/>
+ <location line="+231"/>
<source>Running...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">En cours d'éxecution...</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+91"/>
<source>Stop requested...</source>
<translation type="unfinished"></translation>
</message>
@@ -4031,12 +4127,7 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+151"/>
- <source>Function reached. Stopped.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+72"/>
+ <location line="+217"/>
<source>Program exited with exit code %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -4051,7 +4142,7 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+168"/>
+ <location line="+155"/>
<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>
@@ -4072,7 +4163,7 @@ Voulez vous les écraser?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+61"/>
<source>The debugger you are using identifies itself as:</source>
<translation type="unfinished"></translation>
</message>
@@ -4084,23 +4175,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+29"/>
- <source>Starting executable failed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+23"/>
- <source>Starting executable failed:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+129"/>
+ <location line="+265"/>
<source>Running requested...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
<source>Step requested...</source>
<translation type="unfinished"></translation>
</message>
@@ -4120,7 +4200,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+18"/>
<source>Step next instruction requested...</source>
<translation type="unfinished"></translation>
</message>
@@ -4130,12 +4210,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+13"/>
<source>Run to function %1 requested...</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+692"/>
+ <source>Jumping out of bogus frame...</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
- <location line="+1445"/>
+ <location line="+770"/>
<source>Dumper version %1, %n custom dumpers found.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -4143,64 +4228,79 @@ Using gdb 6.7 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location line="+667"/>
- <source>The dumper library was not found at %1.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+265"/>
+ <location line="+994"/>
<location line="+25"/>
<location line="+14"/>
<source>Disassembler failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+173"/>
<source>Adapter start failed</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+24"/>
+ <source>Setting breakpoints...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Starting inferior...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-494"/>
+ <source>The debugging helper library was not found at %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+335"/>
+ <source>Unable to start gdb '%1': %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
+ <source>Gdb I/O Error</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+14"/>
- <source>Inferior start preparation failed</source>
+ <source>Unexpected Gdb Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <source>Inferior prepared for startup.</source>
+ <location line="+1"/>
+ <source>The gdb process exited unexpectedly (%1).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+85"/>
- <source>Setting breakpoints...</source>
+ <location line="+2"/>
+ <source>crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Starting inferior...</source>
+ <location line="+0"/>
+ <source>code %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+55"/>
<source>Inferior start failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="-2922"/>
<source>Inferior shutdown failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+2942"/>
<source>Adapter crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>Adapter shutdown failed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-68"/>
+ <location line="-116"/>
<source>Cannot find debugger initialization script</source>
<translation type="unfinished"></translation>
</message>
@@ -4210,30 +4310,40 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2032"/>
+ <location line="-2124"/>
<source>Unable to run '%1': %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+61"/>
+ <location line="-792"/>
+ <source>Execution Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot continue debugged process:
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <source>Continuing after temporary stop...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+653"/>
<source><unknown></source>
<extracomment>End address of loaded module</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+37"/>
<location line="+8"/>
<source>Retrieving data for stack view...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+402"/>
- <source><not in scope></source>
- <extracomment>Variable</extracomment>
- <translation type="unfinished"></translation>
- </message>
<message numerus="yes">
- <location line="+109"/>
+ <location line="+495"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -4241,7 +4351,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+324"/>
<source>Finished retrieving data.</source>
<translation type="unfinished"></translation>
</message>
@@ -4256,7 +4366,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+149"/>
+ <location line="+128"/>
<source><0 items></source>
<translation type="unfinished"></translation>
</message>
@@ -4270,19 +4380,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location line="+134"/>
- <source>%1 <shadowed %2></source>
- <extracomment>Variable %1 is the variable name, %2 is a simple count</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+217"/>
<source><shadowed></source>
- <extracomment>Type of local variable or parameter shadowed by another</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+133"/>
<source><n/a></source>
<translation type="unfinished"></translation>
</message>
@@ -4297,26 +4400,6 @@ Using gdb 6.7 or later is strongly recommended.</source>
<extracomment>About variable's value</extracomment>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+16"/>
- <source>Unknown error: </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+63"/>
- <source>Dumper injection loading triggered (%1)...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Dumper loading (%1) failed: %2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Loading dumpers via debugger call (%1)...</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Debugger::Internal::GdbOptionsPage</name>
@@ -4374,12 +4457,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+29"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Toujours ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="-29"/>
@@ -4513,12 +4596,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+5"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Toujours ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="-32"/>
@@ -4552,7 +4635,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<location line="+81"/>
<location line="+50"/>
<source>Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Arrêté.</translation>
</message>
</context>
<context>
@@ -4594,7 +4677,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="+55"/>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+66"/>
<location line="+14"/>
<source>Address:</source>
<translation type="unfinished"></translation>
@@ -4630,7 +4713,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+57"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
@@ -4743,18 +4826,18 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+9"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="+3"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Toujours ajuster la largeur des colonnes au contenu</translation>
</message>
</context>
<context>
<name>Debugger::Internal::StartExternalDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="-203"/>
+ <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="-142"/>
<source>Select Executable</source>
<translation type="unfinished">Selectionner l'exécutable</translation>
</message>
@@ -4780,33 +4863,39 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::ThreadsWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+53"/>
+ <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+46"/>
<source>Thread</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+21"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
<location line="+1"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Toujours ajuster la largeur des colonnes au contenu</translation>
</message>
</context>
<context>
<name>Debugger::Internal::WatchData</name>
<message>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+70"/>
+ <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+71"/>
+ <location line="+250"/>
<source><not in scope></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>%1 <shadowed %2></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Debugger::Internal::WatchHandler</name>
<message>
- <location line="+224"/>
+ <location line="-27"/>
<source>Expression</source>
<translation type="unfinished"></translation>
</message>
@@ -4836,7 +4925,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+33"/>
<source>Root</source>
<translation type="unfinished"></translation>
</message>
@@ -4856,12 +4945,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1041"/>
+ <location line="+1069"/>
<source><Edit></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1075"/>
+ <location line="-1116"/>
<source>Internal ID</source>
<translation type="unfinished"></translation>
</message>
@@ -4874,7 +4963,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::WatchModel</name>
<message>
- <location line="+433"/>
+ <location line="+447"/>
<source>decimal</source>
<translation type="unfinished"></translation>
</message>
@@ -4894,7 +4983,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+86"/>
<source>Name</source>
<translation type="unfinished">Nom</translation>
</message>
@@ -4942,7 +5031,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Open memory editor...</source>
<translation type="unfinished"></translation>
</message>
@@ -4952,17 +5041,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
- <source>Adjust column widths to contents</source>
+ <location line="+17"/>
+ <source>Refresh code model snapshot</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+9"/>
+ <source>Adjust column widths to contents</source>
+ <translation type="unfinished">Ajuster la largeur des colonnes au contenu</translation>
+ </message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Toujours ajuster la largeur des colonnes au contenu</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-38"/>
<source>Insert new watch item</source>
<translation type="unfinished"></translation>
</message>
@@ -4972,12 +5066,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="-140"/>
<source>Clear contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Effacer le contenu</translation>
</message>
<message>
<location line="+6"/>
<source>Save contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Sauver le contenu</translation>
</message>
</context>
<context>
@@ -5017,18 +5111,28 @@ Using gdb 6.7 or later is strongly recommended.</source>
<source>Debug debugging helper</source>
<translation type="unfinished"></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>
+ </message>
+ <message>
+ <location/>
+ <source>Use code model</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>DependenciesModel</name>
<message>
<location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+121"/>
<source>Unable to add dependency</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Impossible d'ouvrir les dépendances</translation>
</message>
<message>
<location line="+1"/>
<source>This would create a circular dependency.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ceci créerais une dépendance circulaire.</translation>
</message>
</context>
<context>
@@ -5054,17 +5158,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/shared/qrceditor/resourcefile.cpp" line="+54"/>
<source>The file name is empty.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Le nom de fichier est vide.</translation>
</message>
<message>
<location line="+54"/>
<source>XML error on line %1, col %2: %3</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Erreur XML Ã la ligne %1, col %2: %3</translation>
</message>
<message>
<location line="+7"/>
<source>The <RCC> root element is missing.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">L'élement racine <RCC> est manquant.</translation>
</message>
<message>
<location filename="../../../src/plugins/designer/designerconstants.h" line="+38"/>
@@ -5255,7 +5359,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+10"/>
<source>Locked</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Verrouillé</translation>
</message>
<message>
<location line="+7"/>
@@ -5627,7 +5731,7 @@ Reason: %3</source>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+940"/>
+ <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+944"/>
<source>Not implemented in FakeVim</source>
<translation type="unfinished"></translation>
</message>
@@ -5647,7 +5751,7 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1023"/>
+ <location line="+1025"/>
<source>File '%1' exists (add ! to override)</source>
<translation type="unfinished"></translation>
</message>
@@ -5713,7 +5817,7 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>Already at newest change</source>
<translation type="unfinished"></translation>
</message>
@@ -6058,7 +6162,7 @@ Reason: %3</source>
</message>
<message>
<location line="+4"/>
- <source>Replace all occurances</source>
+ <source>Replace all occurrences</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -6158,7 +6262,7 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+93"/>
<source><new></source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished"><nouveau></translation>
</message>
</context>
<context>
@@ -6166,17 +6270,17 @@ Reason: %3</source>
<message>
<location line="+38"/>
<source>Create</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Créer</translation>
</message>
<message>
<location line="+10"/>
<source>New configuration</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nouvelle configuration</translation>
</message>
<message>
<location line="+1"/>
<source>New Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nom de la nouvelle configuration :</translation>
</message>
</context>
<context>
@@ -6200,14 +6304,14 @@ Reason: %3</source>
<context>
<name>GenericProjectManager::Internal::GenericMakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+189"/>
+ <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+190"/>
<source>Override %1:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+32"/>
<source><b>Make:</b> %1 %2</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished"><b>Make : </b>%1 %2</translation>
</message>
</context>
<context>
@@ -6532,12 +6636,12 @@ Reason: %3</source>
<translation type="unfinished">Faire un diff de "%1"</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>Alt+G,Alt+D</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>File Status</source>
<translation type="unfinished"></translation>
</message>
@@ -6547,12 +6651,12 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+G,Alt+S</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Log File</source>
<translation type="unfinished"></translation>
</message>
@@ -6562,12 +6666,12 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+G,Alt+L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Blame</source>
<translation type="unfinished"></translation>
</message>
@@ -6577,12 +6681,12 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+G,Alt+B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Undo Changes</source>
<translation type="unfinished"></translation>
</message>
@@ -6592,12 +6696,12 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+G,Alt+U</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Stage File for Commit</source>
<translation type="unfinished"></translation>
</message>
@@ -6607,12 +6711,12 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+G,Alt+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Unstage File from Commit</source>
<translation type="unfinished"></translation>
</message>
@@ -6632,7 +6736,7 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+7"/>
<source>Project Status</source>
<translation type="unfinished">Status du projet</translation>
</message>
@@ -6652,12 +6756,12 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+G,Alt+K</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Undo Project Changes</source>
<translation type="unfinished"></translation>
</message>
@@ -6692,12 +6796,12 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+G,Alt+C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Push</source>
<translation type="unfinished"></translation>
</message>
@@ -6991,7 +7095,7 @@ Reason: %3</source>
<location line="+120"/>
<location line="+2"/>
<source>unknown</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">inconnue</translation>
</message>
<message>
<location line="+87"/>
@@ -7398,7 +7502,7 @@ Reason: %3</source>
<message>
<location line="+7"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Déboguer</translation>
</message>
<message>
<location line="+105"/>
@@ -7578,12 +7682,12 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>Alt+P,Alt+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Edit File</source>
<translation type="unfinished"></translation>
</message>
@@ -7598,12 +7702,12 @@ in your .pro file.</source>
<translation type="unfinished">Ajouter "%1"</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>Alt+P,Alt+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Add File</source>
<translation type="unfinished"></translation>
</message>
@@ -7633,12 +7737,12 @@ in your .pro file.</source>
<translation type="unfinished">Rétablir "%1"</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>Alt+P,Alt+R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Revert File</source>
<translation type="unfinished"></translation>
</message>
@@ -7664,12 +7768,12 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>Alt+P,Alt+D</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Diff Opened Files</source>
<translation type="unfinished"></translation>
</message>
@@ -7679,12 +7783,12 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Alt+P,Alt+O</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Submit Project</source>
<translation type="unfinished"></translation>
</message>
@@ -7731,22 +7835,22 @@ in your .pro file.</source>
</message>
<message>
<location line="+5"/>
- <location line="+6"/>
+ <location line="+4"/>
<source>Filelog Current File</source>
<translation type="unfinished">Journal du fichier courant</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-4"/>
<source>Filelog "%1"</source>
<translation type="unfinished">Journal du fichier "%1"</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>Alt+P,Alt+F</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Filelog...</source>
<translation type="unfinished"></translation>
</message>
@@ -8057,17 +8161,17 @@ in your .pro file.</source>
<location filename="../../../src/libs/extensionsystem/optionsparser.cpp" line="+106"/>
<location line="+18"/>
<source>The plugin '%1' does not exist.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">L'extension '%1' n'existe pas.</translation>
</message>
<message>
<location line="+45"/>
<source>Unknown option %1</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Option '%1' non reconnue</translation>
</message>
<message>
<location line="+12"/>
<source>The option %1 requires an argument.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">L'option %1 requiert un argument.</translation>
</message>
</context>
<context>
@@ -8075,77 +8179,77 @@ in your .pro file.</source>
<message>
<location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+22"/>
<source>'%1' misses attribute '%2'</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">L'attribute '%1' est manquant pour '%2'</translation>
</message>
<message>
<location line="+5"/>
<source>'%1' has invalid format</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">'%1' a un format invalide</translation>
</message>
<message>
<location line="+5"/>
<source>Invalid element '%1'</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Élément invalide '%1'</translation>
</message>
<message>
<location line="+5"/>
<source>Unexpected closing element '%1'</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Élement fermant inattendu '%1'</translation>
</message>
<message>
<location line="+5"/>
<source>Unexpected token</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Lexème inatendu</translation>
</message>
<message>
<location line="+11"/>
<source>Expected element '%1' as top level element</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">L'élément '%1' devrait être l'élément racine</translation>
</message>
<message>
<location line="+234"/>
<source>Resolving dependencies failed because state != Read</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">La résolution des dépendances a échoué car l'état courant est différent de "Lecture"</translation>
</message>
<message>
<location line="+17"/>
<source>Could not resolve dependency '%1(%2)'</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Impossible de résoudre la dépendance '%1(%2)'</translation>
</message>
<message>
<location line="+24"/>
<source>Loading the library failed because state != Resolved</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Le chargement de la bibliothèque a échoué car l'état courant est différent de "Résolu"</translation>
</message>
<message>
<location line="+35"/>
<source>Plugin is not valid (does not derive from IPlugin)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">L'extension n'est pas valide (elle n'est pas une sous-classe de IPlugin)</translation>
</message>
<message>
<location line="+21"/>
<source>Initializing the plugin failed because state != Loaded</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">L'initialisation de l'extension a échoué car l'état courant est différent de "chargé"</translation>
</message>
<message>
<location line="+5"/>
<source>Internal error: have no plugin instance to initialize</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Erreur interne : pas d'instance de l'extension à initialiser</translation>
</message>
<message>
<location line="+6"/>
<source>Plugin initialization failed: %1</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">L'initialisation de l'extension a échoué: %1</translation>
</message>
<message>
<location line="+19"/>
<source>Cannot perform extensionsInitialized because state != Initialized</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Impossible d'exécuter extensionsInitialized car l'état est différent de "Initialisé"</translation>
</message>
<message>
<location line="+5"/>
<source>Internal error: have no plugin instance to perform extensionsInitialized</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Erreur interne: aucune instance de l'extention sur laquelle exécuter extensionsInitialized</translation>
</message>
</context>
<context>
@@ -8343,7 +8447,7 @@ in your .pro file.</source>
<context>
<name>ProjectExplorer::Internal::BuildSettingsWidget</name>
<message>
- <location line="+116"/>
+ <location line="+118"/>
<source>&Clone Selected</source>
<translation type="unfinished"></translation>
</message>
@@ -8375,7 +8479,7 @@ in your .pro file.</source>
<message>
<location line="+69"/>
<source>New Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nom de la nouvelle configuration :</translation>
</message>
<message>
<location line="+0"/>
@@ -9380,7 +9484,7 @@ to version control (%2)?</source>
<message>
<location line="+9"/>
<source>Warning</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Avertissement</translation>
</message>
<message>
<location line="+1"/>
@@ -9462,7 +9566,7 @@ to version control (%2)?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+69"/>
<source>The project %1 could not be opened.</source>
<translation type="unfinished"></translation>
</message>
@@ -9470,7 +9574,7 @@ to version control (%2)?</source>
<context>
<name>QmlProjectManager::Internal::QmlNewProjectWizardDialog</name>
<message>
- <location line="-136"/>
+ <location line="-135"/>
<source>New QML Project</source>
<translation type="unfinished"></translation>
</message>
@@ -9530,19 +9634,19 @@ to version control (%2)?</source>
<name>QmlProjectManager::Internal::QmlRunConfiguration</name>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+339"/>
- <location line="+101"/>
+ <location line="+106"/>
<source>QML Viewer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-31"/>
<location line="+40"/>
- <location line="+49"/>
+ <location line="+60"/>
<source><Current File></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-68"/>
<source>QML Viewer arguments:</source>
<translation type="unfinished"></translation>
</message>
@@ -9873,8 +9977,9 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+202"/>
- <source>Import existing settings</source>
+ <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+51"/>
+ <location line="+125"/>
+ <source>Import existing build settings</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -9898,7 +10003,7 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+51"/>
<source>Clear system environment</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nettoyer l'environnement système</translation>
</message>
<message>
<location line="+14"/>
@@ -10073,7 +10178,17 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
<message>
- <location line="-424"/>
+ <location line="-334"/>
+ <source>Running executable: <b>%1</b> %2 (in terminal)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Running executable: <b>%1</b> %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-91"/>
<source>Arguments:</source>
<translation type="unfinished"></translation>
</message>
@@ -10103,17 +10218,7 @@ to version control (%2)?</source>
<translation type="unfinished">Environnement de compilation</translation>
</message>
<message>
- <location line="+54"/>
- <source>Running executable: <b>%1</b> %2 %3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>(in terminal)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-114"/>
+ <location line="-57"/>
<source>Name:</source>
<translation type="unfinished"></translation>
</message>
@@ -10151,7 +10256,7 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Internal::QtOptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+109"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+111"/>
<source><specify a name></source>
<translation type="unfinished"></translation>
</message>
@@ -10172,11 +10277,16 @@ to version control (%2)?</source>
</message>
<message>
<location line="+2"/>
- <source>Select "x86build" Directory from Carbide Install</source>
+ <source>Select Carbide Install Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
+ <source>Select S60 SDK Root</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Auto-detected</source>
<translation type="unfinished"></translation>
</message>
@@ -10186,7 +10296,7 @@ to version control (%2)?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+120"/>
+ <location line="+142"/>
<source>Building helpers</source>
<translation type="unfinished"></translation>
</message>
@@ -10197,7 +10307,7 @@ to version control (%2)?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+120"/>
<source>The Qt Version identified by %1 is not installed. Run make install</source>
<translation type="unfinished"></translation>
</message>
@@ -10295,7 +10405,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <source>MWC Directory:</source>
+ <source>S60 SDK:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Carbide Directory:</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -10413,7 +10528,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source><font color="#0000ff"><b>No Makefile found, assuming project is clean.</b></font></source>
<translation type="unfinished"></translation>
</message>
@@ -10529,7 +10644,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+326"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+332"/>
<source><not found></source>
<translation type="unfinished"></translation>
</message>
@@ -10539,6 +10654,54 @@ p, li { white-space: pre-wrap; }
<source>Qt in PATH</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+147"/>
+ <source>Name:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Source:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>mkspec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>qmake:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Default:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Compiler:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Version:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Debugging helper:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>QApplication</name>
+ <message>
+ <location line="+862"/>
+ <source>The Qt Version has no toolchain.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtModulesInfo</name>
@@ -10721,7 +10884,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+1"/>
<source>Qt Script file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier de script Qt</translation>
</message>
<message>
<location line="+2"/>
@@ -10947,39 +11110,32 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>Locator::Internal::SettingsDialog</name>
<message>
- <location filename="../../../src/plugins/locator/settingswidget.ui"/>
<source>Configure Filters</source>
- <translation type="unfinished">Configurer les filtres</translation>
+ <translation type="obsolete">Configurer les filtres</translation>
</message>
<message>
- <location/>
<source>Add</source>
- <translation type="unfinished">Ajouter</translation>
+ <translation type="obsolete">Ajouter</translation>
</message>
<message>
- <location/>
<source>Remove</source>
- <translation type="unfinished">Supprimer</translation>
+ <translation type="obsolete">Supprimer</translation>
</message>
<message>
- <location/>
<source>Edit...</source>
- <translation type="unfinished">Modifier...</translation>
+ <translation type="obsolete">Modifier...</translation>
</message>
<message>
- <location/>
<source>Refresh Interval:</source>
- <translation type="unfinished">Intervalle de raffraichissement:</translation>
+ <translation type="obsolete">Intervalle de raffraichissement:</translation>
</message>
<message>
- <location/>
<source> min</source>
- <translation type="unfinished">min</translation>
+ <translation type="obsolete">min</translation>
</message>
<message>
- <location/>
<source>Refresh now!</source>
- <translation type="unfinished">Raffraîchir maintenant!</translation>
+ <translation type="obsolete">Raffraîchir maintenant!</translation>
</message>
</context>
<context>
@@ -11538,12 +11694,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation type="unfinished">Ajouter "%1"</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Alt+S,Alt+A</source>
<translation type="unfinished">Alt+S,Alt+A</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Delete</source>
<translation type="unfinished">Supprimer</translation>
</message>
@@ -11578,12 +11734,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation type="unfinished">Faire un diff de "%1"</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Alt+S,Alt+D</source>
<translation type="unfinished">Alt+S,Alt+D</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Commit All Files</source>
<translation type="unfinished">Faire un commit de tous les fichiers</translation>
</message>
@@ -11598,12 +11754,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<translation type="unfinished">Faire un commit de "%1"</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Alt+S,Alt+C</source>
<translation type="unfinished">Alt+S,Alt+C</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Filelog Current File</source>
<translation type="unfinished">Journal du fichier courant</translation>
</message>
@@ -11695,7 +11851,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location line="+8"/>
<source>Cannot create temporary file: %1</source>
- <translation type="unfinished">Impossible de créer le fichier temporaire : %1</translation>
+ <translation type="unfinished">Impossible de créer le fichier temporaire : %1</translation>
</message>
<message>
<location line="+186"/>
@@ -11705,7 +11861,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location line="+1"/>
<source>Revision number:</source>
- <translation type="unfinished">Numéro de révision :</translation>
+ <translation type="unfinished">Numéro de révision :</translation>
</message>
<message>
<location line="+47"/>
@@ -11810,7 +11966,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="+4283"/>
+ <location line="+4275"/>
<source>Line: %1, Col: %2</source>
<translation>Ligne : %1, Col : %2</translation>
</message>
@@ -11994,7 +12150,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>TextEditor::FontSettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+312"/>
+ <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+314"/>
<source>Font & Colors</source>
<translation>Polices & couleurs</translation>
</message>
@@ -12262,27 +12418,27 @@ The following encodings are likely to fit:</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location line="+4"/>
- <source>&Rewrap Paragraph</source>
+ <location line="+5"/>
+ <source>Meta</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Ctrl+E, R</source>
+ <location line="+2"/>
+ <source>Ctrl</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>&Visualize Whitespace</source>
- <translation></translation>
+ <location line="+3"/>
+ <source>&Rewrap Paragraph</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Ctrl+E, Ctrl+V</source>
+ <location line="+7"/>
+ <source>&Visualize Whitespace</source>
<translation></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+8"/>
<source>Clean Whitespace</source>
<translation>Nettoyer les espaces</translation>
</message>
@@ -12292,12 +12448,26 @@ The following encodings are likely to fit:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
<source>Ctrl+E, Ctrl+W</source>
- <translation type="unfinished">Ctrl+E, Ctrl+W</translation>
+ <translation type="obsolete">Ctrl+E, Ctrl+W</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-20"/>
+ <source>%1+E, R</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>%1+E, %2+V</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>%1+E, %2+W</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
<source>(Un)Comment &Selection</source>
<translation type="unfinished">(Dé)Commenter la &Sélection</translation>
</message>
@@ -12964,7 +13134,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Protocol:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Protocole :</translation>
</message>
<message>
<location/>
@@ -12978,7 +13148,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Parts to send to server</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
@@ -13087,11 +13257,6 @@ p, li { white-space: pre-wrap; }
<source>Symbian ARM gdb location:</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location/>
- <source>Cygwin location:</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location/>
<source>Communication</source>
@@ -13454,10 +13619,15 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Reprendre la session</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>%1 (last session)</source>
<translation type="unfinished">%1 (dernière session)</translation>
</message>
+ <message>
+ <location line="+3"/>
+ <source>%1 (current session)</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+45"/>
<source>New Project...</source>
@@ -13694,7 +13864,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Ouvrir</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+56"/>
+ <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+62"/>
<source>Tutorials</source>
<translation type="unfinished">Tutoriels</translation>
</message>
@@ -13739,7 +13909,42 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Choisir un exemple...</translation>
</message>
<message>
- <location line="+103"/>
+ <location line="+81"/>
+ <source>Copy Project to writable Location?</source>
+ <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"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&Location:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&Copy Project and Open</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&Keep Project and Open</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Warning</source>
+ <translation type="unfinished">Avertissement</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The specified location already exists. Please specify a valid location.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+61"/>
<location line="+7"/>
<source>Cmd</source>
<comment>Shortcut key</comment>
@@ -13868,7 +14073,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+91"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+96"/>
<source>S60 SDKs</source>
<translation type="unfinished"></translation>
</message>
@@ -13932,7 +14137,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+46"/>
+ <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+47"/>
<source>News From the Qt Labs</source>
<translation type="unfinished">Actualité de Qt Labs</translation>
</message>
@@ -13948,7 +14153,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Qt Home</source>
<translation type="unfinished">Qt Home</translation>
</message>
@@ -13969,8 +14174,17 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+1"/>
+ <source>Qt Apps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt for Symbian at Forum Nokia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Qt for S60 at Forum Nokia</source>
- <translation type="unfinished">Qt pour S60</translation>
+ <translation type="obsolete">Qt pour S60</translation>
</message>
</context>
<context>
@@ -14002,7 +14216,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Votre avis nous interesse</translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+115"/>
+ <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+116"/>
<source>Welcome</source>
<translation type="unfinished">Accueil</translation>
</message>
@@ -14054,7 +14268,17 @@ p, li { white-space: pre-wrap; }
<context>
<name>CodePaster::CodePasterProtocol</name>
<message>
- <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+129"/>
+ <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+70"/>
+ <source>No Server defined in the CodePaster preferences!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No Server defined in the CodePaster options!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>No such paste</source>
<translation type="unfinished"></translation>
</message>
@@ -14063,15 +14287,24 @@ p, li { white-space: pre-wrap; }
<name>CodePaster::CodePasterSettingsPage</name>
<message>
<location filename="../../../src/plugins/cpaster/codepastersettings.cpp" line="+59"/>
- <location line="+10"/>
<source>CodePaster</source>
<translation type="unfinished">CodePaster</translation>
</message>
+ <message>
+ <location line="+10"/>
+ <source>Code Pasting</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+6"/>
<source>Server:</source>
<translation type="unfinished"></translation>
</message>
+ <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>
+ </message>
</context>
<context>
<name>PasteBinDotComProtocol</name>
@@ -14090,8 +14323,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+10"/>
+ <source>Code Pasting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>CodePaster</source>
- <translation type="unfinished">CodePaster</translation>
+ <translation type="obsolete">CodePaster</translation>
</message>
</context>
<context>
@@ -14123,7 +14360,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>CppTools::Internal::CppFindReferences</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+606"/>
+ <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+238"/>
<source>Searching...</source>
<translation type="unfinished"></translation>
</message>
@@ -14185,12 +14422,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Ajouter "%1"</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Alt+C,Alt+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Delete</source>
<translation type="unfinished">Supprimer</translation>
</message>
@@ -14225,12 +14462,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Faire un diff de "%1"</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Alt+C,Alt+D</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Commit All Files</source>
<translation type="unfinished">Faire un commit de tous les fichiers</translation>
</message>
@@ -14245,12 +14482,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Faire un commit de "%1"</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>Alt+C,Alt+C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Filelog Current File</source>
<translation type="unfinished">Journal du fichier courant</translation>
</message>
@@ -14454,7 +14691,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>SymbolGroup</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+49"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+52"/>
<source>Out of scope</source>
<translation type="unfinished"></translation>
</message>
@@ -14470,99 +14707,76 @@ p, li { white-space: pre-wrap; }
<context>
<name>Debugger::Internal::DebuggerRunControlFactory</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+78"/>
+ <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+79"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Déboguer</translation>
</message>
</context>
<context>
- <name>Debugger::Internal::AttachGdbAdapter</name>
- <message>
- <location filename="../../../src/plugins/debugger/gdb/attachgdbadapter.cpp" line="+110"/>
- <source>Attached to stopped inferior.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+48"/>
- <source>Inferior process could not be stopped:
-</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>Debugger::Internal::DebuggerRunControl</name>
<message>
- <location line="+12"/>
- <source>Gdb process could not be stopped:
-</source>
- <translation type="unfinished"></translation>
+ <location line="+108"/>
+ <source>Debugger</source>
+ <translation type="unfinished">Débogueur</translation>
</message>
</context>
<context>
<name>Debugger::Internal::CoreGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+119"/>
- <source>Attached to core temporarily.</source>
+ <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+85"/>
+ <location line="+27"/>
+ <location line="+42"/>
+ <source>Error Loading Symbols</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>No binary found.</source>
+ <location line="-68"/>
+ <source>No executable to load symbols from specified.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+38"/>
- <source>Symbols found.</source>
+ <location line="+24"/>
+ <source>Loading symbols from "%1" failed:
+</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Symbols not found in "%1" failed:
-%2</source>
+ <location line="+36"/>
+ <source>Attached to core temporarily.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Attached to core.</source>
+ <location line="+9"/>
+ <source>Unable to determine executable from core file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Attach to core "%1" failed:
-%2</source>
+</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+38"/>
- <source>Gdb process could not be stopped:
-</source>
+ <location line="-54"/>
+ <source>Symbols found.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Attached to core.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Debugger::Internal::PlainGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+79"/>
+ <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+70"/>
<source>Cannot set up communication with child process: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+36"/>
<source>Starting executable failed:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Inferior started.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+84"/>
- <source>Inferior process could not be stopped:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Gdb process could not be stopped:
</source>
<translation type="unfinished"></translation>
</message>
@@ -14570,12 +14784,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>Debugger::Internal::RemoteGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+112"/>
- <source>The upload process failed to start. Either the invoked script '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
+ <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+93"/>
+ <source>The upload process failed to start. Shell missing?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+3"/>
<source>The upload process crashed some time after starting successfully.</source>
<translation type="unfinished"></translation>
</message>
@@ -14610,31 +14824,8 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+20"/>
<source>Starting remote executable failed:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Attached to stopped inferior.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Connecting to remote server failed:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+56"/>
- <source>Inferior process could not be stopped:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Gdb process could not be stopped:
</source>
<translation type="unfinished"></translation>
</message>
@@ -14642,46 +14833,21 @@ p, li { white-space: pre-wrap; }
<context>
<name>Debugger::Internal::TrkGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1687"/>
- <source>Connecting to trk server adapter failed:
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+18"/>
- <source>Inferior running.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Connecting to remote server failed:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+404"/>
- <source>Inferior process could not be stopped:
-</source>
+ <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1597"/>
+ <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="+13"/>
- <source>Gdb process could not be stopped:
+ <location line="+24"/>
+ <source>Connecting to trk server adapter failed:
</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>Debugger::Internal::TrkOptionsPage</name>
- <message>
- <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
- <source>S60 / Trk</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>NameDemanglerPrivate</name>
<message>
- <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+310"/>
+ <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+331"/>
<source>Premature end of input</source>
<translation type="unfinished"></translation>
</message>
@@ -14691,7 +14857,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Invalid name</source>
<translation type="unfinished"></translation>
</message>
@@ -14757,7 +14923,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+135"/>
<location line="+5"/>
- <location line="+67"/>
+ <location line="+68"/>
<source>Invalid type</source>
<translation type="unfinished"></translation>
</message>
@@ -14778,13 +14944,13 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+79"/>
- <location line="+320"/>
+ <location line="+80"/>
+ <location line="+328"/>
<source>Invalid unqualified-name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-232"/>
+ <location line="-237"/>
<source>Invalid operator-name '%s'</source>
<translation type="unfinished"></translation>
</message>
@@ -14795,19 +14961,19 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>Invalid pointer-to-member-type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+45"/>
+ <location line="+47"/>
<location line="+10"/>
- <location line="+35"/>
+ <location line="+36"/>
<source>Invalid substitution</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-41"/>
+ <location line="-42"/>
<source>Invalid substitution: element %1 was requested, but there are only %2</source>
<translation type="unfinished"></translation>
</message>
@@ -14817,14 +14983,14 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+101"/>
+ <location line="+103"/>
<source>Invalid special-name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+43"/>
<location line="+4"/>
- <location line="+11"/>
+ <location line="+13"/>
<source>Invalid local-name</source>
<translation type="unfinished"></translation>
</message>
@@ -14993,7 +15159,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>ProjectExplorer::ApplicationLauncher</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+123"/>
+ <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+126"/>
<source>Failed to start program. Path or permissions wrong?</source>
<translation type="unfinished"></translation>
</message>
@@ -15158,7 +15324,7 @@ Reason: %2</source>
<context>
<name>QmlEditor::Internal::QmlEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+103"/>
+ <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+106"/>
<source>Qt</source>
<translation type="unfinished">Qt</translation>
</message>
@@ -15258,40 +15424,50 @@ Reason: %2</source>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+77"/>
- <source>%1 on Device</source>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+83"/>
+ <source>QtS60DeviceRunConfiguration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>QtS60DeviceRunConfiguration</source>
+ <location line="+197"/>
+ <source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+185"/>
- <source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
+ <location line="-199"/>
+ <source>%1 on Symbian Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
<message>
- <location line="+67"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp" line="+73"/>
+ <source>Device:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
<source>Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+3"/>
<source>Install File:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>Device on Serial Port:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
+ <source>Queries the device for information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>Self-signed certificate</source>
<translation type="unfinished"></translation>
</message>
@@ -15315,19 +15491,50 @@ Reason: %2</source>
<source>Key file:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+125"/>
+ <source><No Device></source>
+ <extracomment>Summary text of S60 device run configuration</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>(custom certificate)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(self-signed certificate)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Summary: Run on '%1' %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+53"/>
+ <source>A timeout occurred while querying the device. Check whether Trk is running</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
<message>
- <location line="+116"/>
- <source>%1 on Device</source>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+286"/>
+ <source>%1 on Symbian Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunControlBase</name>
<message>
- <location line="+74"/>
+ <location line="+83"/>
<source>Creating %1.sisx ...</source>
<translation type="unfinished"></translation>
</message>
@@ -15337,35 +15544,40 @@ Reason: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <location line="+78"/>
+ <location line="+8"/>
+ <source>Debugger for Symbian Platform</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <location line="+76"/>
<source>%1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-41"/>
<source>Could not read template package file '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+9"/>
<source>Could not write package file '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+16"/>
<location line="+28"/>
<source>An error occurred while creating the package.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+24"/>
<source>Package: %1
Deploying application to '%2'...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+23"/>
<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="unfinished"></translation>
@@ -15387,6 +15599,11 @@ Check if the phone is connected and the TRK application is running.</source>
</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>
+ </message>
+ <message>
+ <location line="+5"/>
<source>Copying install file...</source>
<translation type="unfinished"></translation>
</message>
@@ -15424,7 +15641,7 @@ Check if the phone is connected and the TRK application is running.</source>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunControl</name>
<message>
- <location line="+30"/>
+ <location line="+37"/>
<source>Finished.</source>
<translation type="unfinished"></translation>
</message>
@@ -15447,7 +15664,7 @@ Check if the phone is connected and the TRK application is running.</source>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
- <location line="+50"/>
+ <location line="+51"/>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -15465,47 +15682,52 @@ Check if the phone is connected and the TRK application is running.</source>
<context>
<name>Qt4ProjectManager::Internal::S60DevicesWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-23"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-28"/>
<source>No Qt installed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::S60EmulatorRunConfiguration</name>
+ <name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+55"/>
- <source>%1 in Emulator</source>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+198"/>
+ <source>Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>QtS60EmulatorRunConfiguration</source>
+ <location line="+5"/>
+ <source>Executable:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+87"/>
- <source>Could not parse %1. The QtS60 emulator run configuration %2 can not be started.</source>
+ <location line="+21"/>
+ <source>Summary: Run %1 in emulator</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
+ <name>Qt4ProjectManager::Internal::S60EmulatorRunConfiguration</name>
<message>
- <location line="+40"/>
- <source>Name:</source>
+ <location line="-165"/>
+ <source>%1 in Symbian Emulator</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Executable:</source>
+ <location line="+2"/>
+ <source>QtSymbianEmulatorRunConfiguration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <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>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
<message>
- <location line="+52"/>
- <source>%1 in Emulator</source>
+ <location line="+113"/>
+ <source>%1 in Symbian Emulator</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -15560,11 +15782,21 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+23"/>
<source>New configuration</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nouvelle configuration</translation>
</message>
<message>
<location line="+1"/>
<source>New Configuration Name:</source>
+ <translation type="unfinished">Nom de la nouvelle configuration :</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>%1 Debug</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 Release</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -15710,112 +15942,114 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="mime_tr.h" line="+1"/>
<source>unknown</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">inconnue</translation>
</message>
<message>
<location line="+1"/>
<source>CMake Project file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier de projet CMake</translation>
</message>
<message>
<location line="+1"/>
<source>C Source file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier source C</translation>
</message>
<message>
<location line="+1"/>
<source>C Header file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier d'en-tête C</translation>
</message>
<message>
<location line="+1"/>
<source>C++ Header file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier d'en-tête C++</translation>
</message>
<message>
<location line="+1"/>
<source>C++ header</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">En-tête C++</translation>
</message>
<message>
<location line="+1"/>
<source>C++ Source file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier source C++</translation>
</message>
<message>
<location line="+1"/>
<source>C++ source code</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Code source C++</translation>
</message>
<message>
<location line="+1"/>
<source>Objective-C source code</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Code source en objective-C</translation>
</message>
<message>
<location line="+1"/>
<source>CVS submit template</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Modéle d'envoi de CVS</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Designer file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier du designer Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Qt Creator Project file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier générique de projet Qt Creator</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Project Files</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichiers génériques de projet</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Project Include Paths</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Chemins générique d'inclusion de projet</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Project Configuration File</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier générique de configuration de projet</translation>
</message>
<message>
<location line="+1"/>
<source>Perforce submit template</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Modéle d'envoi de Perforce</translation>
</message>
<message>
<location line="+1"/>
<source>QML file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier QML</translation>
</message>
<message>
<location line="+1"/>
<source>Qml Project file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier de projet Qml</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Project file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier de projet Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Project include file</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Pas sur du tout??? Sens peut être modifié...</translatorcomment>
+ <translation type="unfinished">Fichier d'inclusion de projet Qt</translation>
</message>
<message>
<location line="+1"/>
<source>message catalog</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Un ou plusieurs messages ?</translatorcomment>
+ <translation type="unfinished">Catalogue de messages</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Script file</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fichier de script Qt</translation>
</message>
<message>
<location line="+1"/>
@@ -15825,22 +16059,272 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>Subversion submit template</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>d'envoi ? de soumission (du verbe soumettre)?</translatorcomment>
+ <translation type="unfinished">Modéle d'envoi de Subversion</translation>
</message>
<message>
<location line="+1"/>
<source>Plain text document</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Document de text brut</translation>
</message>
<message>
<location line="+1"/>
<source>XML document</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Document XML</translation>
</message>
<message>
<location line="+1"/>
<source>Differences between files</source>
+ <translation type="unfinished">Différences entre fichiers</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::AbstractGdbAdapter</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/abstractgdbadapter.cpp" line="+74"/>
+ <source>The Gdb process could not be stopped:
+%1</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+5"/>
+ <source>Inferior process could not be stopped:
+%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Inferior started.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Inferior running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Attached to stopped inferior.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Connecting to remote server failed:
+%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::TermGdbAdapter</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+142"/>
+ <source>Debugger Error</source>
+ <translation type="unfinished">Erreur du débogueur</translation>
+ </message>
+</context>
+<context>
+ <name>TrkOptions</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/trkoptions.cpp" line="+91"/>
+ <source>No Symbian gdb executable specified.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The Symbian gdb executable '%1' could not be found in the search path.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::TrkOptionsPage</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
+ <source>Symbian Trk</source>
+ <translation type="unfinished">TRK Symbian</translation>
+ </message>
+</context>
+<context>
+ <name>QmlParser</name>
+ <message>
+ <location filename="../../../src/plugins/qmleditor/parser/qmljslexer.cpp" line="+553"/>
+ <source>Illegal character</source>
+ <translation type="unfinished">Caractère invalide</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Unclosed string at end of line</source>
+ <translation type="unfinished">Chaîne de caractère non terminée en fin de ligne</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Illegal escape squence</source>
+ <translation type="unfinished">Séquence d'échappement invalide</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Illegal unicode escape sequence</source>
+ <translatorcomment>trad illegal ?</translatorcomment>
+ <translation type="unfinished">Séquence d'échappement unicode invalide</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Unclosed comment at end of file</source>
+ <translation type="unfinished">Commentaire non terminée en fin de ligne</translation>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Illegal syntax for exponential number</source>
+ <translation type="unfinished">Syntaxe pour le nombre exponentiel invalide</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Identifier cannot start with numeric literal</source>
+ <translatorcomment>Trad numeric literal ?</translatorcomment>
+ <translation type="unfinished">Un identificateur ne peut pas commencer par un nombre</translation>
+ </message>
+ <message>
+ <location line="+331"/>
+ <source>Unterminated regular expression literal</source>
+ <translation type="unfinished">Expression régulière littérale non terminée</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Invalid regular expression flag '%0'</source>
+ <translatorcomment>On traduit flag ? Comment ?</translatorcomment>
+ <translation type="unfinished">Expression régulière invalide '%0'</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qmleditor/parser/qmljsparser.cpp" line="+1752"/>
+ <source>Unexpected token `%1'</source>
+ <translation type="unfinished">Symbole inattendu '%1'</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <location line="+23"/>
+ <source>Expected token `%1'</source>
+ <translation type="unfinished">Symbole attendu '%1'</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Syntax error</source>
+ <translation type="unfinished">Erreur de syntaxe</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::S60Devices::Device</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devices.cpp" line="+66"/>
+ <source>Id:</source>
+ <translation type="unfinished">Id :</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Name:</source>
+ <translation type="unfinished">Nom :</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>EPOC:</source>
+ <translation type="unfinished">EPOC :</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Tools:</source>
+ <translation type="unfinished">Outils :</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt:</source>
+ <translation type="unfinished">Qt :</translation>
+ </message>
+</context>
+<context>
+ <name>trk::BluetoothListener</name>
+ <message>
+ <location filename="../../../src/shared/trk/bluetoothlistener.cpp" line="+133"/>
+ <source>%1: Stopping listener %2...</source>
+ <translation type="unfinished">%1 : arrêt de l'observateur %2...</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>%1: Starting Bluetooth listener %2...</source>
+ <translation type="unfinished">%1 : démarrage de l'observateur Bluetooth %2...</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Unable to run '%1': %2</source>
+ <translation type="unfinished">Impossible de démarrer '%1' : %2</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>%1: Bluetooth listener running (%2).</source>
+ <translation type="unfinished">%1 : observateur Bluetooth en cours d'éxecution (%2).</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>%1: Process %2 terminated with exit code %3.</source>
+ <translation type="unfinished">%1 : processus %2 terminé avec le code %3.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>%1: Process %2 crashed.</source>
+ <translation type="unfinished">%1 : processus %2 planté.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1: Process error %2: %3</source>
+ <translation type="unfinished">%1 : erreur de processus %2 : %3</translation>
+ </message>
+</context>
+<context>
+ <name>trk::promptStartCommunication</name>
+ <message>
+ <location filename="../../../src/shared/trk/bluetoothlistener_gui.cpp" line="+68"/>
+ <source>Connection on %1 canceled.</source>
+ <translation type="unfinished">Connexion sur %1 annulée.</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Waiting for TRK</source>
+ <translation type="unfinished">Attente de TRK</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Waiting for TRK to start on %1...</source>
+ <translation type="unfinished">Attente de TRK pour démarrer sur %1...</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Waiting for Bluetooth Connection</source>
+ <translation type="unfinished">Attente d'une connexion Bluetooth</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Connecting to %1...</source>
+ <translation type="unfinished">Connexion à %1...</translation>
+ </message>
+</context>
+<context>
+ <name>trk::BaseCommunicationStarter</name>
+ <message numerus="yes">
+ <location filename="../../../src/shared/trk/communicationstarter.cpp" line="+165"/>
+ <source>%1: timed out after %n attempts using an interval of %2ms.</source>
+ <translatorcomment>timed out ? </translatorcomment>
+ <translation type="unfinished">
+ <numerusform>%1 : interruption après %n tentative en utilisant un intervalle de %2ms.</numerusform>
+ <numerusform>%1 : interruption après %n tentatives en utilisant un intervalle de %2ms.</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1: Connection attempt %2 succeeded.</source>
+ <translation type="unfinished">%1 : tenative de connexion %2 réussi.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1: Connection attempt %2 failed: %3 (retrying)...</source>
+ <translatorcomment>retrying ?</translatorcomment>
+ <translation type="unfinished">%1 : tenative de connexion %2 echoué : %3 (nouvel essai)...</translation>
+ </message>
</context>
</TS>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 1f45682dd441f11a7ef9a4619394be01189856bd..6a392a0e7195c71e70b80832137a86285be65692 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -34,12 +34,12 @@
<message>
<location filename="../../../src/libs/extensionsystem/plugindetailsview.ui"/>
<source>Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa:</translation>
</message>
<message>
<location/>
<source>Version:</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja:</translation>
</message>
<message>
<location/>
@@ -49,37 +49,37 @@
<message>
<location/>
<source>Vendor:</source>
- <translation type="unfinished"></translation>
+ <translation>Dostawca:</translation>
</message>
<message>
<location/>
<source>Url:</source>
- <translation type="unfinished"></translation>
+ <translation>Url:</translation>
</message>
<message>
<location/>
<source>Location:</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie:</translation>
</message>
<message>
<location/>
<source>Description:</source>
- <translation type="unfinished"></translation>
+ <translation>Opis:</translation>
</message>
<message>
<location/>
<source>Copyright:</source>
- <translation type="unfinished"></translation>
+ <translation>Prawa autorskie:</translation>
</message>
<message>
<location/>
<source>License:</source>
- <translation type="unfinished"></translation>
+ <translation>Licencja:</translation>
</message>
<message>
<location/>
<source>Dependencies:</source>
- <translation type="unfinished"></translation>
+ <translation>Zależności:</translation>
</message>
</context>
<context>
@@ -87,12 +87,12 @@
<message>
<location filename="../../../src/libs/extensionsystem/pluginerrorview.ui"/>
<source>State:</source>
- <translation type="unfinished"></translation>
+ <translation>Stan:</translation>
</message>
<message>
<location/>
<source>Error Message:</source>
- <translation type="unfinished"></translation>
+ <translation>Komunikat Błędu:</translation>
</message>
</context>
<context>
@@ -100,27 +100,27 @@
<message>
<location filename="../../../src/libs/extensionsystem/pluginview.ui"/>
<source>State</source>
- <translation type="unfinished"></translation>
+ <translation>Stan</translation>
</message>
<message>
<location/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location/>
<source>Version</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja</translation>
</message>
<message>
<location/>
<source>Vendor</source>
- <translation type="unfinished"></translation>
+ <translation>Dostawca</translation>
</message>
<message>
<location/>
<source>Location</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie</translation>
</message>
</context>
<context>
@@ -146,7 +146,7 @@
<message>
<location filename="../../../src/libs/utils/filewizardpage.ui"/>
<source>Choose the location</source>
- <translation>Wybierz miejsce</translation>
+ <translation>Wybierz położenie</translation>
</message>
<message>
<location/>
@@ -197,7 +197,7 @@
<translation>Ścieżka:</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+392"/>
+ <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+416"/>
<source>Invalid base class name</source>
<translation>Niepoprawna nazwa klasy podstawowej</translation>
</message>
@@ -216,38 +216,43 @@
<source>Invalid form file name: '%1'</source>
<translation>Niepoprawna nazwa pliku z formularzem: "%1"</translation>
</message>
+ <message>
+ <location filename="../../../src/libs/utils/newclasswidget.ui"/>
+ <source>Inherits QObject</source>
+ <translation>Wywodzi siÄ™ z QObject</translation>
+ </message>
</context>
<context>
<name>Utils::ProjectIntroPage</name>
<message>
<location filename="../../../src/libs/utils/projectintropage.ui"/>
<source>Introduction and project location</source>
- <translation type="unfinished"></translation>
+ <translation>Wprowadzenie oraz położenie projektu</translation>
</message>
<message>
<location/>
<source>Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa:</translation>
</message>
<message>
<location/>
<source>Create in:</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz w:</translation>
</message>
<message>
<location filename="../../../src/libs/utils/projectintropage.cpp" line="+65"/>
<source><Enter_Name></source>
- <translation type="unfinished"></translation>
+ <translation><Wprowadź nazwę></translation>
</message>
<message>
<location line="+97"/>
<source>The project already exists.</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt już istnieje.</translation>
</message>
<message>
<location line="+4"/>
<source>A file with that name already exists.</source>
- <translation type="unfinished"></translation>
+ <translation>Plik o tej samej nazwie już istnieje.</translation>
</message>
</context>
<context>
@@ -255,17 +260,17 @@
<message>
<location filename="../../../src/libs/utils/submiteditorwidget.ui"/>
<source>Subversion Submit</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij do Subversion</translation>
</message>
<message>
<location/>
<source>Des&cription</source>
- <translation type="unfinished"></translation>
+ <translation>&Opis</translation>
</message>
<message>
<location/>
<source>F&iles</source>
- <translation type="unfinished"></translation>
+ <translation>Pl&iki</translation>
</message>
</context>
<context>
@@ -273,12 +278,12 @@
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/newdialog.ui"/>
<source>New Project</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy projekt</translation>
</message>
<message>
<location/>
<source>1</source>
- <translation type="unfinished"></translation>
+ <translation>1</translation>
</message>
</context>
<context>
@@ -286,12 +291,12 @@
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.ui"/>
<source>Open File With...</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz plik przy pomocy...</translation>
</message>
<message>
<location/>
<source>Open file extension with:</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz rozszerzenie pliku przy pomocy:</translation>
</message>
</context>
<context>
@@ -299,17 +304,17 @@
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.ui"/>
<source>Save Changes</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj zmiany</translation>
</message>
<message>
<location/>
<source>The following files have unsaved changes:</source>
- <translation type="unfinished"></translation>
+ <translation>Następujące pliki posiadają niezachowane zmiany:</translation>
</message>
<message>
<location/>
<source>Automatically save all files before building</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie zachowuj wszystkie pliki przed budowaniem</translation>
</message>
</context>
<context>
@@ -393,72 +398,72 @@
<message>
<location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
<source>General settings</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia ogólne</translation>
</message>
<message>
<location/>
<source>User &interface color:</source>
- <translation type="unfinished"></translation>
+ <translation>Kolor &interfejsu użytkownika:</translation>
</message>
<message>
<location/>
<source>Reset to default</source>
- <translation type="unfinished"></translation>
+ <translation>Przywróć domyślne</translation>
</message>
<message>
<location/>
<source>R</source>
- <translation type="unfinished"></translation>
+ <translation>R</translation>
</message>
<message>
<location/>
<source>Terminal:</source>
- <translation type="unfinished"></translation>
+ <translation>Terminal:</translation>
</message>
<message>
<location/>
<source>External editor:</source>
- <translation type="unfinished"></translation>
+ <translation>Zewnętrzny edytor:</translation>
</message>
<message>
<location/>
<source>?</source>
- <translation type="unfinished"></translation>
+ <translation>?</translation>
</message>
<message>
<location/>
<source>When files are externally modified:</source>
- <translation type="unfinished"></translation>
+ <translation>W przypadku zewnętrznej modyfikacji plików:</translation>
</message>
<message>
<location/>
<source>Always ask</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze pytaj</translation>
</message>
<message>
<location/>
<source>Reload all modified files</source>
- <translation type="unfinished"></translation>
+ <translation>Przeładuj wszystkie zmodyfikowane pliki</translation>
</message>
<message>
<location/>
<source>Ignore modifications</source>
- <translation type="unfinished"></translation>
+ <translation>Zignoruj modyfikacje</translation>
</message>
<message>
<location filename="../../../src/plugins/coreplugin/generalsettings.cpp" line="+56"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
</message>
<message>
<location line="+10"/>
<source>Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko</translation>
</message>
<message>
<location line="+77"/>
<source>Variables</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienne</translation>
</message>
</context>
<context>
@@ -502,7 +507,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/cpaster/pasteview.ui"/>
<source>Send to Codepaster</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Wyślij do </translation>
</message>
<message>
<location/>
@@ -545,7 +550,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Parts to send to server</source>
- <translation type="unfinished"></translation>
+ <translation>Zawartość wysyłki do serwera</translation>
</message>
<message>
<location/>
@@ -562,9 +567,9 @@ p, li { white-space: pre-wrap; }
<name>CodePaster::SettingsPage</name>
<message>
<location filename="../../../src/plugins/cpaster/settingspage.ui"/>
- <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+62"/>
+ <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+67"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
</message>
<message>
<location/>
@@ -573,19 +578,18 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
<source>CodePaster</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Pastebin.ca</source>
- <translation type="unfinished"></translation>
+ <translation>Pastebin.ca</translation>
</message>
<message>
<location/>
<source>Pastebin.com</source>
- <translation type="unfinished"></translation>
+ <translation>Pastebin.com</translation>
</message>
<message>
<location/>
@@ -595,40 +599,45 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Copy Paste URL to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj i wklej URL do schowka</translation>
</message>
<message>
<location/>
<source>Display Output Pane after sending a post</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
+ <source>Code Pasting</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CompletionSettingsPage</name>
<message>
<location filename="../../../src/plugins/cpptools/completionsettingspage.ui"/>
<source>Code Completion</source>
- <translation type="unfinished"></translation>
+ <translation>Uzupełnianie kodu</translation>
</message>
<message>
<location/>
<source>Do a case-sensitive match for completion items.</source>
- <translation type="unfinished"></translation>
+ <translation>Uwzględniaj wielkość liter w uzupełnianych elementach.</translation>
</message>
<message>
<location/>
<source>&Case-sensitive completion</source>
- <translation type="unfinished"></translation>
+ <translation>Uwzględniaj &wielkość liter w uzupełnieniach</translation>
</message>
<message>
<location/>
<source>Automatically insert (, ) and ; when appropriate.</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie wstawiaj (, ) i ; gdy należy.</translation>
</message>
<message>
<location/>
<source>&Automatically insert brackets</source>
- <translation type="unfinished"></translation>
+ <translation>&Automatycznie wstawiaj nawiasy</translation>
</message>
<message>
<location/>
@@ -674,7 +683,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/cvs/settingspage.ui"/>
<source>Prompt to submit</source>
- <translation>Przypominaj o wysyłaniu zmian do serwera</translation>
+ <translation>Pytaj przed wysłaniem zmian do serwera</translation>
</message>
<message>
<location/>
@@ -689,12 +698,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>CVS Command:</source>
- <translation type="unfinished"></translation>
+ <translation>Komenda CVS:</translation>
</message>
<message>
<location/>
<source>CVS Root:</source>
- <translation type="unfinished"></translation>
+ <translation>Korzeń CVS:</translation>
</message>
<message>
<location/>
@@ -704,7 +713,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/cvs/settingspage.cpp" line="+84"/>
<source>CVS</source>
- <translation type="unfinished"></translation>
+ <translation>CVS</translation>
</message>
</context>
<context>
@@ -712,12 +721,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/attachcoredialog.ui"/>
<source>Start Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom debuggera</translation>
</message>
<message>
<location/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Program:</translation>
</message>
<message>
<location/>
@@ -730,22 +739,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/attachexternaldialog.ui"/>
<source>Start Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom debuggera</translation>
</message>
<message>
<location/>
<source>Attach to Process ID:</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz do procesu o identyfikatorze:</translation>
</message>
<message>
<location/>
<source>Filter:</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr:</translation>
</message>
<message>
<location/>
<source>Clear</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść</translation>
</message>
</context>
<context>
@@ -758,7 +767,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Function to break on:</source>
- <translation type="unfinished"></translation>
+ <translation>Funkcja w której przerwać:</translation>
</message>
</context>
<context>
@@ -766,7 +775,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/breakcondition.ui"/>
<source>Condition:</source>
- <translation type="unfinished"></translation>
+ <translation>Warunek:</translation>
</message>
<message>
<location/>
@@ -785,32 +794,32 @@ p, li { white-space: pre-wrap; }
<location/>
<source>Cdb</source>
<extracomment>Placeholder</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Cdb</translation>
</message>
<message>
<location/>
<source>Path:</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka:</translation>
</message>
<message>
<location/>
<source>Debugger Paths</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżki debuggera</translation>
</message>
<message>
<location/>
<source>Symbol paths:</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżki do symboli:</translation>
</message>
<message>
<location/>
<source>Source paths:</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżki do źródeł:</translation>
</message>
<message>
<location/>
<source>Other options</source>
- <translation type="unfinished"></translation>
+ <translation>Inne opcje</translation>
</message>
<message>
<location/>
@@ -826,12 +835,12 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+5"/>
<source>64-bit version</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja 64 bitowa</translation>
</message>
<message>
<location line="+1"/>
<source>32-bit version</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja 32 bitowa</translation>
</message>
</context>
<context>
@@ -839,32 +848,32 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/commonoptionspage.ui"/>
<source>User interface</source>
- <translation type="unfinished"></translation>
+ <translation>Interfejs użytkownika</translation>
</message>
<message>
<location/>
<source>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienie tej opcji spowoduje automatyczne wypełnienie widoku pliku źródłowego lecz może znacznie spowolnić uruchomienie debuggera.</translation>
</message>
<message>
<location/>
<source>Populate source file view automatically</source>
- <translation type="unfinished"></translation>
+ <translation>Wypełnij automatycznie widok pliku źródłowego</translation>
</message>
<message>
<location/>
<source>Show a message box when receiving a signal</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż komunikat po otrzymaniu sygnału</translation>
</message>
<message>
<location/>
<source>Use alternating row colors in debug views</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj alternatywnych kolorów wierszy w widokach debugowych</translation>
</message>
<message>
<location/>
<source>Use tooltips in main editor while debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj podpowiedzi w głównym edytorze podczas debugowania</translation>
</message>
<message>
<location/>
@@ -885,12 +894,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Maximal stack depth:</source>
- <translation type="unfinished"></translation>
+ <translation>Maksymalna głębokość stosu:</translation>
</message>
<message>
<location/>
<source><unlimited></source>
- <translation type="unfinished"></translation>
+ <translation><nieograniczony></translation>
</message>
</context>
<context>
@@ -923,75 +932,85 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Location: </source>
- <translation type="unfinished"></translation>
+ <translation>Położenie:</translation>
</message>
<message>
<location/>
<source>Debug debugging helper</source>
<translation type="unfinished"></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>
+ </message>
+ <message>
+ <location/>
+ <source>Use code model</source>
+ <translation>Używaj modelu kodu</translation>
+ </message>
</context>
<context>
<name>GdbOptionsPage</name>
<message>
<location filename="../../../src/plugins/debugger/gdb/gdboptionspage.ui"/>
<source>Gdb interaction</source>
- <translation type="unfinished"></translation>
+ <translation>Interakcje gdb</translation>
</message>
<message>
<location/>
<source>This is either a full absolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH.</source>
- <translation type="unfinished"></translation>
+ <translation>Jest to albo pełna ścieżka do programu gdb którego chcesz użyć albo nazwa programu gdb która będzie odnaleziona w zmiennej PATH.</translation>
</message>
<message>
<location/>
<source>Gdb location:</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie gdb:</translation>
</message>
<message>
<location/>
<source>Environment:</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko:</translation>
</message>
<message>
<location/>
<source>This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up.</source>
- <translation type="unfinished"></translation>
+ <translation>Może wskazywać plik zawierający komendy gdb które będą wykonane zaraz po uruchomieniu gdb.</translation>
</message>
<message>
<location/>
<source>Gdb startup script:</source>
- <translation type="unfinished"></translation>
+ <translation>Skrypt startowy gdb:</translation>
</message>
<message>
<location/>
<source>Behaviour of breakpoint setting in plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawianie pułapek we wtyczkach</translation>
</message>
<message>
<location/>
<source>This is the slowest but safest option.</source>
- <translation type="unfinished"></translation>
+ <translation>To jest najwolniejsza ale i zarazem najbezpieczniejsza opcja.</translation>
</message>
<message>
<location/>
<source>Try to set breakpoints in plugins always automatically.</source>
- <translation type="unfinished"></translation>
+ <translation>Próbuj zawsze ustawiać pułapki we wtyczkach automatycznie.</translation>
</message>
<message>
<location/>
<source>Try to set breakpoints in selected plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Próbuj ustawić pułapki w wybranych wtyczkach</translation>
</message>
<message>
<location/>
<source>Matching regular expression: </source>
- <translation type="unfinished"></translation>
+ <translation>pasujących do wyrażeń regularnych: </translation>
</message>
<message>
<location/>
<source>Never set breakpoints in plugins automatically</source>
- <translation type="unfinished"></translation>
+ <translation>Nigdy automatycznie nie ustawiaj pułapek we wtyczkach</translation>
</message>
</context>
<context>
@@ -999,42 +1018,42 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/gdb/trkoptionswidget.ui"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>Gdb</source>
- <translation type="unfinished"></translation>
+ <translation>Gdb</translation>
</message>
<message>
<location/>
<source>Symbian ARM gdb location:</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie gdb Symbian ARM:</translation>
</message>
<message>
<location/>
<source>Communication</source>
- <translation type="unfinished"></translation>
+ <translation>Komunikacja</translation>
</message>
<message>
<location/>
<source>Serial Port</source>
- <translation type="unfinished"></translation>
+ <translation>Port szeregowy</translation>
</message>
<message>
<location/>
<source>Bluetooth</source>
- <translation type="unfinished"></translation>
+ <translation>Bluetooth</translation>
</message>
<message>
<location/>
<source>Port:</source>
- <translation type="unfinished"></translation>
+ <translation>Port:</translation>
</message>
<message>
<location/>
<source>Device:</source>
- <translation type="unfinished"></translation>
+ <translation>UrzÄ…dzenie:</translation>
</message>
</context>
<context>
@@ -1042,22 +1061,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/startexternaldialog.ui"/>
<source>Start Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom debuggera</translation>
</message>
<message>
<location/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Program:</translation>
</message>
<message>
<location/>
<source>Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumenty:</translation>
</message>
<message>
<location/>
<source>Break at 'main':</source>
- <translation type="unfinished"></translation>
+ <translation>Przerwij w "main":</translation>
</message>
</context>
<context>
@@ -1065,27 +1084,27 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/debugger/startremotedialog.ui"/>
<source>Start Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom debuggera</translation>
</message>
<message>
<location/>
<source>Host and port:</source>
- <translation type="unfinished"></translation>
+ <translation>Host i port:</translation>
</message>
<message>
<location/>
<source>Architecture:</source>
- <translation type="unfinished"></translation>
+ <translation>Architektura:</translation>
</message>
<message>
<location/>
<source>Use server start script:</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj startowego skryptu serwera:</translation>
</message>
<message>
<location/>
<source>Server start script:</source>
- <translation type="unfinished"></translation>
+ <translation>Startowy skrypt serwera:</translation>
</message>
</context>
<context>
@@ -1093,42 +1112,42 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/designer/cpp/cppsettingspagewidget.ui"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>Embedding of the UI Class</source>
- <translation type="unfinished"></translation>
+ <translation>Osadzanie klas UI</translation>
</message>
<message>
<location/>
<source>Aggregation as a pointer member</source>
- <translation type="unfinished"></translation>
+ <translation>Agregacja poprzez wskaźnik do składnika</translation>
</message>
<message>
<location/>
<source>Aggregation</source>
- <translation type="unfinished"></translation>
+ <translation>Agregacja</translation>
</message>
<message>
<location/>
<source>Multiple Inheritance</source>
- <translation type="unfinished"></translation>
+ <translation>Dziedziczenie wielokrotne</translation>
</message>
<message>
<location/>
<source>Code Generation</source>
- <translation type="unfinished"></translation>
+ <translation>Generacja kodu</translation>
</message>
<message>
<location/>
<source>Support for changing languages at runtime</source>
- <translation type="unfinished"></translation>
+ <translation>Obsługa zmian języków w trakcie wykonywania programu</translation>
</message>
<message>
<location/>
<source>Use Qt module name in #include-directive</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj nazwy modułu Qt w dyrektywach #include</translation>
</message>
</context>
<context>
@@ -1136,22 +1155,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/designer/cpp/formclasswizardpage.ui"/>
<source>Choose a class name</source>
- <translation type="unfinished"></translation>
+ <translation>Podaj nazwÄ™ klasy</translation>
</message>
<message>
<location/>
<source>Class</source>
- <translation type="unfinished"></translation>
+ <translation>Klasa</translation>
</message>
<message>
<location/>
<source>Configure...</source>
- <translation type="unfinished"></translation>
+ <translation>Skonfiguruj...</translation>
</message>
<message>
<location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+148"/>
<source>%1 - Error</source>
- <translation type="unfinished"></translation>
+ <translation>%1 - BÅ‚Ä…d</translation>
</message>
</context>
<context>
@@ -1159,12 +1178,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/fakevim/fakevimoptions.ui"/>
<source>Use FakeVim</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj FakeVim</translation>
</message>
<message>
<location/>
<source>Vim style settings</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia stylu Vim</translation>
</message>
<message>
<location/>
@@ -1247,37 +1266,37 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/find/finddialog.ui"/>
<source>Search for...</source>
- <translation type="unfinished"></translation>
+ <translation>Wyszukaj...</translation>
</message>
<message>
<location/>
<source>Sc&ope:</source>
- <translation type="unfinished"></translation>
+ <translation>&Zakres:</translation>
</message>
<message>
<location/>
<source>&Search</source>
- <translation type="unfinished"></translation>
+ <translation>Wy&szukaj</translation>
</message>
<message>
<location/>
<source>Search &for:</source>
- <translation type="unfinished"></translation>
+ <translation>Wysz&ukaj:</translation>
</message>
<message>
<location/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij</translation>
</message>
<message>
<location/>
<source>&Case sensitive</source>
- <translation type="unfinished"></translation>
+ <translation>Uwzględniaj &wielkość liter</translation>
</message>
<message>
<location/>
<source>&Whole words only</source>
- <translation type="unfinished"></translation>
+ <translation>Tylko &całe słowa</translation>
</message>
</context>
<context>
@@ -1285,27 +1304,27 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/find/findwidget.ui"/>
<source>Find</source>
- <translation type="unfinished"></translation>
+ <translation>Znajdź</translation>
</message>
<message>
<location/>
<source>Find:</source>
- <translation type="unfinished"></translation>
+ <translation>Znajdź:</translation>
</message>
<message>
<location/>
<source>...</source>
- <translation type="unfinished"></translation>
+ <translation>...</translation>
</message>
<message>
<location/>
<source>Replace with:</source>
- <translation type="unfinished"></translation>
+ <translation>ZastÄ…p:</translation>
</message>
<message>
<location/>
<source>All</source>
- <translation type="unfinished"></translation>
+ <translation>Wszystko</translation>
</message>
</context>
<context>
@@ -1313,17 +1332,17 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericmakestep.ui"/>
<source>Override %1:</source>
- <translation type="unfinished"></translation>
+ <translation>Nadpisanie %1:</translation>
</message>
<message>
<location/>
<source>Make arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumenty make'a:</translation>
</message>
<message>
<location/>
<source>Targets:</source>
- <translation type="unfinished"></translation>
+ <translation>Produkty docelowe:</translation>
</message>
</context>
<context>
@@ -1331,22 +1350,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/git/branchdialog.ui"/>
<source>Branches</source>
- <translation type="unfinished"></translation>
+ <translation>Gałęzie</translation>
</message>
<message>
<location/>
<source>General information</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne informacje</translation>
</message>
<message>
<location/>
<source>Repository:</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica:</translation>
</message>
<message>
<location/>
<source>Remote branches</source>
- <translation type="unfinished"></translation>
+ <translation>Zdalne gałęzie</translation>
</message>
<message>
<location filename="../../../src/plugins/git/branchdialog.cpp" line="+75"/>
@@ -1356,52 +1375,52 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+3"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
<message>
<location line="+20"/>
<source>Unable to find the repository directory for '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można znależć katalogu składnicy "%1".</translation>
</message>
<message>
<location line="+69"/>
<source>Delete Branch</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń gałąź</translation>
</message>
<message>
<location line="+0"/>
<source>Would you like to delete the branch '%1'?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz usunąć gałąź "%1"?</translation>
</message>
<message>
<location line="+16"/>
<source>Failed to delete branch</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć gałęzi</translation>
</message>
<message>
<location line="+17"/>
<source>Failed to create branch</source>
- <translation type="unfinished"></translation>
+ <translation>Utworzenie gałęzi niepomyślnie zakończone</translation>
</message>
<message>
<location line="+29"/>
<source>Failed to stash</source>
- <translation type="unfinished"></translation>
+ <translation>Odłożenie zmian zakończone niepowodzeniem</translation>
</message>
<message>
<location line="+36"/>
<source>Would you like to create a local branch '%1' tracking the remote branch '%2'?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz utworzyć lokalną gałąź "%1" śledzącą zdalną gałąź "%2"?</translation>
</message>
<message>
<location line="+1"/>
<source>Create branch</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz gałąź</translation>
</message>
<message>
<location line="+15"/>
<source>Failed to create a tracking branch</source>
- <translation type="unfinished"></translation>
+ <translation>Utworzenie gałęzi śledzącej zakończone niepowodzeniem</translation>
</message>
</context>
<context>
@@ -1409,17 +1428,17 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/git/changeselectiondialog.ui"/>
<source>Repository Location:</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie składnicy:</translation>
</message>
<message>
<location/>
<source>Select</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz</translation>
</message>
<message>
<location/>
<source>Change:</source>
- <translation type="unfinished"></translation>
+ <translation>Zmiana:</translation>
</message>
</context>
<context>
@@ -1427,27 +1446,27 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/git/gitorious/gitorioushostwidget.ui"/>
<source>...</source>
- <translation type="unfinished"></translation>
+ <translation>...</translation>
</message>
<message>
<location filename="../../../src/plugins/git/gitorious/gitorioushostwidget.cpp" line="+86"/>
<source><New Host></source>
- <translation type="unfinished"></translation>
+ <translation><Nowy Host></translation>
</message>
<message>
<location line="+18"/>
<source>Host</source>
- <translation type="unfinished"></translation>
+ <translation>Host</translation>
</message>
<message>
<location line="+0"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekty</translation>
</message>
<message>
<location line="+0"/>
<source>Description</source>
- <translation type="unfinished"></translation>
+ <translation>Opis</translation>
</message>
</context>
<context>
@@ -1455,32 +1474,32 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/git/gitorious/gitoriousprojectwidget.ui"/>
<source>WizardPage</source>
- <translation type="unfinished"></translation>
+ <translation>StronaKreatora</translation>
</message>
<message>
<location/>
<source>Filter:</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr:</translation>
</message>
<message>
<location/>
<source>...</source>
- <translation type="unfinished"></translation>
+ <translation>...</translation>
</message>
<message>
<location/>
<source>Keep updating</source>
- <translation type="unfinished"></translation>
+ <translation>Odświeżaj</translation>
</message>
<message>
<location filename="../../../src/plugins/git/gitorious/gitoriousprojectwidget.cpp" line="+84"/>
<source>Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt</translation>
</message>
<message>
<location line="+0"/>
<source>Description</source>
- <translation type="unfinished"></translation>
+ <translation>Opis</translation>
</message>
</context>
<context>
@@ -1488,62 +1507,62 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui"/>
<source>WizardPage</source>
- <translation type="unfinished"></translation>
+ <translation>StronaKreatora</translation>
</message>
<message>
<location/>
<source>Filter:</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr:</translation>
</message>
<message>
<location/>
<source>...</source>
- <translation type="unfinished"></translation>
+ <translation>...</translation>
</message>
<message>
<location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp" line="+83"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location line="+0"/>
<source>Owner</source>
- <translation type="unfinished"></translation>
+ <translation>Właściciel</translation>
</message>
<message>
<location line="+0"/>
<source>Description</source>
- <translation type="unfinished"></translation>
+ <translation>Opis</translation>
</message>
<message>
<location line="+74"/>
<source>Choose a repository of the project '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz składnicę dla projektu "%1".</translation>
</message>
<message>
<location line="+9"/>
<source>Mainline Repositories</source>
- <translation type="unfinished"></translation>
+ <translation>Główne składnice</translation>
</message>
<message>
<location line="+0"/>
<source>Clones</source>
- <translation type="unfinished"></translation>
+ <translation>Klony</translation>
</message>
<message>
<location line="+0"/>
<source>Baseline Repositories</source>
- <translation type="unfinished"></translation>
+ <translation>Podstawowe składnice</translation>
</message>
<message>
<location line="+0"/>
<source>Shared Project Repositories</source>
- <translation type="unfinished"></translation>
+ <translation>Współdzielone składnice</translation>
</message>
<message>
<location line="+0"/>
<source>Personal Repositories</source>
- <translation type="unfinished"></translation>
+ <translation>Osobiste składnice</translation>
</message>
</context>
<context>
@@ -1551,27 +1570,27 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/git/gitsubmitpanel.ui"/>
<source>General Information</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne informacje</translation>
</message>
<message>
<location/>
<source>Repository:</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica:</translation>
</message>
<message>
<location/>
<source>repository</source>
- <translation type="unfinished"></translation>
+ <translation>składnica</translation>
</message>
<message>
<location/>
<source>Branch:</source>
- <translation type="unfinished"></translation>
+ <translation>Gałąź:</translation>
</message>
<message>
<location/>
<source>branch</source>
- <translation type="unfinished"></translation>
+ <translation>gałąź</translation>
</message>
<message>
<location/>
@@ -1581,12 +1600,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Author:</source>
- <translation type="unfinished"></translation>
+ <translation>Autor:</translation>
</message>
<message>
<location/>
<source>Email:</source>
- <translation type="unfinished"></translation>
+ <translation>Email:</translation>
</message>
</context>
<context>
@@ -1594,27 +1613,27 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/git/settingspage.ui"/>
<source>Environment variables</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienne środowiskowe</translation>
</message>
<message>
<location/>
<source>PATH:</source>
- <translation type="unfinished"></translation>
+ <translation>ŚCIEŻKA:</translation>
</message>
<message>
<location/>
<source>From system</source>
- <translation type="unfinished"></translation>
+ <translation>Z systemu</translation>
</message>
<message>
<location/>
<source><b>Note:</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>Uwaga:</b></translation>
</message>
<message>
<location/>
<source>Git needs to find Perl in the environment as well.</source>
- <translation type="unfinished"></translation>
+ <translation>Git musi znaleźć również Perl w środowisku.</translation>
</message>
<message>
<location/>
@@ -1634,7 +1653,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Prompt to submit</source>
- <translation>Przypominaj o wysyłaniu zmian do serwera</translation>
+ <translation>Pytaj przed wysłaniem zmian do serwera</translation>
</message>
<message>
<location/>
@@ -1644,12 +1663,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/git/settingspage.cpp" line="+90"/>
<source>Git</source>
- <translation type="unfinished"></translation>
+ <translation>Git</translation>
</message>
<message>
<location line="+29"/>
<source>Git Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia Git</translation>
</message>
</context>
<context>
@@ -1657,17 +1676,17 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/help/docsettingspage.ui"/>
<source>Registered Documentation</source>
- <translation type="unfinished"></translation>
+ <translation>Zarejestrowana dokumentacja</translation>
</message>
<message>
<location/>
<source>Add...</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj...</translation>
</message>
<message>
<location/>
<source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
</context>
<context>
@@ -1703,27 +1722,27 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/help/generalsettingspage.ui"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>Font</source>
- <translation type="unfinished"></translation>
+ <translation>Czcionka</translation>
</message>
<message>
<location/>
<source>Family:</source>
- <translation type="unfinished"></translation>
+ <translation>Rodzina:</translation>
</message>
<message>
<location/>
<source>Style:</source>
- <translation type="unfinished"></translation>
+ <translation>Styl:</translation>
</message>
<message>
<location/>
<source>Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar:</translation>
</message>
<message>
<location/>
@@ -1758,52 +1777,52 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Show my home page</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż moją stronę startową</translation>
</message>
<message>
<location/>
<source>Show a blank page</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż pustą stronę</translation>
</message>
<message>
<location/>
<source>Show my tabs from last session</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż moje karty z ostatniej sesji</translation>
</message>
<message>
<location/>
<source>Home Page:</source>
- <translation type="unfinished"></translation>
+ <translation>Strona startowa:</translation>
</message>
<message>
<location/>
<source>Use &Current Page</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj &bieżącej strony</translation>
</message>
<message>
<location/>
<source>Use &Blank Page</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj &pustej strony</translation>
</message>
<message>
<location/>
<source>Restore to Default</source>
- <translation type="unfinished"></translation>
+ <translation>Przywróć domyślną</translation>
</message>
<message>
<location/>
<source>Help Bookmarks</source>
- <translation type="unfinished"></translation>
+ <translation>Zakładki pomocy</translation>
</message>
<message>
<location/>
<source>Import...</source>
- <translation type="unfinished"></translation>
+ <translation>Zaimportuj...</translation>
</message>
<message>
<location/>
<source>Export...</source>
- <translation type="unfinished"></translation>
+ <translation>Wyeksportuj...</translation>
</message>
</context>
<context>
@@ -1847,7 +1866,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/perforce/promptdialog.ui"/>
<source>Perforce Prompt</source>
- <translation>Przypomnienie z Perforce'a</translation>
+ <translation>Pytanie Perforce'a</translation>
</message>
<message>
<location/>
@@ -1860,7 +1879,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/perforce/settingspage.ui"/>
<source>Prompt to submit</source>
- <translation>Przypominaj o wysyłaniu zmian do serwera</translation>
+ <translation>Pytaj przed wysłaniem zmian do serwera</translation>
</message>
<message>
<location/>
@@ -1931,7 +1950,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.ui"/>
<source>Default File Encoding:</source>
- <translation type="unfinished"></translation>
+ <translation>Domyślne kodowanie plików:</translation>
</message>
</context>
<context>
@@ -1944,22 +1963,22 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa:</translation>
</message>
<message>
<location/>
<source>Command:</source>
- <translation type="unfinished"></translation>
+ <translation>Komenda:</translation>
</message>
<message>
<location/>
<source>Working Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog roboczy:</translation>
</message>
<message>
<location/>
<source>Command Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumenty komendy:</translation>
</message>
</context>
<context>
@@ -1967,32 +1986,32 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
<source>Build and Run</source>
- <translation type="unfinished"></translation>
+ <translation>Budowanie i uruchamianie</translation>
</message>
<message>
<location/>
<source>Save all files before Build</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowuj wszystkie pliki przed budowaniem</translation>
</message>
<message>
<location/>
<source>Always build Project before Running</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze buduj projekt przed uruchomieniem</translation>
</message>
<message>
<location/>
<source>Show Compiler Output on building</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj wyjście kompilatora w trakcie budowania</translation>
</message>
<message>
<location/>
<source>Use jom instead of nmake</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj jom zamiast nmake</translation>
</message>
<message>
<location/>
<source><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. For more details, see the <a href="http://qt.gitorious.org/qt-labs/jom/">jom Homepage</a>. Disable it if you experience problems with your builds.</source>
- <translation type="unfinished"></translation>
+ <translation><i>jom</i> jest zamiennikiem <i>nmake</i> który dystrybuuje proces kompilacji do wielu rdzeni CPU. Szczegóły znajdziesz tu: <a href="http://qt.gitorious.org/qt-labs/jom/">jom Homepage</a>. Wyłącz tą opcję jeśli napotykasz na problemy podczas budowania.</translation>
</message>
</context>
<context>
@@ -2000,37 +2019,42 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.ui"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>Manage Sessions...</source>
- <translation type="unfinished"></translation>
+ <translation>ZarzÄ…dzanie sesjami...</translation>
</message>
<message>
<location/>
<source>Create New Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz nowy projekt...</translation>
</message>
<message>
<location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.cpp" line="+79"/>
<source>Open Recent Project</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz ostatnio używany projekt</translation>
</message>
<message>
<location line="+1"/>
<source>Resume Session</source>
- <translation type="unfinished"></translation>
+ <translation>Wznów sesję</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>%1 (last session)</source>
+ <translation>%1 (ostatnia sesja)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 (current session)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+45"/>
<source>New Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy projekt...</translation>
</message>
</context>
<context>
@@ -2046,22 +2070,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/projectwizardpage.ui"/>
<source>Project management</source>
- <translation type="unfinished"></translation>
+ <translation>ZarzÄ…dzanie projektami</translation>
</message>
<message>
<location/>
<source>&Add to Project</source>
- <translation type="unfinished"></translation>
+ <translation>&Dodaj do projektu</translation>
</message>
<message>
<location/>
<source>&Project</source>
- <translation type="unfinished"></translation>
+ <translation>&Projekt</translation>
</message>
<message>
<location/>
<source>Add to &version control</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj do systemu kontroli &wersji</translation>
</message>
<message>
<location/>
@@ -2070,7 +2094,11 @@ p, li { white-space: pre-wrap; }
</source>
- <translation type="unfinished"></translation>
+ <translation>Następujące pliki zostaną dodane:
+
+
+
+</translation>
</message>
</context>
<context>
@@ -2078,22 +2106,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
<source>Remove File</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń plik</translation>
</message>
<message>
<location/>
<source>File to remove:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik do usunięcia:</translation>
</message>
<message>
<location/>
<source>&Delete file permanently</source>
- <translation type="unfinished"></translation>
+ <translation>&Skasuj plik bezpowrotnie</translation>
</message>
<message>
<location/>
<source>&Remove from Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>&Usuń z systemu kontroli wersji</translation>
</message>
</context>
<context>
@@ -2101,17 +2129,17 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
<source>Edit run configuration:</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj konfiguracjÄ™ uruchamiania:</translation>
</message>
<message>
<location/>
<source>+</source>
- <translation type="unfinished"></translation>
+ <translation>+</translation>
</message>
<message>
<location/>
<source>-</source>
- <translation type="unfinished"></translation>
+ <translation>-</translation>
</message>
</context>
<context>
@@ -2119,32 +2147,32 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
<source>Session Manager</source>
- <translation type="unfinished"></translation>
+ <translation>ZarzÄ…dzanie sesjami</translation>
</message>
<message>
<location/>
<source>Create New Session</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz nową sesję</translation>
</message>
<message>
<location/>
<source>Clone Session</source>
- <translation type="unfinished"></translation>
+ <translation>Sklonuj sesjÄ™</translation>
</message>
<message>
<location/>
<source>Delete Session</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń sesję</translation>
</message>
<message>
<location/>
<source><a href="qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">What is a Session?</a></source>
- <translation type="unfinished"></translation>
+ <translation><a href="qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">Co to jest sesja?</a></translation>
</message>
<message>
<location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+113"/>
<source>Switch to session</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz sesję</translation>
</message>
</context>
<context>
@@ -2152,132 +2180,132 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>The header file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nagłówkowy</translation>
</message>
<message>
<location/>
<source>&Sources</source>
- <translation type="unfinished"></translation>
+ <translation>Źró&dła</translation>
</message>
<message>
<location/>
<source>Widget librar&y:</source>
- <translation type="unfinished"></translation>
+ <translation>&Biblioteka widżetów:</translation>
</message>
<message>
<location/>
<source>Widget project &file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z &projektem widżetu:</translation>
</message>
<message>
<location/>
<source>Widget h&eader file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik na&główkowy widżetu:</translation>
</message>
<message>
<location/>
<source>The header file has to be specified in source code.</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nagłowkowy musi wystąpić w kodzie źródłowym.</translation>
</message>
<message>
<location/>
<source>Widge&t source file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik żródłowy widże&tu:</translation>
</message>
<message>
<location/>
<source>Widget &base class:</source>
- <translation type="unfinished"></translation>
+ <translation>Klasa podsta&wowa widżetu:</translation>
</message>
<message>
<location/>
<source>QWidget</source>
- <translation type="unfinished"></translation>
+ <translation>QWidget</translation>
</message>
<message>
<location/>
<source>Plugin class &name:</source>
- <translation type="unfinished"></translation>
+ <translation>&Nazwa klasy wtyczki:</translation>
</message>
<message>
<location/>
<source>Plugin &header file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik &nagłówkowy wtyczki:</translation>
</message>
<message>
<location/>
<source>Plugin sou&rce file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik ź&ródłowy wtyczki:</translation>
</message>
<message>
<location/>
<source>Icon file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z ikonÄ…:</translation>
</message>
<message>
<location/>
<source>&Link library</source>
- <translation type="unfinished"></translation>
+ <translation>Dowiąż bib&liotekę</translation>
</message>
<message>
<location/>
<source>Create s&keleton</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz sz&kielet</translation>
</message>
<message>
<location/>
<source>Include pro&ject</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz pro&jekt</translation>
</message>
<message>
<location/>
<source>&Description</source>
- <translation type="unfinished"></translation>
+ <translation>&Opis</translation>
</message>
<message>
<location/>
<source>G&roup:</source>
- <translation type="unfinished"></translation>
+ <translation>&Grupa:</translation>
</message>
<message>
<location/>
<source>&Tooltip:</source>
- <translation type="unfinished"></translation>
+ <translation>&Podpowiedź:</translation>
</message>
<message>
<location/>
<source>W&hat's this:</source>
- <translation type="unfinished"></translation>
+ <translation>"&Co to jest":</translation>
</message>
<message>
<location/>
<source>The widget is a &container</source>
- <translation type="unfinished"></translation>
+ <translation>Widżet jest po&jemnikiem</translation>
</message>
<message>
<location/>
<source>Property defa&ults</source>
- <translation type="unfinished"></translation>
+ <translation>Dom&yślne wartości właściwości</translation>
</message>
<message>
<location/>
<source>dom&XML:</source>
- <translation type="unfinished"></translation>
+ <translation>dom&XML:</translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp" line="+44"/>
<source>Select Icon</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz ikonÄ™</translation>
</message>
<message>
<location line="+1"/>
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki z ikonami (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
</message>
</context>
<context>
@@ -2285,7 +2313,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui"/>
<source>WizardPage</source>
- <translation type="unfinished"></translation>
+ <translation>StronaKreatora</translation>
</message>
<message>
<location/>
@@ -2315,17 +2343,17 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Plugin name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa wtyczki:</translation>
</message>
<message>
<location/>
<source>Resource file:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z zasobami:</translation>
</message>
<message>
<location/>
<source>icons.qrc</source>
- <translation type="unfinished"></translation>
+ <translation>icons.qrc</translation>
</message>
</context>
<context>
@@ -2333,22 +2361,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui"/>
<source>Custom Qt Widget Wizard</source>
- <translation type="unfinished"></translation>
+ <translation>Kreator własnych widżetów Qt</translation>
</message>
<message>
<location/>
<source>Custom Widget List</source>
- <translation type="unfinished"></translation>
+ <translation>Lista własnych widżetów</translation>
</message>
<message>
<location/>
<source>Widget &Classes:</source>
- <translation type="unfinished"></translation>
+ <translation>&Klasy widżetów:</translation>
</message>
<message>
<location/>
<source>Specify the list of custom widgets and their properties.</source>
- <translation type="unfinished"></translation>
+ <translation>Podaj listę własnych widżetów i ich właściwości.</translation>
</message>
</context>
<context>
@@ -2363,7 +2391,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location/>
<source>Skin:</source>
- <translation type="unfinished"></translation>
+ <translation>Skórka:</translation>
</message>
</context>
<context>
@@ -2371,69 +2399,104 @@ It also automatically sets the correct Qt version.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>Examples not installed</source>
- <translation type="unfinished"></translation>
+ <translation>Przykłady nie są zainstalowane</translation>
</message>
<message>
<location/>
<source>Open</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+56"/>
+ <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+62"/>
<source>Tutorials</source>
- <translation type="unfinished"></translation>
+ <translation>Samouczki</translation>
</message>
<message>
<location line="+1"/>
<source>Explore Qt Examples</source>
- <translation type="unfinished"></translation>
+ <translation>Zgłąb przykłady Qt</translation>
</message>
<message>
<location line="+2"/>
<source>Did You Know?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy wiesz że?</translation>
</message>
<message>
<location line="+6"/>
<source><b>Qt Creator - A quick tour</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>Qt Creator - Krótki przegląd</b></translation>
</message>
<message>
<location line="+2"/>
<source>Creating an address book</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzenie książki adresowej</translation>
</message>
<message>
<location line="+2"/>
<source>Understanding widgets</source>
- <translation type="unfinished"></translation>
+ <translation>Pojęcie widżetów</translation>
</message>
<message>
<location line="+2"/>
<source>Building with qmake</source>
- <translation type="unfinished"></translation>
+ <translation>Budowanie przy pomocy qmake</translation>
</message>
<message>
<location line="+2"/>
<source>Writing test cases</source>
- <translation type="unfinished"></translation>
+ <translation>Pisanie testów</translation>
</message>
<message>
<location line="+38"/>
<source>Choose an example...</source>
+ <translation>Wybierz przykład...</translation>
+ </message>
+ <message>
+ <location line="+81"/>
+ <source>Copy Project to writable Location?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+103"/>
+ <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>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&Location:</source>
+ <translation>&Położenie:</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&Copy Project and Open</source>
+ <translation>S&kopiuj projekt i otwórz</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&Keep Project and Open</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Warning</source>
+ <translation>Ostrzeżenie</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The specified location already exists. Please specify a valid location.</source>
+ <translation>Podane położenie już istnieje. Podaj poprawne położenie.</translation>
+ </message>
+ <message>
+ <location line="+61"/>
<location line="+7"/>
<source>Cmd</source>
<comment>Shortcut key</comment>
- <translation type="unfinished"></translation>
+ <translation>Cmd</translation>
</message>
<message>
<location line="-5"/>
@@ -2450,69 +2513,69 @@ It also automatically sets the correct Qt version.</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 type="unfinished"></translation>
+ <translation>Możesz przełączać tryby Qt Creator'a używając <tt>Ctrl+liczba</tt>:<ul><li>1 - Powitanie</li><li>2 - Edycja</li><li>3 - Debug</li><li>4 - Projekty</li><li>5 - Pomoc</li><li></li><li>6 - Wyjścia</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 type="unfinished"></translation>
+ <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"></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ę w prawym końcu pola edycyjnego.</translation>
</message>
<message>
<location line="+2"/>
<source>If you add <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">external libraries</a>, Qt Creator will automatically offer syntax highlighting and code completion.</source>
- <translation type="unfinished"></translation>
+ <translation>Dodając <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">zewnętrzne biblioteki</a>, Qt Creator automatycznie zaoferuje podświetlanie składni i uzupełnianie kodu.</translation>
</message>
<message>
<location line="+3"/>
<source>The code completion is CamelCase-aware. For example, to complete <tt>namespaceUri</tt> you can just type <tt>nU</tt> and hit <tt>Ctrl+Space</tt>.</source>
- <translation type="unfinished"></translation>
+ <translation>Uzupełnianie kodu uwzględnia wielkie litery w środku nazw. Na przykład aby uzupełnić <tt>namespaceUri</tt> wystarczy że napiszesz <tt>nU</tt> i przyciśniesz <tt>Ctrl+spacja</tt>.</translation>
</message>
<message>
<location line="+2"/>
<source>You can force code completion at any time using <tt>Ctrl+Space</tt>.</source>
- <translation type="unfinished"></translation>
+ <translation>W każdej chwili możesz wywołać uzupełnianie kodu naciskając <tt>Ctrl+spacja</tt>.</translation>
</message>
<message>
<location line="+1"/>
<source>You can start Qt Creator with a session by calling <tt>qtcreator &lt;sessionname&gt;</tt>.</source>
- <translation type="unfinished"></translation>
+ <translation>Wywołując <tt>qtcreator &lt;nazwa_sesji&gt;</tt> możesz uruchomić Qt Creator z wybraną sesją.</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 type="unfinished"></translation>
+ <translation>Możesz zawsze powrócić do trybu edycji z każdego innego trybu naciskając <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 type="unfinished"></translation>
+ <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 type="unfinished"></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"/>
<source>You can add custom build steps in the <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html">build settings</a>.</source>
- <translation type="unfinished"></translation>
+ <translation>Możesz dodać własne kroki do procesu budowania w <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html">ustawieniach budowania</a>.</translation>
</message>
<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 type="unfinished"></translation>
+ <translation>W ramach sesji możesz dodać <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies">zależności</a> pomiędzy projektami.</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 type="unfinished"></translation>
+ <translation>Możesz ustawić preferowane kodowanie dla wszystkich projektów w <tt>Projekty -> Ustawienia edytora -> Domyślne kodowanie plików</tt>.</translation>
</message>
<message>
<location line="+1"/>
@@ -2522,12 +2585,12 @@ It also automatically sets the correct Qt version.</source>
<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 type="unfinished"></translation>
+ <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>
<message>
<location line="+2"/>
<source>In the editor, <tt>F2</tt> toggles declaration and definition while <tt>F4</tt> toggles header file and source file.</source>
- <translation type="unfinished"></translation>
+ <translation>Naciśnięcie w edytorze <tt>F2</tt> przełącza między deklaracją a definicją, zaś <tt>F4</tt> przełącza między plikiem nagłówkowym a plikiem źródłowym.</translation>
</message>
</context>
<context>
@@ -2548,17 +2611,17 @@ It also automatically sets the correct Qt version.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qmakestep.ui"/>
<source>QMake Build Configuration:</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja QMake:</translation>
</message>
<message>
<location/>
<source>debug</source>
- <translation type="unfinished"></translation>
+ <translation>debug</translation>
</message>
<message>
<location/>
<source>release</source>
- <translation type="unfinished"></translation>
+ <translation>release</translation>
</message>
<message>
<location/>
@@ -2576,7 +2639,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
@@ -2586,7 +2649,7 @@ It also automatically sets the correct Qt version.</source>
<message>
<location/>
<source>SDK Location</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie SDK</translation>
</message>
<message>
<location/>
@@ -2596,10 +2659,10 @@ It also automatically sets the correct Qt version.</source>
<message>
<location/>
<source>Refresh</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Odśwież</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+91"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+96"/>
<source>S60 SDKs</source>
<translation type="unfinished"></translation>
</message>
@@ -2609,17 +2672,17 @@ It also automatically sets the correct Qt version.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
<source>Qt Version:</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja Qt:</translation>
</message>
<message>
<location/>
<source>This Qt-Version is invalid.</source>
- <translation type="unfinished"></translation>
+ <translation>Ta wersja Qt nie jest poprawna.</translation>
</message>
<message>
<location/>
<source>Manage</source>
- <translation type="unfinished"></translation>
+ <translation>ZarzÄ…dzaj</translation>
</message>
<message>
<location/>
@@ -2629,22 +2692,22 @@ It also automatically sets the correct Qt version.</source>
<message>
<location/>
<source>Build Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog wersji:</translation>
</message>
<message>
<location/>
<source><a href="import">Import existing build</a></source>
- <translation type="unfinished"></translation>
+ <translation><a href="import">Zaimportuj istniejÄ…cÄ… wersjÄ™</a></translation>
</message>
<message>
<location/>
<source>Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa konfiguracji:</translation>
</message>
<message>
<location/>
<source>Tool Chain:</source>
- <translation type="unfinished"></translation>
+ <translation>Zestaw narzędzi:</translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+71"/>
@@ -2655,22 +2718,22 @@ It also automatically sets the correct Qt version.</source>
<location line="+47"/>
<location line="+65"/>
<source>Default Qt Version (%1)</source>
- <translation type="unfinished"></translation>
+ <translation>Domyślna wersja Qt (%1)</translation>
</message>
<message>
<location line="-61"/>
<source>No Qt Version set</source>
- <translation type="unfinished"></translation>
+ <translation>Nie ustawiono wersji Qt</translation>
</message>
<message>
<location line="+3"/>
<source>using Qt version: <b>%1</b><br>with tool chain <b>%2</b><br>building in <b>%3</b></source>
- <translation type="unfinished"></translation>
+ <translation>używa wersji: <b>%1</b><br>z zestawem narzędzi: <b>%2</b><br>zbudowane w: <b>%3</b></translation>
</message>
<message>
<location line="+17"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
</message>
</context>
<context>
@@ -2678,17 +2741,17 @@ It also automatically sets the correct Qt version.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.ui"/>
<source>Qt versions</source>
- <translation type="unfinished"></translation>
+ <translation>Wersje Qt</translation>
</message>
<message>
<location/>
<source>+</source>
- <translation type="unfinished"></translation>
+ <translation>+</translation>
</message>
<message>
<location/>
<source>-</source>
- <translation type="unfinished"></translation>
+ <translation>-</translation>
</message>
<message>
<location/>
@@ -2702,22 +2765,22 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Show &Log</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż &log</translation>
</message>
<message>
<location/>
<source>&Rebuild</source>
- <translation type="unfinished"></translation>
+ <translation>P&rzebuduj</translation>
</message>
<message>
<location/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location/>
<source>QMake Location</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie QMake</translation>
</message>
<message>
<location/>
@@ -2727,22 +2790,22 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Version Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa wersji:</translation>
</message>
<message>
<location/>
<source>QMake Location:</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie QMake:</translation>
</message>
<message>
<location/>
<source>MinGw Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog MinGW:</translation>
</message>
<message>
<location/>
<source>MSVC Version:</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja MSVC:</translation>
</message>
<message>
<location/>
@@ -2751,13 +2814,18 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <source>MWC Directory:</source>
- <translation type="unfinished"></translation>
+ <source>Default Qt Version:</source>
+ <translation>Domyślna wersja Qt:</translation>
</message>
<message>
<location/>
- <source>Default Qt Version:</source>
- <translation type="unfinished"></translation>
+ <source>S60 SDK:</source>
+ <translation>S60 SDK:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Carbide Directory:</source>
+ <translation>Katalog Carbide:</translation>
</message>
</context>
<context>
@@ -2769,164 +2837,99 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
- <name>Locator::Internal::DirectoryFilterOptions</name>
+ <name>QuickOpen::Internal::DirectoryFilterOptions</name>
<message>
- <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
<source>Name:</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Nazwa:</translation>
</message>
<message>
- <location/>
<source>File Types:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Specify file name filters, separated by comma. Filters may contain wildcards.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Prefix:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree.
-To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Limit to prefix</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Typy plików:</translation>
</message>
<message>
- <location/>
<source>Add...</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Dodaj...</translation>
</message>
<message>
- <location/>
<source>Edit...</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Edycja...</translation>
</message>
<message>
- <location/>
<source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Usuń</translation>
</message>
<message>
- <location/>
<source>Directories:</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Katalogi:</translation>
</message>
</context>
<context>
- <name>Locator::Internal::FileSystemFilterOptions</name>
+ <name>QuickOpen::Internal::FileSystemFilterOptions</name>
<message>
- <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
<source>Filter configuration</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Konfiguracja filtra</translation>
</message>
<message>
- <location/>
<source>Prefix:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Limit to prefix</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Przedrostek:</translation>
</message>
<message>
- <location/>
<source>Include hidden files</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">WÅ‚Ä…cz ukryte pliki</translation>
</message>
<message>
- <location/>
<source>Filter:</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Filtr:</translation>
</message>
</context>
<context>
- <name>Locator::Internal::SettingsWidget</name>
+ <name>QuickOpen::Internal::SettingsWidget</name>
<message>
- <location filename="../../../src/plugins/locator/settingspage.ui"/>
<source>Configure Filters</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Konfiguruj filtry</translation>
</message>
<message>
- <location/>
<source>Add</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Dodaj</translation>
</message>
<message>
- <location/>
<source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Usuń</translation>
</message>
<message>
- <location/>
<source>Edit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Refresh Interval:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source> min</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Edycja</translation>
</message>
</context>
<context>
- <name>Locator::Internal::SettingsDialog</name>
+ <name>QuickOpen::Internal::SettingsDialog</name>
<message>
- <location filename="../../../src/plugins/locator/settingswidget.ui"/>
<source>Configure Filters</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Konfiguruj filtry</translation>
</message>
<message>
- <location/>
<source>Add</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Dodaj</translation>
</message>
<message>
- <location/>
<source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Usuń</translation>
</message>
<message>
- <location/>
<source>Edit...</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Edycja...</translation>
</message>
<message>
- <location/>
- <source>Refresh Interval:</source>
- <translation type="unfinished"></translation>
+ <source>Refresh now!</source>
+ <translation type="obsolete">Odśwież teraz!</translation>
</message>
- <message>
- <location/>
- <source> min</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Refresh now!</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Subversion::Internal::SettingsPage</name>
+</context>
+<context>
+ <name>Subversion::Internal::SettingsPage</name>
<message>
<location filename="../../../src/plugins/subversion/settingspage.ui"/>
<source>Prompt to submit</source>
- <translation>Przypominaj o wysyłaniu zmian do serwera</translation>
+ <translation>Pytaj przed wysłaniem zmian do serwera</translation>
</message>
<message>
<location/>
@@ -2959,97 +2962,97 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location filename="../../../src/plugins/texteditor/behaviorsettingspage.ui"/>
<source>Tabs and Indentation</source>
- <translation type="unfinished"></translation>
+ <translation>Tabulatory i wcięcia</translation>
</message>
<message>
<location/>
<source>Insert &spaces instead of tabs</source>
- <translation type="unfinished"></translation>
+ <translation>Wstawiaj &spacje zamiast tabulatorów</translation>
</message>
<message>
<location/>
<source>Enable automatic &indentation</source>
- <translation type="unfinished"></translation>
+ <translation>Włącz automatyczne wc&ięcia</translation>
</message>
<message>
<location/>
<source>Backspace will go back one indentation level instead of one space.</source>
- <translation type="unfinished"></translation>
+ <translation>Klawisz "Backspace" skasuje spacje aż do poprzedniego wcięcia zamiast jednej spacji.</translation>
</message>
<message>
<location/>
<source>&Backspace follows indentation</source>
- <translation type="unfinished"></translation>
+ <translation>Klawisz "&Backspace" podąża za wcięciami</translation>
</message>
<message>
<location/>
<source>Ta&b size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar ta&bulatorów:</translation>
</message>
<message>
<location/>
<source>&Indent size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar wc&ięć:</translation>
</message>
<message>
<location/>
<source>Tab key performs auto-indent:</source>
- <translation type="unfinished"></translation>
+ <translation>Klawisz "Tab" wykonuje automatyczne wcięcia:</translation>
</message>
<message>
<location/>
<source>Never</source>
- <translation type="unfinished"></translation>
+ <translation>Nigdy</translation>
</message>
<message>
<location/>
<source>Always</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze</translation>
</message>
<message>
<location/>
<source>In leading white space</source>
- <translation type="unfinished"></translation>
+ <translation>Jeśli poprzedzony jest spacją</translation>
</message>
<message>
<location/>
<source>Storage</source>
- <translation type="unfinished"></translation>
+ <translation>Przechowywanie</translation>
</message>
<message>
<location/>
<source>Removes trailing whitespace on saving.</source>
- <translation type="unfinished"></translation>
+ <translation>Usuwa białe znaki na końcu linii podczas zachowywania.</translation>
</message>
<message>
<location/>
<source>&Clean whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>Wy&czyść białe znaki</translation>
</message>
<message>
<location/>
<source>Clean whitespace in entire document instead of only for changed parts.</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść białe znaki w całym dokumencie zamiast tylko w zmienionych częściach.</translation>
</message>
<message>
<location/>
<source>In entire &document</source>
- <translation type="unfinished"></translation>
+ <translation>W całym &dokumencie</translation>
</message>
<message>
<location/>
<source>Correct leading whitespace according to tab settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Popraw białe znaki stosownie do ustawień tabulatorów.</translation>
</message>
<message>
<location/>
<source>Clean indentation</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść wcięcia</translation>
</message>
<message>
<location/>
<source>&Ensure newline at end of file</source>
- <translation type="unfinished"></translation>
+ <translation>Wstawiaj znak now&ej linii na końcu pliku</translation>
</message>
</context>
<context>
@@ -3057,32 +3060,32 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location filename="../../../src/plugins/texteditor/colorschemeedit.ui"/>
<source>Bold</source>
- <translation type="unfinished"></translation>
+ <translation>Pogrubiony</translation>
</message>
<message>
<location/>
<source>Italic</source>
- <translation type="unfinished"></translation>
+ <translation>Kursywa</translation>
</message>
<message>
<location/>
<source>Background:</source>
- <translation type="unfinished"></translation>
+ <translation>Kolor tła:</translation>
</message>
<message>
<location/>
<source>Foreground:</source>
- <translation type="unfinished"></translation>
+ <translation>Kolor pierwszoplanowy:</translation>
</message>
<message>
<location/>
<source>Erase background</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść tło</translation>
</message>
<message>
<location/>
<source>x</source>
- <translation type="unfinished"></translation>
+ <translation>x</translation>
</message>
</context>
<context>
@@ -3095,12 +3098,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location/>
<source>Display line &numbers</source>
- <translation type="unfinished"></translation>
+ <translation>Wyświetlaj &numery linii</translation>
</message>
<message>
<location/>
<source>Highlight current &line</source>
- <translation type="unfinished"></translation>
+ <translation>Podświetlaj bieżącą &linię</translation>
</message>
<message>
<location/>
@@ -3110,52 +3113,52 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location/>
<source>Highlight &blocks</source>
- <translation type="unfinished"></translation>
+ <translation>Podświetlaj &bloki</translation>
</message>
<message>
<location/>
<source>Mark text changes</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczaj zmiany w tekście</translation>
</message>
<message>
<location/>
<source>Show tabs and spaces.</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj tabulatory i spacje.</translation>
</message>
<message>
<location/>
<source>&Visualize whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>&Wizualizuj białe znaki</translation>
</message>
<message>
<location/>
<source>Animate matching parentheses</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj animację pasujących nawiasów</translation>
</message>
<message>
<location/>
<source>Text Wrapping</source>
- <translation type="unfinished"></translation>
+ <translation>Zawijanie tekstu</translation>
</message>
<message>
<location/>
<source>Enable text &wrapping</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚Ä…cz za&wijanie tekstu</translation>
</message>
<message>
<location/>
<source>Display right &margin at column:</source>
- <translation type="unfinished"></translation>
+ <translation>Wyświetl prawy &margines w kolumnie:</translation>
</message>
<message>
<location/>
<source>Navigation</source>
- <translation type="unfinished"></translation>
+ <translation>Nawigacja</translation>
</message>
<message>
<location/>
<source>Enable &mouse navigation</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚Ä…cz nawigacjÄ™ &myszy</translation>
</message>
</context>
<context>
@@ -3163,37 +3166,37 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location filename="../../../src/plugins/texteditor/fontsettingspage.ui"/>
<source>Font</source>
- <translation type="unfinished"></translation>
+ <translation>Czcionka</translation>
</message>
<message>
<location/>
<source>Family:</source>
- <translation type="unfinished"></translation>
+ <translation>Rodzina:</translation>
</message>
<message>
<location/>
<source>Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar:</translation>
</message>
<message>
<location/>
<source>Antialias</source>
- <translation type="unfinished"></translation>
+ <translation>Antyaliasing</translation>
</message>
<message>
<location/>
<source>Color Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Schemat kolorów</translation>
</message>
<message>
<location/>
<source>Copy...</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj...</translation>
</message>
<message>
<location/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
</context>
<context>
@@ -3201,7 +3204,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location filename="../../../src/plugins/vcsbase/basecheckoutwizardpage.ui"/>
<source>WizardPage</source>
- <translation type="unfinished"></translation>
+ <translation>StronaKreatora</translation>
</message>
<message>
<location/>
@@ -3211,7 +3214,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location/>
<source>Path:</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka:</translation>
</message>
</context>
<context>
@@ -3281,26 +3284,26 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/welcome/communitywelcomepagewidget.ui"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz</translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+46"/>
+ <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+47"/>
<source>News From the Qt Labs</source>
- <translation type="unfinished"></translation>
+ <translation>Nowiny z Qt Labs</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Websites</source>
- <translation type="unfinished"></translation>
+ <translation>Strony o Qt</translation>
</message>
<message>
<location line="+8"/>
<source>http://labs.trolltech.com/blogs/feed</source>
<extracomment>Add localized feed here only if one exists</extracomment>
- <translation type="unfinished"></translation>
+ <translation>http://labs.trolltech.com/blogs/feed</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Qt Home</source>
<translation type="unfinished"></translation>
</message>
@@ -3319,6 +3322,11 @@ name <email> alias <email></source>
<source>Qt Centre</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Apps</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+1"/>
<source>Qt for Symbian at Forum Nokia</source>
@@ -3332,7 +3340,9 @@ name <email> alias <email></source>
<source>#gradientWidget {
background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
}</source>
- <translation type="unfinished"></translation>
+ <translation>#gradientWidget {
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
+}</translation>
</message>
<message>
<location/>
@@ -3341,22 +3351,26 @@ name <email> alias <email></source>
border-width: 0;
}
</source>
- <translation type="unfinished"></translation>
+ <translation>#headerFrame {
+ border-image: url(:/welcome/images/center_frame_header.png) 0;
+ border-width: 0;
+}
+</translation>
</message>
<message>
<location/>
<source>Help us make Qt Creator even better</source>
- <translation type="unfinished"></translation>
+ <translation>Pomóż nam ulepszyć Qt Creatora</translation>
</message>
<message>
<location/>
<source>Feedback</source>
- <translation type="unfinished"></translation>
+ <translation>Wyraź opinię</translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+115"/>
+ <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+116"/>
<source>Welcome</source>
- <translation type="unfinished"></translation>
+ <translation>Powitanie</translation>
</message>
</context>
<context>
@@ -3411,12 +3425,12 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/shared/help/filternamedialog.ui"/>
<source>Add Filter Name</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj nazwÄ™ filtra</translation>
</message>
<message>
<location/>
<source>Filter Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa filtra:</translation>
</message>
</context>
<context>
@@ -3452,37 +3466,37 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/shared/proparser/proeditor.ui"/>
<source>New</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy</translation>
</message>
<message>
<location/>
<source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
<message>
<location/>
<source>Up</source>
- <translation type="unfinished"></translation>
+ <translation>W górę</translation>
</message>
<message>
<location/>
<source>Down</source>
- <translation type="unfinished"></translation>
+ <translation>W dół</translation>
</message>
<message>
<location filename="../../../src/shared/proparser/proeditor.cpp" line="+51"/>
<source>Cut</source>
- <translation type="unfinished"></translation>
+ <translation>Wytnij</translation>
</message>
<message>
<location line="+1"/>
<source>Copy</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj</translation>
</message>
<message>
<location line="+1"/>
<source>Paste</source>
- <translation type="unfinished"></translation>
+ <translation>Wklej</translation>
</message>
<message>
<location line="+37"/>
@@ -3492,7 +3506,7 @@ name <email> alias <email></source>
<message>
<location line="+1"/>
<source>Ctrl+C</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+C</translation>
</message>
<message>
<location line="+1"/>
@@ -3502,17 +3516,17 @@ name <email> alias <email></source>
<message>
<location line="+9"/>
<source>Add Variable</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj zmiennÄ…</translation>
</message>
<message>
<location line="+1"/>
<source>Add Scope</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj zakres</translation>
</message>
<message>
<location line="+1"/>
<source>Add Block</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj blok</translation>
</message>
</context>
<context>
@@ -3520,42 +3534,42 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/shared/proparser/valueeditor.ui"/>
<source>Edit Variable</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj zmiennÄ…</translation>
</message>
<message>
<location/>
<source>Variable Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa zmiennej:</translation>
</message>
<message>
<location/>
<source>Assignment Operator:</source>
- <translation type="unfinished"></translation>
+ <translation>Operator podstawienia:</translation>
</message>
<message>
<location/>
<source>Variable:</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienna:</translation>
</message>
<message>
<location/>
<source>Append (+=)</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj (+=)</translation>
</message>
<message>
<location/>
<source>Remove (-=)</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń (-=)</translation>
</message>
<message>
<location/>
<source>Replace (~=)</source>
- <translation type="unfinished"></translation>
+ <translation>ZastÄ…p (~=)</translation>
</message>
<message>
<location/>
<source>Set (=)</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw (=)</translation>
</message>
<message>
<location/>
@@ -3565,52 +3579,52 @@ name <email> alias <email></source>
<message>
<location/>
<source>Select Item</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz element</translation>
</message>
<message>
<location/>
<source>Edit Item</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj element</translation>
</message>
<message>
<location/>
<source>Select Items</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz elementy</translation>
</message>
<message>
<location/>
<source>Edit Items</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj elementy</translation>
</message>
<message>
<location/>
<source>New</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy</translation>
</message>
<message>
<location/>
<source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
<message>
<location filename="../../../src/shared/proparser/valueeditor.cpp" line="+252"/>
<source>Edit Values</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj wartości</translation>
</message>
<message>
<location line="+3"/>
<source>Edit %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj %1</translation>
</message>
<message>
<location line="+69"/>
<source>Edit Scope</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj zakres</translation>
</message>
<message>
<location line="+14"/>
<source>Edit Advanced Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj zaawansowane wyrażenie</translation>
</message>
</context>
<context>
@@ -3649,7 +3663,7 @@ name <email> alias <email></source>
<context>
<name>Application</name>
<message>
- <location filename="../../../src/app/main.cpp" line="+147"/>
+ <location filename="../../../src/app/main.cpp" line="+129"/>
<source>Failed to load core: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3684,12 +3698,12 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/libs/cplusplus/OverviewModel.cpp" line="+153"/>
<source><Select Symbol></source>
- <translation type="unfinished"></translation>
+ <translation><Wybierz symbol></translation>
</message>
<message>
<location line="+2"/>
<source><No Symbols></source>
- <translation type="unfinished"></translation>
+ <translation><Brak symbolu></translation>
</message>
</context>
<context>
@@ -3698,17 +3712,17 @@ name <email> alias <email></source>
<location filename="../../../src/libs/extensionsystem/optionsparser.cpp" line="+106"/>
<location line="+18"/>
<source>The plugin '%1' does not exist.</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczka "%1" nie istnieje.</translation>
</message>
<message>
<location line="+45"/>
<source>Unknown option %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nieznana opcja %1</translation>
</message>
<message>
<location line="+12"/>
<source>The option %1 requires an argument.</source>
- <translation type="unfinished"></translation>
+ <translation>Opcja %1 wymaga argumentu.</translation>
</message>
</context>
<context>
@@ -3741,7 +3755,7 @@ name <email> alias <email></source>
<message>
<location line="+1"/>
<source>Dependencies are successfully resolved</source>
- <translation type="unfinished"></translation>
+ <translation>Zależności zostały pomyślnie rozwiązane</translation>
</message>
<message>
<location line="+3"/>
@@ -3761,7 +3775,7 @@ name <email> alias <email></source>
<message>
<location line="+1"/>
<source>Plugin's initialization method succeeded</source>
- <translation type="unfinished"></translation>
+ <translation>Inicjalizacja wtyczki zakończona pomyślnie</translation>
</message>
<message>
<location line="+3"/>
@@ -3771,7 +3785,7 @@ name <email> alias <email></source>
<message>
<location line="+1"/>
<source>Plugin successfully loaded and running</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczka pomyślnie załadowana i uruchomiona</translation>
</message>
<message>
<location line="+3"/>
@@ -3825,7 +3839,7 @@ name <email> alias <email></source>
<location line="+29"/>
<source>Cannot load plugin because dependency failed to load: %1(%2)
Reason: %3</source>
- <translation>Nie można załadować wtyczki ponieważ nie powiodło się załadowanie zależności: %1(%2)
+ <translation>Nie można załadować wtyczki ponieważ załadowanie zależności: %1(%2) zakończyło sie niepowodzeniem
Przyczyna: %3</translation>
</message>
</context>
@@ -3912,7 +3926,7 @@ Przyczyna: %3</translation>
<message>
<location line="+6"/>
<source>Plugin initialization failed: %1</source>
- <translation>Inicjalizacja wtyczki nie powiodła się: %1</translation>
+ <translation>Nie można zainicjalizować wtyczki: %1</translation>
</message>
<message>
<location line="+19"/>
@@ -3976,22 +3990,22 @@ Przyczyna: %3</translation>
<message>
<location filename="../../../src/libs/utils/consoleprocess.cpp" line="+49"/>
<source>Cannot set up communication channel: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można ustawić kanału komunikacyjnego: %1</translation>
</message>
<message>
<location line="+7"/>
<source>Press <RETURN> to close this window...</source>
- <translation type="unfinished"></translation>
+ <translation>Naciśnij <RETURN> aby zamknąć to okno...</translation>
</message>
<message>
<location line="+5"/>
<source>Cannot create temporary file: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć tymczasowego pliku: %1</translation>
</message>
<message>
<location line="+5"/>
<source>Cannot create temporary directory '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć tymczasowego katalogu "%1": %2</translation>
</message>
<message>
<location line="+5"/>
@@ -4006,7 +4020,7 @@ Przyczyna: %3</translation>
<message>
<location line="+5"/>
<source>Cannot execute '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić "%1": %2</translation>
</message>
<message>
<location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+111"/>
@@ -4016,22 +4030,22 @@ Przyczyna: %3</translation>
<message>
<location line="+49"/>
<source>Cannot create socket '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć gniazda "%1": %2</translation>
</message>
<message>
<location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+125"/>
<source>The process '%1' could not be started: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Proces "%1" nie może zostać rozpoczęty: %2</translation>
</message>
<message>
<location line="+70"/>
<source>Cannot obtain a handle to the inferior: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie otrzymano uchwytu do podprocesu: %1</translation>
</message>
<message>
<location line="+30"/>
<source>Cannot obtain exit status from inferior: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie otrzymano kodu wyjściowego podprocesu: %1</translation>
</message>
</context>
<context>
@@ -4108,7 +4122,7 @@ Przyczyna: %3</translation>
<translation>PrzeglÄ…daj...</translation>
</message>
<message>
- <location line="+122"/>
+ <location line="+123"/>
<source>Choose a directory</source>
<translation>Wybierz katalog</translation>
</message>
@@ -4313,7 +4327,7 @@ Przyczyna: %3</translation>
<message>
<location line="+14"/>
<source>Build Environment</source>
- <translation>Åšrodowisko budowania</translation>
+ <translation>Åšrodowisko procesu budowania</translation>
</message>
</context>
<context>
@@ -4321,7 +4335,7 @@ Przyczyna: %3</translation>
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+125"/>
<source>CMake Wizard</source>
- <translation type="unfinished"></translation>
+ <translation>Kreator CMake</translation>
</message>
</context>
<context>
@@ -4329,7 +4343,7 @@ Przyczyna: %3</translation>
<message>
<location line="+91"/>
<source>Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator wykrył wersję zbudowaną <b>wewnątrz %1</b> co uniemożliwia zbudowanie wersji na zewnątrz. Qt Creator nie umożliwia zmiany katalogu wersji. Jeśli chcesz zbudować wersję na zewnątrz, wyczyść katalog ze źródłami i otwórz ponownie projekt.</translation>
</message>
</context>
<context>
@@ -4342,12 +4356,12 @@ Przyczyna: %3</translation>
<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>Podaj katalog w którym chcesz zbudować swój projekt. Qt Creator poleca aby nie budować projektu w katalogu ze źródłami. Dzięki temu katalog ze źródłami pozostaje czysty i możliwe jest zbudowanie wielu wersji z różnymi ustawieniami na podstawie tych samych źródeł.</translation>
+ <translation>Podaj katalog w którym chcesz zbudować swój projekt. Zaleca się aby nie budować projektu w katalogu ze źródłami. Dzięki temu katalog ze źródłami pozostaje czysty i możliwe jest zbudowanie wielu wersji z różnymi ustawieniami na podstawie tych samych źródeł.</translation>
</message>
<message>
<location line="+8"/>
<source>Build directory:</source>
- <translation>Katalog budowania:</translation>
+ <translation>Katalog wersji:</translation>
</message>
</context>
<context>
@@ -4355,32 +4369,32 @@ Przyczyna: %3</translation>
<message>
<location line="+31"/>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
- <translation type="unfinished"></translation>
+ <translation>Podaj ścieżkę do programu cmake. Programu cmake nie wykryto w ścieżce.</translation>
</message>
<message>
<location line="+5"/>
<source> The cmake executable (%1) does not exist.</source>
- <translation type="unfinished"></translation>
+ <translation> Program cmake (%1) nie istnieje.</translation>
</message>
<message>
<location line="+2"/>
<source> The path %1 is not a executable.</source>
- <translation type="unfinished"></translation>
+ <translation> Ścieżka %1 nie wskazuje na program.</translation>
</message>
<message>
<location line="+2"/>
<source> The path %1 is not a valid cmake.</source>
- <translation type="unfinished"></translation>
+ <translation> Ścieżka %1 nie pokazuje na poprawny program cmake.</translation>
</message>
<message>
<location line="+17"/>
<source>Run CMake</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom CMake</translation>
</message>
<message>
<location line="+8"/>
<source>Arguments</source>
- <translation type="unfinished"></translation>
+ <translation>Argumenty</translation>
</message>
<message>
<location line="+19"/>
@@ -4410,22 +4424,22 @@ Przyczyna: %3</translation>
<message>
<location line="+31"/>
<source>NMake Generator</source>
- <translation type="unfinished"></translation>
+ <translation>Generator NMake</translation>
</message>
<message>
<location line="+3"/>
<source>NMake Generator (%1)</source>
- <translation type="unfinished"></translation>
+ <translation>Generator NMake (%1)</translation>
</message>
<message>
<location line="+6"/>
<source>MinGW Generator</source>
- <translation type="unfinished"></translation>
+ <translation>Generator MinGW</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+56"/>
<source>No valid cmake executable specified.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak poprawnego programu cmake.</translation>
</message>
</context>
<context>
@@ -4433,23 +4447,23 @@ Przyczyna: %3</translation>
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+89"/>
<source>Create</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz</translation>
</message>
<message>
<location line="+10"/>
<source>New configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Nowa konfiguracja</translation>
</message>
<message>
<location line="+1"/>
<source>New Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa nowej konfiguracji:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location line="+699"/>
+ <location line="+702"/>
<source>&Change</source>
<translation>&Zmień</translation>
</message>
@@ -4457,7 +4471,7 @@ Przyczyna: %3</translation>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+248"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+246"/>
<location line="+10"/>
<source>CMake</source>
<translation>CMake</translation>
@@ -4493,7 +4507,7 @@ Przyczyna: %3</translation>
<message>
<location line="+13"/>
<source>Run Environment</source>
- <translation>Åšrodowisko uruchamiania</translation>
+ <translation>Åšrodowisko procesu uruchamiania</translation>
</message>
<message>
<location line="+10"/>
@@ -4513,7 +4527,7 @@ Przyczyna: %3</translation>
<message>
<location line="+1"/>
<source>Build Environment</source>
- <translation>Åšrodowisko budowania</translation>
+ <translation>Åšrodowisko procesu budowania</translation>
</message>
<message>
<location line="+91"/>
@@ -4524,19 +4538,19 @@ Przyczyna: %3</translation>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+163"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+165"/>
<source>Additional arguments:</source>
<translation>Dodatkowe argumenty:</translation>
</message>
<message>
<location line="+6"/>
<source>Targets:</source>
- <translation type="unfinished"></translation>
+ <translation>Produkty docelowe:</translation>
</message>
<message>
<location line="+59"/>
<source><b>Make:</b> %1 %2</source>
- <translation type="unfinished"></translation>
+ <translation><b>Make:</b> %1 %2</translation>
</message>
</context>
<context>
@@ -4723,12 +4737,12 @@ Czy chcesz je nadpisać?</translation>
<name>Core::EditorManager</name>
<message>
<location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+187"/>
- <location line="+1491"/>
+ <location line="+1493"/>
<source>Revert to Saved</source>
<translation>Przywróć do zachowanego</translation>
</message>
<message>
- <location line="-1488"/>
+ <location line="-1490"/>
<location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+531"/>
<source>Close</source>
<translation>Zamknij</translation>
@@ -4740,12 +4754,12 @@ Czy chcesz je nadpisać?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1290"/>
+ <location line="+1292"/>
<source>Close Others</source>
<translation>Zamknij inne</translation>
</message>
<message>
- <location line="-1289"/>
+ <location line="-1291"/>
<source>Next Open Document in History</source>
<translation>Następny otwarty dokument w historii</translation>
</message>
@@ -4857,7 +4871,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+4"/>
<source>Remove Current Split</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń bieżący podział</translation>
</message>
<message>
<location line="+2"/>
@@ -4867,7 +4881,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+4"/>
<source>Remove All Splits</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń wszystkie podziały</translation>
</message>
<message>
<location line="+2"/>
@@ -4877,7 +4891,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+4"/>
<source>Goto Other Split</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do kolejnego edytora</translation>
</message>
<message>
<location line="+2"/>
@@ -4932,20 +4946,20 @@ Czy chcesz je nadpisać?</translation>
</message>
<message>
<location line="+2"/>
- <location line="+132"/>
+ <location line="+134"/>
<source>Make writable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-128"/>
+ <location line="-130"/>
<source>Save as ...</source>
<translation>Zachowaj jako ...</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+8"/>
<source>Failed!</source>
- <translation type="unfinished"></translation>
+ <translation>Niepomyślnie zakończone!</translation>
</message>
<message>
<location line="-8"/>
@@ -4965,7 +4979,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+15"/>
<source>Save %1 As...</source>
- <translation>Zachowaj %1 jalo...</translation>
+ <translation>Zachowaj %1 jako...</translation>
</message>
<message>
<location line="+1"/>
@@ -5013,37 +5027,37 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/editormanager/editorsplitter.cpp" line="+75"/>
<source>Split Left/Right</source>
- <translation type="unfinished"></translation>
+ <translation>Podziel lewo / prawo</translation>
</message>
<message>
<location line="+7"/>
<source>Split Top/Bottom</source>
- <translation type="unfinished"></translation>
+ <translation>Podziel góra / dół</translation>
</message>
<message>
<location line="+7"/>
<source>Unsplit</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń podział</translation>
</message>
<message>
<location line="+11"/>
<source>Default Splitter Layout</source>
- <translation type="unfinished"></translation>
+ <translation>Domyślne rozmieszczenie podziału</translation>
</message>
<message>
<location line="+3"/>
<source>Save Current as Default</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj bieżący jako domyślny</translation>
</message>
<message>
<location line="+7"/>
<source>Restore Default Layout</source>
- <translation type="unfinished"></translation>
+ <translation>Przywróć domyślne rozmieszczenie</translation>
</message>
<message>
<location line="+11"/>
<source>Previous Document</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzedni dokument</translation>
</message>
<message>
<location line="+2"/>
@@ -5053,7 +5067,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+5"/>
<source>Next Document</source>
- <translation type="unfinished"></translation>
+ <translation>Następny dokument</translation>
</message>
<message>
<location line="+2"/>
@@ -5063,22 +5077,22 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+6"/>
<source>Previous Group</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia grupa</translation>
</message>
<message>
<location line="+6"/>
<source>Next Group</source>
- <translation type="unfinished"></translation>
+ <translation>Następna grupa</translation>
</message>
<message>
<location line="+6"/>
<source>Move Document to Previous Group</source>
- <translation type="unfinished"></translation>
+ <translation>PrzenieÅ› dokument do poprzedniej grupy</translation>
</message>
<message>
<location line="+6"/>
<source>Move Document to Next Group</source>
- <translation type="unfinished"></translation>
+ <translation>Przenieś dokument do następnej grupy</translation>
</message>
</context>
<context>
@@ -5088,6 +5102,11 @@ Czy chcesz je nadpisać?</translation>
<source>Go Back</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+0"/>
+ <source>Go Back</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+2"/>
<source>Go Forward</source>
@@ -5097,12 +5116,12 @@ Czy chcesz je nadpisać?</translation>
<location line="+73"/>
<location line="+37"/>
<source>Placeholder</source>
- <translation type="unfinished"></translation>
+ <translation>Pojemnik</translation>
</message>
<message>
<location line="-31"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij</translation>
</message>
<message>
<location line="+213"/>
@@ -5117,7 +5136,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+57"/>
<source>Copy full path to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj pełną ścieżkę do schowka</translation>
</message>
</context>
<context>
@@ -5126,32 +5145,32 @@ Czy chcesz je nadpisać?</translation>
<location filename="../../../src/plugins/coreplugin/editormanager/openeditorsview.cpp" line="+100"/>
<location line="+147"/>
<source>Open Documents</source>
- <translation type="unfinished"></translation>
+ <translation>Otwarte dokumenty</translation>
</message>
<message>
<location line="-39"/>
<source>Close %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij %1</translation>
</message>
<message>
<location line="+1"/>
<source>Close Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij edytor</translation>
</message>
<message>
<location line="+2"/>
<source>Close All Except %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij wszystko oprócz %1</translation>
</message>
<message>
<location line="+1"/>
<source>Close Other Editors</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij pozostałe edytory</translation>
</message>
<message>
<location line="+1"/>
<source>Close All Editors</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij wszystkie edytory</translation>
</message>
</context>
<context>
@@ -5183,7 +5202,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+1"/>
<source>An item named '%1' already exists at this location. Do you want to overwrite it?</source>
- <translation type="unfinished"></translation>
+ <translation>Element o nazwie "%1" istnieje już w tym miejscu. Czy chcesz go nadpisać?</translation>
</message>
<message>
<location line="+35"/>
@@ -5196,69 +5215,69 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+157"/>
<source>Qt Creator</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator</translation>
</message>
<message>
<location line="+143"/>
<source>Output</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjścia</translation>
</message>
<message>
<location line="+161"/>
<source>&File</source>
- <translation type="unfinished"></translation>
+ <translation>&Plik</translation>
</message>
<message>
<location line="+14"/>
<source>&Edit</source>
- <translation type="unfinished"></translation>
+ <translation>&Edycja</translation>
</message>
<message>
<location line="+11"/>
<source>&Tools</source>
- <translation type="unfinished"></translation>
+ <translation>&Narzędzia</translation>
</message>
<message>
<location line="+5"/>
<source>&Window</source>
- <translation type="unfinished"></translation>
+ <translation>&Okno</translation>
</message>
<message>
<location line="+10"/>
<source>&Help</source>
- <translation type="unfinished"></translation>
+ <translation>P&omoc</translation>
</message>
<message>
<location line="+62"/>
<source>&New File or Project...</source>
- <translation type="unfinished"></translation>
+ <translation>&Nowy plik lub projekt...</translation>
</message>
<message>
<location line="+7"/>
<source>&Open File or Project...</source>
- <translation type="unfinished"></translation>
+ <translation>&Otwórz plik lub projekt...</translation>
</message>
<message>
<location line="+7"/>
<source>&Open File With...</source>
- <translation type="unfinished"></translation>
+ <translation>&Otwórz plik przy pomocy...</translation>
</message>
<message>
<location line="+8"/>
<source>Recent Files</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnie pliki</translation>
</message>
<message>
<location line="+3"/>
<location line="+4"/>
<source>&Save</source>
- <translation type="unfinished"></translation>
+ <translation>&Zachowaj</translation>
</message>
<message>
<location line="+4"/>
<location line="+6"/>
<source>Save &As...</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj j&ako...</translation>
</message>
<message>
<location line="-3"/>
@@ -5269,17 +5288,17 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="-3"/>
<source>Save A&ll</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj &wszystko</translation>
</message>
<message>
<location line="+9"/>
<source>&Print...</source>
- <translation type="unfinished"></translation>
+ <translation>Wy&drukuj...</translation>
</message>
<message>
<location line="+5"/>
<source>E&xit</source>
- <translation type="unfinished"></translation>
+ <translation>Za&kończ</translation>
</message>
<message>
<location line="+2"/>
@@ -5290,38 +5309,38 @@ Czy chcesz je nadpisać?</translation>
<location line="+5"/>
<location line="+4"/>
<source>&Undo</source>
- <translation type="unfinished"></translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+5"/>
<location line="+4"/>
<source>&Redo</source>
- <translation type="unfinished"></translation>
+ <translation>&Przywróć</translation>
</message>
<message>
<location line="+5"/>
<source>Cu&t</source>
- <translation type="unfinished"></translation>
+ <translation>Wy&tnij</translation>
</message>
<message>
<location line="+7"/>
<source>&Copy</source>
- <translation type="unfinished"></translation>
+ <translation>S&kopiuj</translation>
</message>
<message>
<location line="+7"/>
<source>&Paste</source>
- <translation type="unfinished"></translation>
+ <translation>Wk&lej</translation>
</message>
<message>
<location line="+7"/>
<source>&Select All</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznacz &wszystko</translation>
</message>
<message>
<location line="+7"/>
<source>&Go To Line...</source>
- <translation type="unfinished"></translation>
+ <translation>Przej&dź do linii...</translation>
</message>
<message>
<location line="+2"/>
@@ -5331,53 +5350,53 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+5"/>
<source>&Options...</source>
- <translation type="unfinished"></translation>
+ <translation>&Opcje...</translation>
</message>
<message>
<location line="+11"/>
<source>Minimize</source>
- <translation type="unfinished"></translation>
+ <translation>Zminimalizuj</translation>
</message>
<message>
<location line="+7"/>
<source>Zoom</source>
- <translation type="unfinished"></translation>
+ <translation>Powiększ</translation>
</message>
<message>
<location line="+12"/>
<source>Show Sidebar</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż boczny pasek</translation>
</message>
<message>
<location line="+15"/>
<source>Full Screen</source>
- <translation type="unfinished"></translation>
+ <translation>Pełny ekran</translation>
</message>
<message>
<location line="+10"/>
<source>About &Qt Creator</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje o &Qt Creator</translation>
</message>
<message>
<location line="+2"/>
<source>About &Qt Creator...</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje o &Qt Creator...</translation>
</message>
<message>
<location line="+11"/>
<source>About &Plugins...</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje o wtyczkach...</translation>
</message>
<message>
<location line="+25"/>
<source>New...</source>
<comment>Title of dialog</comment>
- <translation type="unfinished"></translation>
+ <translation>Nowy...</translation>
</message>
<message>
<location line="+511"/>
<source>Settings...</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia...</translation>
</message>
</context>
<context>
@@ -5385,7 +5404,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/messageoutputwindow.cpp" line="+76"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
</message>
</context>
<context>
@@ -5393,7 +5412,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+145"/>
<source>Switch to %1 mode</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do trybu %1</translation>
</message>
</context>
<context>
@@ -5401,7 +5420,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/navigationwidget.cpp" line="+344"/>
<source>Activate %1 Pane</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktywnij panel %1</translation>
</message>
</context>
<context>
@@ -5409,12 +5428,12 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+37"/>
<source>Split</source>
- <translation type="unfinished"></translation>
+ <translation>Podziel</translation>
</message>
<message>
<location line="+3"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij</translation>
</message>
</context>
<context>
@@ -5422,7 +5441,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+143"/>
<source>Activate %1</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktywnij %1</translation>
</message>
</context>
<context>
@@ -5430,27 +5449,27 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+173"/>
<source>Output</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjścia</translation>
</message>
<message>
<location line="+4"/>
<source>Clear</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść</translation>
</message>
<message>
<location line="+5"/>
<source>Next Item</source>
- <translation type="unfinished"></translation>
+ <translation>Następny element</translation>
</message>
<message>
<location line="+5"/>
<source>Previous Item</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzedni element</translation>
</message>
<message>
<location line="+62"/>
<source>Output &Panes</source>
- <translation type="unfinished"></translation>
+ <translation>&Panele wyjściowe</translation>
</message>
</context>
<context>
@@ -5458,32 +5477,32 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/plugindialog.cpp" line="+54"/>
<source>Details</source>
- <translation type="unfinished"></translation>
+ <translation>Szczegóły</translation>
</message>
<message>
<location line="+1"/>
<source>Error Details</source>
- <translation type="unfinished"></translation>
+ <translation>Szczegóły błędów</translation>
</message>
<message>
<location line="+1"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij</translation>
</message>
<message>
<location line="+15"/>
<source>Installed Plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Zainstalowane wtyczki</translation>
</message>
<message>
<location line="+35"/>
<source>Plugin Details of %1</source>
- <translation type="unfinished"></translation>
+ <translation>Szczegóły wtyczki %1</translation>
</message>
<message>
<location line="+20"/>
<source>Plugin Errors of %1</source>
- <translation type="unfinished"></translation>
+ <translation>Błędy wtyczki %1</translation>
</message>
</context>
<context>
@@ -5491,7 +5510,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/progressmanager/progressview.cpp" line="+47"/>
<source>Processes</source>
- <translation type="unfinished"></translation>
+ <translation>Procesy</translation>
</message>
</context>
<context>
@@ -5500,12 +5519,13 @@ Czy chcesz je nadpisać?</translation>
<location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+228"/>
<source>Exception at line %1: %2
%3</source>
- <translation type="unfinished"></translation>
+ <translation>WyjÄ…tek w linii %1: %2
+%3</translation>
</message>
<message>
<location line="+66"/>
<source>Unknown error</source>
- <translation type="unfinished"></translation>
+ <translation>Nieznany błąd</translation>
</message>
</context>
<context>
@@ -5513,12 +5533,12 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="+241"/>
<source>Split</source>
- <translation type="unfinished"></translation>
+ <translation>Podziel</translation>
</message>
<message>
<location line="+5"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij</translation>
</message>
</context>
<context>
@@ -5526,7 +5546,7 @@ Czy chcesz je nadpisać?</translation>
<message>
<location line="+125"/>
<source>Activate %1</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktywnij %1</translation>
</message>
</context>
<context>
@@ -5534,13 +5554,14 @@ Czy chcesz je nadpisać?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+132"/>
<source>Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>System kontroli wersji</translation>
</message>
<message>
<location line="+1"/>
<source>Would you like to remove this file from the version control system (%1)?
Note: This might remove the local file.</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz usunąć ten plik z systemu kontroli wersji (%1)?
+Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
</message>
</context>
<context>
@@ -5548,13 +5569,13 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/coreplugin/versiondialog.cpp" line="+58"/>
<source>About Qt Creator</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje o Qt Creator</translation>
</message>
<message>
<location line="+11"/>
<source>From revision %1<br/></source>
<extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Z rewizji %1<br/></translation>
</message>
<message>
<location line="+3"/>
@@ -5565,7 +5586,17 @@ Note: This might remove the local file.</source>
<context>
<name>CodePaster::CodePasterProtocol</name>
<message>
- <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+129"/>
+ <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+70"/>
+ <source>No Server defined in the CodePaster preferences.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>No Server defined in the CodePaster options.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>No such paste</source>
<translation type="unfinished"></translation>
</message>
@@ -5574,13 +5605,22 @@ Note: This might remove the local file.</source>
<name>CodePaster::CodePasterSettingsPage</name>
<message>
<location filename="../../../src/plugins/cpaster/codepastersettings.cpp" line="+59"/>
- <location line="+10"/>
<source>CodePaster</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+10"/>
+ <source>Code Pasting</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+6"/>
<source>Server:</source>
+ <translation>Serwer:</translation>
+ </message>
+ <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>
</message>
</context>
@@ -5588,13 +5628,13 @@ Note: This might remove the local file.</source>
<name>CodePaster::CodepasterPlugin</name>
<message>
<location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
- <source>&CodePaster</source>
+ <source>&Code Pasting</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Paste Snippet...</source>
- <translation type="unfinished"></translation>
+ <translation>Wklej urywek...</translation>
</message>
<message>
<location line="+2"/>
@@ -5604,7 +5644,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+4"/>
<source>Fetch Snippet...</source>
- <translation type="unfinished"></translation>
+ <translation>Sprowadź urywek...</translation>
</message>
<message>
<location line="+2"/>
@@ -5614,12 +5654,12 @@ Note: This might remove the local file.</source>
<message>
<location line="+87"/>
<source>This protocol supports no listing</source>
- <translation type="unfinished"></translation>
+ <translation>Ten protokół nie obsługuje listingów</translation>
</message>
<message>
<location line="+13"/>
<source>Waiting for items</source>
- <translation type="unfinished"></translation>
+ <translation>Oczekiwanie na elementy</translation>
</message>
</context>
<context>
@@ -5627,7 +5667,7 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpaster/pastebindotcomprotocol.cpp" line="+106"/>
<source>Error during paste</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas wklejania</translation>
</message>
</context>
<context>
@@ -5635,11 +5675,11 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpaster/pastebindotcomsettings.cpp" line="+53"/>
<source>Pastebin.com</source>
- <translation type="unfinished"></translation>
+ <translation>Pastebin.com</translation>
</message>
<message>
<location line="+10"/>
- <source>CodePaster</source>
+ <source>Code Pasting</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -5648,25 +5688,25 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpaster/pasteview.cpp" line="+89"/>
<source>Paste</source>
- <translation type="unfinished"></translation>
+ <translation>Wklej</translation>
</message>
<message>
<location line="+11"/>
<location line="+46"/>
<source><Username></source>
- <translation type="unfinished"></translation>
+ <translation><Nazwa użytkownika></translation>
</message>
<message>
<location line="-38"/>
<location line="+43"/>
<source><Description></source>
- <translation type="unfinished"></translation>
+ <translation><Opis></translation>
</message>
<message>
<location line="-35"/>
<location line="+40"/>
<source><Comment></source>
- <translation type="unfinished"></translation>
+ <translation><Komentarz></translation>
</message>
</context>
<context>
@@ -5674,17 +5714,17 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cppeditor/cppclasswizard.cpp" line="+63"/>
<source>Enter class name</source>
- <translation type="unfinished"></translation>
+ <translation>Wprowadź nazwę klasy</translation>
</message>
<message>
<location line="+1"/>
<source>The header and source file names will be derived from the class name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwy pliku nagłówkowego i źródłowego będą zaproponowane na podstawie nazwy klasy</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Configure...</source>
- <translation type="unfinished"></translation>
+ <translation>Skonfiguruj...</translation>
</message>
</context>
<context>
@@ -5692,33 +5732,33 @@ Note: This might remove the local file.</source>
<message>
<location line="+50"/>
<source>C++ Class Wizard</source>
- <translation type="unfinished"></translation>
+ <translation>Kreator klasy C++</translation>
</message>
</context>
<context>
<name>CppEditor::Internal::CppClassWizard</name>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Error while generating file contents.</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd podczas generowania zawartości.</translation>
</message>
</context>
<context>
<name>CppEditor::Internal::CPPEditor</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+612"/>
+ <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+615"/>
<source>Sort alphabetically</source>
- <translation type="unfinished"></translation>
+ <translation>Posortuj alfabetycznie</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+163"/>
<source>This change cannot be undone.</source>
- <translation type="unfinished"></translation>
+ <translation>Ta zmiana nie może być cofnięta.</translation>
</message>
<message>
<location line="+1"/>
<source>Yes, I know what I am doing.</source>
- <translation type="unfinished"></translation>
+ <translation>Tak, wiem co robiÄ™.</translation>
</message>
</context>
<context>
@@ -5726,7 +5766,7 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cppeditor/cpphoverhandler.cpp" line="+87"/>
<source>Unfiltered</source>
- <translation type="unfinished"></translation>
+ <translation>Nieprzefiltrowane</translation>
</message>
</context>
<context>
@@ -5734,52 +5774,52 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+174"/>
<source>C++</source>
- <translation type="unfinished"></translation>
+ <translation>C++</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a C++ header file.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy plik nagłówkowy C++.</translation>
</message>
<message>
<location line="+1"/>
<source>C++ Header File</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nagłówkowy C++</translation>
</message>
<message>
<location line="+3"/>
<source>Creates a C++ source file.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy plik źródłowy C++.</translation>
</message>
<message>
<location line="+1"/>
<source>C++ Source File</source>
- <translation type="unfinished"></translation>
+ <translation>Plik źródłowy C++</translation>
</message>
<message>
<location line="+4"/>
<source>C++ Class</source>
- <translation type="unfinished"></translation>
+ <translation>Klasa C++</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a header and a source file for a new class.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy plik nagłówkowy i źródłowy dla nowej klasy.</translation>
</message>
<message>
<location line="+11"/>
<source>Follow Symbol under Cursor</source>
- <translation type="unfinished"></translation>
+ <translation>Podążaj za symbolem pod kursorem</translation>
</message>
<message>
<location line="+9"/>
<source>Switch between Method Declaration/Definition</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz między deklaracją a definicją metody</translation>
</message>
<message>
<location line="+9"/>
<source>Find Usages</source>
- <translation type="unfinished"></translation>
+ <translation>Znajdź użycia</translation>
</message>
<message>
<location line="+2"/>
@@ -5789,7 +5829,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+5"/>
<source>Rename Symbol under Cursor</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień nazwę symbolu pod kursorem</translation>
</message>
</context>
<context>
@@ -5797,12 +5837,12 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpptools/completionsettingspage.cpp" line="+57"/>
<source>Completion</source>
- <translation type="unfinished"></translation>
+ <translation>Uzupełnianie</translation>
</message>
<message>
<location line="+10"/>
<source>Text Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor tekstu</translation>
</message>
</context>
<context>
@@ -5810,15 +5850,15 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpptools/cppclassesfilter.h" line="+46"/>
<source>Classes</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy</translation>
</message>
</context>
<context>
<name>CppTools::Internal::FunctionArgumentWidget</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+433"/>
+ <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+434"/>
<source>%1 of %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 z %2</translation>
</message>
</context>
<context>
@@ -5826,7 +5866,7 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpptools/cppcurrentdocumentfilter.h" line="+53"/>
<source>Methods in current Document</source>
- <translation type="unfinished"></translation>
+ <translation>Metody w bieżącym dokumencie</translation>
</message>
</context>
<context>
@@ -5845,30 +5885,30 @@ Note: This might remove the local file.</source>
<message>
<location line="+157"/>
<source>Edit...</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj...</translation>
</message>
<message>
<location line="+51"/>
<source>Choose a location for the new license template file</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz położenie nowego pliku z szablonem licencji</translation>
</message>
<message>
<location line="+5"/>
<source>Template write error</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d zapisywania szablonu</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot write to %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać do %1: %2</translation>
</message>
</context>
<context>
<name>CppTools::Internal::CppFindReferences</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+658"/>
+ <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+238"/>
<source>Searching...</source>
- <translation type="unfinished"></translation>
+ <translation>Przeszukiwanie...</translation>
</message>
</context>
<context>
@@ -5876,15 +5916,15 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpptools/cppfunctionsfilter.h" line="+46"/>
<source>Methods</source>
- <translation type="unfinished"></translation>
+ <translation>Metody</translation>
</message>
</context>
<context>
<name>CppPreprocessor</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+541"/>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+540"/>
<source>%1: No such file or directory</source>
- <translation type="unfinished"></translation>
+ <translation>%1: Brak pliku lub katalogu</translation>
</message>
</context>
<context>
@@ -5892,20 +5932,19 @@ Note: This might remove the local file.</source>
<message>
<location line="+295"/>
<source>Scanning</source>
- <translation type="unfinished"></translation>
+ <translation>Skanowanie</translation>
</message>
<message>
<location line="+42"/>
<source>Indexing</source>
- <translation type="unfinished"></translation>
+ <translation>Indeksowanie</translation>
</message>
</context>
<context>
- <name>CppTools::Internal::CppLocatorFilter</name>
+ <name>CppTools::Internal::CppQuickOpenFilter</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
<source>Classes and Methods</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Klasy i metody</translation>
</message>
</context>
<context>
@@ -5913,12 +5952,12 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+53"/>
<source>File Naming Conventions</source>
- <translation type="unfinished"></translation>
+ <translation>Konwencje nazewnictwa plików</translation>
</message>
<message>
<location line="+1"/>
<source>C++</source>
- <translation type="unfinished"></translation>
+ <translation>C++</translation>
</message>
</context>
<context>
@@ -5926,12 +5965,12 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+120"/>
<source>&C++</source>
- <translation type="unfinished"></translation>
+ <translation>&C++</translation>
</message>
<message>
<location line="+8"/>
<source>Switch Header/Source</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz między nagłówkiem a źródłem</translation>
</message>
</context>
<context>
@@ -5939,7 +5978,7 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cvs/checkoutwizard.cpp" line="+54"/>
<source>Checks out a project from a CVS repository.</source>
- <translation type="unfinished"></translation>
+ <translation>Wyciąga projekt ze składnicy CVS.</translation>
</message>
<message>
<location line="+5"/>
@@ -5952,12 +5991,12 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cvs/checkoutwizardpage.cpp" line="+38"/>
<source>Specify repository and path.</source>
- <translation type="unfinished"></translation>
+ <translation>Podaj składnicę i ścieżkę.</translation>
</message>
<message>
<location line="+1"/>
<source>Repository:</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica:</translation>
</message>
</context>
<context>
@@ -5965,7 +6004,7 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="+78"/>
<source>Cannot find repository for '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć składnicy dla "%1"</translation>
</message>
</context>
<context>
@@ -5983,12 +6022,12 @@ Note: This might remove the local file.</source>
<message>
<location line="+11"/>
<source>Add</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj</translation>
</message>
<message>
<location line="+0"/>
<source>Add "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj "%1"</translation>
</message>
<message>
<location line="+4"/>
@@ -5998,37 +6037,37 @@ Note: This might remove the local file.</source>
<message>
<location line="+4"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
<message>
<location line="+0"/>
<source>Delete "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń "%1"</translation>
</message>
<message>
<location line="+7"/>
<source>Revert</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany</translation>
</message>
<message>
<location line="+0"/>
<source>Revert "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w "%1"</translation>
</message>
<message>
<location line="+9"/>
<source>Diff Project</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w projekcie</translation>
</message>
<message>
<location line="+6"/>
<source>Diff Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w bieżącym pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Diff "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w "%1"</translation>
</message>
<message>
<location line="+4"/>
@@ -6038,17 +6077,17 @@ Note: This might remove the local file.</source>
<message>
<location line="+6"/>
<source>Commit All Files</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij wszystkie pliki</translation>
</message>
<message>
<location line="+6"/>
<source>Commit Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij bieżący plik</translation>
</message>
<message>
<location line="+0"/>
<source>Commit "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij "%1"</translation>
</message>
<message>
<location line="+4"/>
@@ -6068,52 +6107,52 @@ Note: This might remove the local file.</source>
<message>
<location line="+8"/>
<source>Annotate Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację do bieżącego pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Annotate "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację do "%1"</translation>
</message>
<message>
<location line="+10"/>
<source>Project Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan projektu</translation>
</message>
<message>
<location line="+6"/>
<source>Update Project</source>
- <translation type="unfinished"></translation>
+ <translation>Odśwież projekt</translation>
</message>
<message>
<location line="+9"/>
<source>Commit</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij</translation>
</message>
<message>
<location line="+4"/>
<source>Diff Selected Files</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w zaznaczonych plikach</translation>
</message>
<message>
<location line="+3"/>
<source>&Undo</source>
- <translation type="unfinished"></translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished"></translation>
+ <translation>&Przywróć</translation>
</message>
<message>
<location line="+40"/>
<source>Closing CVS Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Zamykanie edytora CVS</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to commit the change?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz wysłać zmianę?</translation>
</message>
<message>
<location line="+1"/>
@@ -6123,17 +6162,17 @@ Note: This might remove the local file.</source>
<message>
<location line="+58"/>
<source>The files do not differ.</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki się nie różnią.</translation>
</message>
<message>
<location line="+61"/>
<source>The file '%1' could not be deleted.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można skasować pliku "%1".</translation>
</message>
<message>
<location line="+21"/>
<source>The file has been changed. Do you want to revert it?</source>
- <translation type="unfinished"></translation>
+ <translation>Plik został zmieniony. Czy chcesz odwrócić w nim zmiany?</translation>
</message>
<message>
<location line="+78"/>
@@ -6148,22 +6187,22 @@ Note: This might remove the local file.</source>
<message>
<location line="+29"/>
<source>There are no modified files.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak zmodyfikowanych plików.</translation>
</message>
<message>
<location line="+8"/>
<source>Cannot create temporary file: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć tymczasowego pliku: %1</translation>
</message>
<message>
<location line="+105"/>
<source>Project status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan projektu</translation>
</message>
<message>
<location line="+43"/>
<source>The initial revision %1 cannot be described.</source>
- <translation type="unfinished"></translation>
+ <translation>Początkowa rewizja %1 nie może być opisana.</translation>
</message>
<message>
<location line="+34"/>
@@ -6174,33 +6213,35 @@ Note: This might remove the local file.</source>
<location line="+176"/>
<source>Executing: %1 %2
</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonywanie: %1 %2
+</translation>
</message>
<message>
<location line="+1"/>
<source>Executing in %1: %2 %3
</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonywanie w %1: %2 %3
+</translation>
</message>
<message>
<location line="+28"/>
<source>No cvs executable specified!</source>
- <translation type="unfinished"></translation>
+ <translation>Nie podano ścieżki do programu cvs!</translation>
</message>
<message>
<location line="+44"/>
<source>The process terminated with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces zakończył się kodem wyjściowym %1.</translation>
</message>
<message>
<location line="+3"/>
<source>The process terminated abnormally.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces niepoprawnie zakończony.</translation>
</message>
<message>
<location line="+3"/>
<source>Could not start cvs '%1'. Please check your settings in the preferences.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić cvs "%1". Sprawdź stosowne ustawienia.</translation>
</message>
<message>
<location line="+3"/>
@@ -6213,17 +6254,17 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cvs/cvssubmiteditor.cpp" line="+41"/>
<source>Added</source>
- <translation type="unfinished"></translation>
+ <translation>Dodano</translation>
</message>
<message>
<location line="+1"/>
<source>Removed</source>
- <translation type="unfinished"></translation>
+ <translation>Usunięto</translation>
</message>
<message>
<location line="+1"/>
<source>Modified</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikowano</translation>
</message>
<message>
<location line="+2"/>
@@ -6236,7 +6277,7 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/cvs/settingspage.cpp" line="-34"/>
<source>CVS Command</source>
- <translation type="unfinished"></translation>
+ <translation>Komenda CVS</translation>
</message>
</context>
<context>
@@ -6254,52 +6295,52 @@ Note: This might remove the local file.</source>
<message>
<location line="+2"/>
<source>Breakpoint Number:</source>
- <translation type="unfinished"></translation>
+ <translation>Numer pułapki:</translation>
</message>
<message>
<location line="+2"/>
<source>Breakpoint Address:</source>
- <translation type="unfinished"></translation>
+ <translation>Adres pułapki:</translation>
</message>
<message>
<location line="+3"/>
<source>Property</source>
- <translation type="unfinished"></translation>
+ <translation>Właściwość</translation>
</message>
<message>
<location line="+1"/>
<source>Requested</source>
- <translation type="unfinished"></translation>
+ <translation>Zażądano</translation>
</message>
<message>
<location line="+1"/>
<source>Obtained</source>
- <translation type="unfinished"></translation>
+ <translation>Otrzymano</translation>
</message>
<message>
<location line="+1"/>
<source>Internal Number:</source>
- <translation type="unfinished"></translation>
+ <translation>Numer wewnętrzny:</translation>
</message>
<message>
<location line="+2"/>
<source>File Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa pliku:</translation>
</message>
<message>
<location line="+2"/>
<source>Function Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa funkcji:</translation>
</message>
<message>
<location line="+2"/>
<source>Line Number:</source>
- <translation type="unfinished"></translation>
+ <translation>Numer linii:</translation>
</message>
<message>
<location line="+2"/>
<source>Condition:</source>
- <translation type="unfinished"></translation>
+ <translation>Warunek:</translation>
</message>
<message>
<location line="+2"/>
@@ -6309,47 +6350,47 @@ Note: This might remove the local file.</source>
<message>
<location line="+215"/>
<source>Number</source>
- <translation type="unfinished"></translation>
+ <translation>Numer</translation>
</message>
<message>
<location line="+0"/>
<source>Function</source>
- <translation type="unfinished"></translation>
+ <translation>Funkcja</translation>
</message>
<message>
<location line="+0"/>
<source>File</source>
- <translation type="unfinished"></translation>
+ <translation>Plik</translation>
</message>
<message>
<location line="+0"/>
<source>Line</source>
- <translation type="unfinished"></translation>
+ <translation>Linia</translation>
</message>
<message>
<location line="+1"/>
<source>Condition</source>
- <translation type="unfinished"></translation>
+ <translation>Warunek</translation>
</message>
<message>
<location line="+0"/>
<source>Ignore</source>
- <translation type="unfinished"></translation>
+ <translation>Zignoruj</translation>
</message>
<message>
<location line="+0"/>
<source>Address</source>
- <translation type="unfinished"></translation>
+ <translation>Adres</translation>
</message>
<message>
<location line="+62"/>
<source>Breakpoint will only be hit if this condition is met.</source>
- <translation type="unfinished"></translation>
+ <translation>Program zatrzyma się na pułapce tylko gdy ten warunek będzie spełniony.</translation>
</message>
<message>
<location line="+6"/>
<source>Breakpoint will only be hit after being ignored so many times.</source>
- <translation type="unfinished"></translation>
+ <translation>Program zatrzyma się na pułapce po tym jak zostanie ona zignorowana podaną ilość razy.</translation>
</message>
</context>
<context>
@@ -6357,82 +6398,82 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/debugger/breakwindow.cpp" line="+86"/>
<source>Breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Pułapki</translation>
</message>
<message>
<location line="+61"/>
<source>Delete breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń pułapkę</translation>
</message>
<message>
<location line="+3"/>
<source>Delete all breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń wszystkie pułapki</translation>
</message>
<message>
<location line="+13"/>
<source>Delete breakpoints of "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń pułapki w "%1"</translation>
</message>
<message>
<location line="+6"/>
<source>Delete breakpoints of file</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń pułapki w pliku</translation>
</message>
<message>
<location line="+4"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrównaj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+4"/>
<source>Edit condition...</source>
- <translation type="unfinished"></translation>
+ <translation>Zodyfikuj warunek...</translation>
</message>
<message>
<location line="+3"/>
<source>Synchronize breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Zsynchronizuj pułapki</translation>
</message>
<message>
<location line="+6"/>
<source>Disable breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Wyłącz pułapkę</translation>
</message>
<message>
<location line="+0"/>
<source>Enable breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Włącz pułapkę</translation>
</message>
<message>
<location line="+5"/>
<source>Use short path</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj skróconej ścieżki</translation>
</message>
<message>
<location line="+0"/>
<source>Use full path</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj pełnej ścieżki</translation>
</message>
<message>
<location line="+4"/>
<source>Set Breakpoint at Function...</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw pułapkę w funkcji...</translation>
</message>
<message>
<location line="+1"/>
<source>Set Breakpoint at Function "main"</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw pułapkę w funkcji "main"</translation>
</message>
<message>
<location line="+101"/>
<source>Conditions on Breakpoint %1</source>
- <translation type="unfinished"></translation>
+ <translation>Warunki dla pułapki %1</translation>
</message>
</context>
<context>
@@ -6446,7 +6487,7 @@ Note: This might remove the local file.</source>
<location line="+17"/>
<source>The function "%1()" failed: %2</source>
<extracomment>Function call failed</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Funkcja "%1()" zakończona niepowodzeniem: %2</translation>
</message>
<message>
<location line="+112"/>
@@ -6454,7 +6495,7 @@ Note: This might remove the local file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+348"/>
+ <location line="+349"/>
<source>Version: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -6466,7 +6507,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+4"/>
<source>Debugger</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Debugger</translation>
</message>
<message>
<location line="+33"/>
@@ -6474,7 +6515,7 @@ Note: This might remove the local file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+33"/>
<source>The console stub process was unable to start '%1'.</source>
<translation type="unfinished"></translation>
</message>
@@ -6489,7 +6530,7 @@ Note: This might remove the local file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+30"/>
<source>Attaching to a process failed for process id %1: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -6541,7 +6582,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+67"/>
<source>Running requested...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">ZarzÄ…dano uruchomienia...</translation>
</message>
<message>
<location line="+59"/>
@@ -6577,7 +6618,7 @@ Note: This might remove the local file.</source>
<location line="+64"/>
<location line="+6"/>
<source>Debugger Error</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">BÅ‚Ä…d debuggera</translation>
</message>
<message>
<location line="+27"/>
@@ -6592,12 +6633,12 @@ Note: This might remove the local file.</source>
<message>
<location line="+1"/>
<source>Stopped, current thread: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymano, bieżący wątek: %1</translation>
</message>
<message>
<location line="+51"/>
<source>Changing threads: %1 -> %2</source>
- <translation type="unfinished"></translation>
+ <translation>Zmiana wątków: %1 -> %2</translation>
</message>
<message>
<location line="+80"/>
@@ -6658,12 +6699,12 @@ Note: This might remove the local file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+33"/>
<source>Disabling dumpers due to debuggee crash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+329"/>
+ <location line="+339"/>
<source>Querying dumpers for '%1'/'%2' (%3)</source>
<translation type="unfinished"></translation>
</message>
@@ -6673,7 +6714,7 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="-23"/>
<source>Cdb</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Cdb</translation>
</message>
<message>
<location line="+35"/>
@@ -6712,15 +6753,15 @@ Note: This might remove the local file.</source>
<message>
<location line="+219"/>
<source><Unknown></source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished"><Nieznany></translation>
</message>
</context>
<context>
<name>SymbolGroup</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+49"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+52"/>
<source>Out of scope</source>
- <translation type="unfinished"></translation>
+ <translation>Poza zakresem</translation>
</message>
</context>
<context>
@@ -6751,12 +6792,12 @@ Note: This might remove the local file.</source>
<message>
<location line="+6"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">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"></translation>
+ <translation type="unfinished">Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+5"/>
@@ -6766,7 +6807,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+7"/>
<source>Show a message box when receiving a signal</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Pokaż komunikat po otrzymaniu sygnału</translation>
</message>
<message>
<location line="+8"/>
@@ -6820,13 +6861,18 @@ Note: This might remove the local file.</source>
</message>
<message>
<location line="+8"/>
+ <source>Use code model</source>
+ <translation type="unfinished">Używaj modelu kodu</translation>
+ </message>
+ <message>
+ <location line="+7"/>
<source>Recheck debugging helper availability</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<source>Synchronize breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Zsynchronizuj pułapki</translation>
</message>
<message>
<location line="+23"/>
@@ -6927,10 +6973,10 @@ Note: This might remove the local file.</source>
<message>
<location line="+1"/>
<source>Debugger</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Debugger</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+441"/>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+654"/>
<source><Encoding error></source>
<translation type="unfinished"></translation>
</message>
@@ -6940,22 +6986,22 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+80"/>
<source>Process ID</source>
- <translation type="unfinished"></translation>
+ <translation>Identyfikator procesu</translation>
</message>
<message>
<location line="+1"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location line="+1"/>
<source>State</source>
- <translation type="unfinished"></translation>
+ <translation>Stan</translation>
</message>
<message>
<location line="+167"/>
<source>Refresh</source>
- <translation type="unfinished"></translation>
+ <translation>Odśwież</translation>
</message>
</context>
<context>
@@ -6963,7 +7009,7 @@ Note: This might remove the local file.</source>
<message>
<location line="-114"/>
<source>Select Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz program</translation>
</message>
<message>
<location line="+3"/>
@@ -6976,17 +7022,17 @@ Note: This might remove the local file.</source>
<message>
<location line="+192"/>
<source>Select Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz program</translation>
</message>
<message>
<location line="+7"/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Program:</translation>
</message>
<message>
<location line="+1"/>
<source>Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumenty:</translation>
</message>
</context>
<context>
@@ -6994,7 +7040,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+51"/>
<source>Select Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz program</translation>
</message>
</context>
<context>
@@ -7002,66 +7048,66 @@ Note: This might remove the local file.</source>
<message>
<location line="+80"/>
<source>Select start address</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz adres startowy</translation>
</message>
<message>
<location line="+3"/>
<source>Enter an address: </source>
- <translation type="unfinished"></translation>
+ <translation>Podaj adres: </translation>
</message>
</context>
<context>
<name>Debugger::DebuggerManager</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+455"/>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+451"/>
<source>Continue</source>
- <translation type="unfinished"></translation>
+ <translation>Kontynuuj</translation>
</message>
<message>
<location line="+3"/>
- <location line="+1194"/>
+ <location line="+1207"/>
<source>Interrupt</source>
- <translation type="unfinished"></translation>
+ <translation>Przerwij</translation>
</message>
<message>
- <location line="-1191"/>
+ <location line="-1204"/>
<source>Reset Debugger</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Step Over</source>
- <translation type="unfinished"></translation>
+ <translation>Przeskocz</translation>
</message>
<message>
<location line="+3"/>
<source>Step Into</source>
- <translation type="unfinished"></translation>
+ <translation>Wskocz do wnętrza</translation>
</message>
<message>
<location line="+3"/>
<source>Step Out</source>
- <translation type="unfinished"></translation>
+ <translation>Wyskocz na zewnÄ…trz</translation>
</message>
<message>
<location line="+3"/>
<source>Run to Line</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom do linii</translation>
</message>
<message>
<location line="+2"/>
<source>Run to Outermost Function</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom do skrajnej funkcji</translation>
</message>
<message>
<location line="+2"/>
<source>Jump to Line</source>
- <translation type="unfinished"></translation>
+ <translation>Skocz do linii</translation>
</message>
<message>
<location line="+2"/>
<source>Toggle Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz ustawienie pułapki</translation>
</message>
<message>
<location line="+2"/>
@@ -7074,25 +7120,25 @@ Note: This might remove the local file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+223"/>
+ <location line="+235"/>
<source>Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymano.</translation>
</message>
<message>
<location line="+6"/>
<source>Running...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie...</translation>
</message>
<message>
<location line="+6"/>
<source>Exited.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono.</translation>
</message>
<message>
<location line="+77"/>
<location line="+21"/>
<source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienianie stanu pułapki wymaga albo w pełni uruchomionej albo w pełni zatrzymanej aplikacji.</translation>
</message>
<message>
<location line="+30"/>
@@ -7112,10 +7158,10 @@ Note: This might remove the local file.</source>
<message>
<location line="+2"/>
<source>Warning</source>
- <translation type="unfinished"></translation>
+ <translation>Ostrzeżenie</translation>
</message>
<message>
- <location line="+175"/>
+ <location line="+176"/>
<source>Save Debugger Log</source>
<translation type="unfinished"></translation>
</message>
@@ -7127,37 +7173,37 @@ Note: This might remove the local file.</source>
<message>
<location line="+9"/>
<source>Open Qt preferences</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz ustawienia Qt</translation>
</message>
<message>
<location line="+2"/>
- <source>Turn helper usage off</source>
+ <source>Turn off helper usage</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Continue anyway</source>
+ <location line="+6"/>
+ <source>The debugger could not load the debugging helper library.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Debugging helper missing</source>
+ <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>
</message>
<message>
- <location line="+1"/>
- <source>The debugger did not find the debugging helper library.</source>
+ <location line="-5"/>
+ <source>Continue anyway</source>
<translation type="unfinished"></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 Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper.</source>
+ <location line="+3"/>
+ <source>Debugging helper missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+164"/>
+ <location line="+166"/>
<source>Stop Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymaj debugger</translation>
</message>
</context>
<context>
@@ -7165,12 +7211,12 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+156"/>
<source>Clear contents</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść zawartość</translation>
</message>
<message>
<location line="+6"/>
<source>Save contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj zawartość</translation>
</message>
</context>
<context>
@@ -7178,7 +7224,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+76"/>
<source>Type Ctrl-<Return> to execute a line.</source>
- <translation type="unfinished"></translation>
+ <translation>Naciśnij Ctrl-<Return> aby wykonać linię.</translation>
</message>
</context>
<context>
@@ -7186,21 +7232,39 @@ Note: This might remove the local file.</source>
<message>
<location line="+58"/>
<source>Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebugMode</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+195"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+196"/>
<source>Debug</source>
+ <translation>Debug</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebuggerListener</name>
+ <message>
+ <location line="+36"/>
+ <source>Close Debugging Session</source>
+ <translation type="unfinished"></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>
+ </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>
</message>
</context>
<context>
<name>Debugger::Internal::DebuggingHelperOptionPage</name>
<message>
- <location line="+141"/>
+ <location line="+142"/>
<source>Debugging Helper</source>
<translation type="unfinished"></translation>
</message>
@@ -7210,7 +7274,7 @@ Note: This might remove the local file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>Ctrl+Shift+F11</source>
<translation>Ctrl+Shift+F11</translation>
</message>
@@ -7220,17 +7284,17 @@ Note: This might remove the local file.</source>
<message>
<location line="+69"/>
<source>Option '%1' is missing the parameter.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak parametru w opcji "%1".</translation>
</message>
<message>
<location line="+5"/>
<source>The parameter '%1' of option '%2' is not a number.</source>
- <translation type="unfinished"></translation>
+ <translation>Parametr "%1" w opcji "%2" nie jest liczbÄ….</translation>
</message>
<message>
<location line="+54"/>
<source>Invalid debugger option: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna opcja debuggera: %1</translation>
</message>
<message>
<location line="+22"/>
@@ -7245,7 +7309,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+5"/>
<source>Attach to Running External Application...</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz do uruchomionej zewnętrznej aplikacji...</translation>
</message>
<message>
<location line="+5"/>
@@ -7260,12 +7324,12 @@ Note: This might remove the local file.</source>
<message>
<location line="+6"/>
<source>Detach Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Odłącz debugger</translation>
</message>
<message>
<location line="+41"/>
<source>Stop Debugger/Interrupt Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymaj debugger / przerwij debugger</translation>
</message>
<message>
<location line="+7"/>
@@ -7275,7 +7339,7 @@ Note: This might remove the local file.</source>
<message>
<location line="+75"/>
<source>&Views</source>
- <translation type="unfinished"></translation>
+ <translation>&Widoki</translation>
</message>
<message>
<location line="+3"/>
@@ -7285,47 +7349,47 @@ Note: This might remove the local file.</source>
<message>
<location line="+15"/>
<source>Reset to default layout</source>
- <translation type="unfinished"></translation>
+ <translation>Przywróć domyślne rozmieszczenie</translation>
</message>
<message>
<location line="+79"/>
<source>Threads:</source>
- <translation type="unfinished"></translation>
+ <translation>WÄ…tki:</translation>
</message>
<message>
<location line="+84"/>
<source>Attaching to PID %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Dołączanie do PID %1.</translation>
</message>
<message>
<location line="+75"/>
<source>Remove Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń pułapkę</translation>
</message>
<message>
<location line="+8"/>
<source>Disable Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Wyłącz pułapkę</translation>
</message>
<message>
<location line="+2"/>
<source>Enable Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Włącz pułapkę</translation>
</message>
<message>
<location line="+7"/>
<source>Set Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw pułapkę</translation>
</message>
<message>
<location line="+229"/>
<source>Warning</source>
- <translation type="unfinished"></translation>
+ <translation>Ostrzeżenie</translation>
</message>
<message>
<location line="+0"/>
<source>Cannot attach to PID 0</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dołączyć się do PID 0</translation>
</message>
<message>
<location line="+17"/>
@@ -7338,7 +7402,7 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+79"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation>Debug</translation>
</message>
</context>
<context>
@@ -7346,84 +7410,99 @@ Note: This might remove the local file.</source>
<message>
<location line="+108"/>
<source>Debugger</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
<name>Debugger::Internal::AbstractGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/abstractgdbadapter.cpp" line="+88"/>
+ <location filename="../../../src/plugins/debugger/gdb/abstractgdbadapter.cpp" line="+74"/>
<source>The Gdb process could not be stopped:
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zatrzymać procesu gdb:
+%1</translation>
</message>
<message>
<location line="+5"/>
<source>Inferior process could not be stopped:
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zatrzymać podprocesu:
+%1</translation>
</message>
<message>
<location line="+5"/>
<source>Inferior started.</source>
- <translation type="unfinished"></translation>
+ <translation>Podproces uruchomiony.</translation>
</message>
<message>
<location line="+5"/>
<source>Inferior running.</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie podprocesu.</translation>
</message>
<message>
<location line="+5"/>
<source>Attached to stopped inferior.</source>
- <translation type="unfinished"></translation>
+ <translation>Dołączono do zatrzymanego podprocesu.</translation>
</message>
<message>
<location line="+5"/>
<source>Connecting to remote server failed:
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można połączyć się ze zdalnym serwerem:
+%1</translation>
</message>
</context>
<context>
<name>Debugger::Internal::CoreGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+111"/>
- <source>Attached to core temporarily.</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+85"/>
+ <location line="+27"/>
+ <location line="+42"/>
+ <source>Error Loading Symbols</source>
+ <translation>BÅ‚Ä…d w trakcie Å‚adowania symboli</translation>
</message>
<message>
- <location line="+5"/>
- <source>No binary found.</source>
+ <location line="-68"/>
+ <source>No executable to load symbols from specified.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+34"/>
- <source>Symbols found.</source>
+ <location line="+24"/>
+ <source>Loading symbols from "%1" failed:
+</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Symbols not found in "%1" failed:
-%2</source>
+ <location line="+36"/>
+ <source>Attached to core temporarily.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>Attached to core.</source>
+ <location line="+9"/>
+ <source>Unable to determine executable from core file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Attach to core "%1" failed:
-%2</source>
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Symbols found.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Attached to core.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Debugger::Internal::GdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+288"/>
+ <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+293"/>
<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>
@@ -7455,22 +7534,22 @@ Note: This might remove the local file.</source>
<message>
<location line="+114"/>
<source>Library %1 loaded.</source>
- <translation type="unfinished"></translation>
+ <translation>Załadowano bibliotekę %1.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Library %1 unloaded.</source>
- <translation type="unfinished"></translation>
+ <translation>Wyładowano bibliotekę %1.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Thread group %1 created.</source>
- <translation type="unfinished"></translation>
+ <translation>Utworzono grupę wątków %1.</translation>
</message>
<message>
<location line="+7"/>
<source>Thread %1 created.</source>
- <translation type="unfinished"></translation>
+ <translation>Utworzono wÄ…tek %1.</translation>
</message>
<message>
<location line="+4"/>
@@ -7485,58 +7564,58 @@ Note: This might remove the local file.</source>
<message>
<location line="+4"/>
<source>Thread %1 selected.</source>
- <translation type="unfinished"></translation>
+ <translation>Wybrano wÄ…tek %1.</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<source>Reading %1...</source>
- <translation type="unfinished"></translation>
+ <translation>Wczytywanie %1...</translation>
</message>
<message>
- <location line="+37"/>
+ <location line="+39"/>
<source>Running...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie...</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+91"/>
<source>Stop requested...</source>
- <translation type="unfinished"></translation>
+ <translation>ZarzÄ…dano zatrzymania...</translation>
</message>
<message>
- <location line="+84"/>
+ <location line="+88"/>
<source>Stopping temporarily.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+53"/>
<location line="+16"/>
<source>Executable failed</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchomienie programu zakończone niepowodzeniem</translation>
</message>
<message>
<location line="-15"/>
<source>Process failed to start.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić procesu.</translation>
</message>
<message>
<location line="+16"/>
<source>Executable failed: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchomienie programu zakończone niepowodzeniem: %1</translation>
</message>
<message>
- <location line="+134"/>
+ <location line="+128"/>
<source>Jumped. Stopped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
+ <location line="+89"/>
<source>Program exited with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Program zakończył się kodem wyjściowym %1.</translation>
</message>
<message>
<location line="+3"/>
<source>Program exited after receiving signal %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Program zakończył się po otrzymaniu sygnału %1.</translation>
</message>
<message>
<location line="+3"/>
@@ -7546,25 +7625,20 @@ Note: This might remove the local file.</source>
<message>
<location line="+12"/>
<source>Processing queued commands.</source>
- <translation type="unfinished"></translation>
+ <translation>Przetwarzanie skolejkowanych komend.</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+54"/>
<source>Loading %1...</source>
- <translation type="unfinished"></translation>
+ <translation>Åadowanie %1...</translation>
</message>
<message>
- <location line="+81"/>
- <source>Run to Function finished. Stopped.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+76"/>
<source>Stopped at breakpoint.</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymano w pułapce.</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+13"/>
<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>
@@ -7581,47 +7655,38 @@ Note: This might remove the local file.</source>
</message>
<message>
<location line="+5"/>
- <location line="+113"/>
+ <location line="+110"/>
<source>Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymano.</translation>
</message>
<message>
- <location line="-111"/>
+ <location line="-108"/>
<source>Stopped: "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymano: "%1"</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+61"/>
<source>The debugger you are using identifies itself as:</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger którego używasz identyfikuje się jako:</translation>
</message>
<message>
<location line="+2"/>
<source>This version is not officially supported by Qt Creator.
Debugging will most likely not work well.
Using gdb 6.7 or later is strongly recommended.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+48"/>
- <source>Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Starting executable failed:
-</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator oficjalnie nie obsługuje tej wersji.
+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="+151"/>
+ <location line="+257"/>
<source>Continuing after temporary stop...</source>
- <translation type="unfinished"></translation>
+ <translation>Kontynuowanie po tymczasowym zatrzymaniu...</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+8"/>
<source>Running requested...</source>
- <translation type="unfinished"></translation>
+ <translation>ZarzÄ…dano uruchomienia...</translation>
</message>
<message>
<location line="+8"/>
@@ -7644,7 +7709,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+18"/>
<source>Step next instruction requested...</source>
<translation type="unfinished"></translation>
</message>
@@ -7654,42 +7719,36 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+13"/>
<source>Run to function %1 requested...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+503"/>
+ <location line="+493"/>
<source>Unable to run '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nie można uruchomić "%1": %2</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+68"/>
<source><unknown></source>
<extracomment>End address of loaded module</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+37"/>
<location line="+8"/>
<source>Retrieving data for stack view...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+402"/>
- <source><not in scope></source>
- <extracomment>Variable</extracomment>
- <translation type="unfinished"></translation>
- </message>
<message numerus="yes">
- <location line="+107"/>
+ <location line="+495"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+308"/>
+ <location line="+324"/>
<source>Finished retrieving data.</source>
<translation type="unfinished"></translation>
</message>
@@ -7711,7 +7770,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+149"/>
+ <location line="+128"/>
<source><0 items></source>
<translation type="unfinished"></translation>
</message>
@@ -7724,19 +7783,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
</translation>
</message>
<message>
- <location line="+185"/>
- <source>%1 <shadowed %2></source>
- <extracomment>Variable %1 is the variable name, %2 is a simple count</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+217"/>
<source><shadowed></source>
- <extracomment>Type of local variable or parameter shadowed by another</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+133"/>
<source><n/a></source>
<translation type="unfinished"></translation>
</message>
@@ -7752,119 +7804,146 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+67"/>
- <source>The dumper library was not found at %1.</source>
+ <location line="+333"/>
+ <location line="+25"/>
+ <location line="+14"/>
+ <source>Disassembler failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Dumper injection loading triggered (%1)...</source>
+ <location line="+30"/>
+ <source>Unable to start gdb '%1': %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Dumper loading (%1) failed: %2</source>
+ <location line="+115"/>
+ <source>Gdb I/O Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Loading dumpers via debugger call (%1)...</source>
+ <location line="+14"/>
+ <source>Unexpected Gdb Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+247"/>
- <location line="+25"/>
- <location line="+14"/>
- <source>Disassembler failed: %1</source>
+ <location line="+1"/>
+ <source>The gdb process exited unexpectedly (%1).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+2"/>
+ <source>crashed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>code %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Adapter start failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+83"/>
+ <location line="-52"/>
<source>Cannot find debugger initialization script</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="-2915"/>
+ <source>Execution Error</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+1"/>
+ <source>Cannot continue debugged process:
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+990"/>
+ <source>Jumping out of bogus frame...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1498"/>
+ <source>The debugging helper library was not found at %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+427"/>
<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="+8"/>
+ <location line="+75"/>
<source>Setting breakpoints...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-8"/>
<source>Starting inferior...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+28"/>
<source>Inferior start failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-2922"/>
<source>Inferior shutdown failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+2942"/>
<source>Adapter crashed</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+12"/>
- <source>Adapter shutdown failed</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Debugger::Internal::GdbOptionsPage</name>
<message>
<location filename="../../../src/plugins/debugger/gdb/gdboptionspage.cpp" line="+8"/>
<source>Gdb</source>
- <translation type="unfinished"></translation>
+ <translation>Gdb</translation>
</message>
<message>
<location line="+34"/>
<source>Choose Gdb Location</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz położenie gdb</translation>
</message>
<message>
<location line="+2"/>
<source>Choose Location of Startup Script File</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz położenie pliku ze startowym skryptem</translation>
</message>
</context>
<context>
<name>Debugger::Internal::PlainGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+79"/>
+ <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+70"/>
<source>Cannot set up communication with child process: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można ustanowić komunikacji z podprocesem: %1</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+36"/>
<source>Starting executable failed:
</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić programu:
+</translation>
</message>
</context>
<context>
<name>Debugger::Internal::RemoteGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+112"/>
- <source>The upload process failed to start. Either the invoked script '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
+ <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+93"/>
+ <source>The upload process failed to start. Shell missing?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+3"/>
<source>The upload process crashed some time after starting successfully.</source>
<translation type="unfinished"></translation>
</message>
@@ -7891,12 +7970,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+5"/>
<source>Error</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d</translation>
</message>
<message>
<location line="+47"/>
<source>Adapter too old: does not support asynchronous mode.</source>
- <translation type="unfinished"></translation>
+ <translation>Zbyt stary adapter: nie obsługuje on trybu asynchronicznego.</translation>
</message>
<message>
<location line="+20"/>
@@ -7908,10 +7987,16 @@ 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="+1707"/>
+ <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1597"/>
+ <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"/>
<source>Connecting to trk server adapter failed:
</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można połączyć się z adapterem serwera trk:
+</translation>
</message>
</context>
<context>
@@ -7932,7 +8017,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<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>
@@ -7940,22 +8025,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/moduleshandler.cpp" line="+87"/>
<source>Module name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa modułu</translation>
</message>
<message>
<location line="+1"/>
<source>Symbols read</source>
- <translation type="unfinished"></translation>
+ <translation>Przeczytane symbole</translation>
</message>
<message>
<location line="+1"/>
<source>Start address</source>
- <translation type="unfinished"></translation>
+ <translation>Adres poczÄ…tkowy</translation>
</message>
<message>
<location line="+1"/>
<source>End address</source>
- <translation type="unfinished"></translation>
+ <translation>Adres końcowy</translation>
</message>
</context>
<context>
@@ -7963,12 +8048,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/moduleswindow.cpp" line="+64"/>
<source>Modules</source>
- <translation type="unfinished"></translation>
+ <translation>Moduły</translation>
</message>
<message>
<location line="+47"/>
<source>Update module list</source>
- <translation type="unfinished"></translation>
+ <translation>Odśwież listę modułów</translation>
</message>
<message>
<location line="+2"/>
@@ -7978,67 +8063,67 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+2"/>
<source>Load symbols for all modules</source>
- <translation type="unfinished"></translation>
+ <translation>Załaduj symbole ze wszystkich modułów</translation>
</message>
<message>
<location line="+6"/>
<source>Load symbols for module</source>
- <translation type="unfinished"></translation>
+ <translation>Załaduj symbole z modułu</translation>
</message>
<message>
<location line="+1"/>
<source>Edit file</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj plik</translation>
</message>
<message>
<location line="+1"/>
<source>Show symbols</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż symbole</translation>
</message>
<message>
<location line="+2"/>
<source>Load symbols for module "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż symbole modułu "%1"</translation>
</message>
<message>
<location line="+1"/>
<source>Edit file "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj plik "%1"</translation>
</message>
<message>
<location line="+1"/>
<source>Show symbols in file "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż symbole w pliku "%1"</translation>
</message>
<message>
<location line="+13"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrównaj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+64"/>
<source>Address</source>
- <translation type="unfinished"></translation>
+ <translation>Adres</translation>
</message>
<message>
<location line="+0"/>
<source>Code</source>
- <translation type="unfinished"></translation>
+ <translation>Kod</translation>
</message>
<message>
<location line="+0"/>
<source>Symbol</source>
- <translation type="unfinished"></translation>
+ <translation>Symbol</translation>
</message>
<message>
<location line="+1"/>
<source>Symbols in "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole w "%1"</translation>
</message>
</context>
<context>
@@ -8051,30 +8136,30 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+90"/>
<source>Invalid encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawne kodowanie</translation>
</message>
<message>
<location line="+54"/>
<source>Invalid name</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna nazwa</translation>
</message>
<message>
<location line="+40"/>
<location line="+9"/>
<source>Invalid nested-name</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna zagnieżdżona nazwa</translation>
</message>
<message>
<location line="+111"/>
<location line="+8"/>
<source>Invalid template args</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawne argumenty szablonu</translation>
</message>
<message>
<location line="+18"/>
<location line="+8"/>
<source>Invalid template-param</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny parametr szablonu</translation>
</message>
<message>
<location line="+19"/>
@@ -8103,7 +8188,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<location line="+15"/>
<location line="+43"/>
<source>Invalid expression</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawnie wyrażenie</translation>
</message>
<message>
<location line="+20"/>
@@ -8122,23 +8207,23 @@ Using gdb 6.7 or later is strongly recommended.</source>
<location line="+5"/>
<location line="+68"/>
<source>Invalid type</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny typ</translation>
</message>
<message>
<location line="+138"/>
<source>Invalid built-in type</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny typ wbudowany</translation>
</message>
<message>
<location line="+7"/>
<source>Invalid builtin-type</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny typ wbudowany</translation>
</message>
<message>
<location line="+16"/>
<location line="+8"/>
<source>Invalid function type</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny typ funkcji</translation>
</message>
<message>
<location line="+80"/>
@@ -8189,7 +8274,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<location line="+4"/>
<location line="+13"/>
<source>Invalid local-name</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna nazwa lokalna</translation>
</message>
<message>
<location line="+16"/>
@@ -8217,7 +8302,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+12"/>
<source>Invalid digit</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna cyfra</translation>
</message>
<message>
<location line="+9"/>
@@ -8230,17 +8315,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/outputcollector.cpp" line="+95"/>
<source>Cannot create temporary file: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć tymczasowego pliku: %1</translation>
</message>
<message>
<location line="+11"/>
<source>Cannot create FiFo %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć FiFo %1: %2</translation>
</message>
<message>
<location line="+6"/>
<source>Cannot open FiFo %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć FiFo %1: %2</translation>
</message>
</context>
<context>
@@ -8248,12 +8333,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/registerhandler.cpp" line="+112"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location line="+1"/>
<source>Value (base %1)</source>
- <translation type="unfinished"></translation>
+ <translation>Wartość (baza %1)</translation>
</message>
</context>
<context>
@@ -8261,52 +8346,52 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/registerwindow.cpp" line="+150"/>
<source>Registers</source>
- <translation type="unfinished"></translation>
+ <translation>Rejestry</translation>
</message>
<message>
<location line="+18"/>
<source>Reload register listing</source>
- <translation type="unfinished"></translation>
+ <translation>Przeładuj listę rejestrów</translation>
</message>
<message>
<location line="+7"/>
<source>Open memory editor</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz edytor pamięci</translation>
</message>
<message>
<location line="+3"/>
<source>Open memory editor at %1</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz edytor pamięci z adresem %1</translation>
</message>
<message>
<location line="+6"/>
<source>Hexadecimal</source>
- <translation type="unfinished"></translation>
+ <translation>Szesnastkowy</translation>
</message>
<message>
<location line="+3"/>
<source>Decimal</source>
- <translation type="unfinished"></translation>
+ <translation>Dziesiętny</translation>
</message>
<message>
<location line="+3"/>
<source>Octal</source>
- <translation type="unfinished"></translation>
+ <translation>Ósemkowy</translation>
</message>
<message>
<location line="+3"/>
<source>Binary</source>
- <translation type="unfinished"></translation>
+ <translation>Binarny</translation>
</message>
<message>
<location line="+5"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrównaj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
</context>
<context>
@@ -8314,12 +8399,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/script/scriptengine.cpp" line="+244"/>
<source>Running requested...</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">ZarzÄ…dano uruchomienia...</translation>
</message>
<message>
<location line="+228"/>
<source>'%1' contains no identifier</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" nie zawiera identyfikatora</translation>
</message>
<message>
<location line="+5"/>
@@ -8335,7 +8420,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<location line="+81"/>
<location line="+50"/>
<source>Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Zatrzymano.</translation>
</message>
</context>
<context>
@@ -8343,12 +8428,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/sourcefileswindow.cpp" line="+98"/>
<source>Internal name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa wewnętrzna</translation>
</message>
<message>
<location line="+1"/>
<source>Full name</source>
- <translation type="unfinished"></translation>
+ <translation>Pełna nazwa</translation>
</message>
</context>
<context>
@@ -8356,96 +8441,96 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+76"/>
<source>Source Files</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki źródłowe</translation>
</message>
<message>
<location line="+27"/>
<source>Reload data</source>
- <translation type="unfinished"></translation>
+ <translation>Przeładuj dane</translation>
</message>
<message>
<location line="+5"/>
<source>Open file</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz plik</translation>
</message>
<message>
<location line="+3"/>
<source>Open file "%1"'</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz plik "%1"</translation>
</message>
</context>
<context>
<name>Debugger::Internal::StackHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+55"/>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+66"/>
<location line="+14"/>
<source>Address:</source>
- <translation type="unfinished"></translation>
+ <translation>Adres:</translation>
</message>
<message>
<location line="-13"/>
<location line="+14"/>
<source>Function:</source>
- <translation type="unfinished"></translation>
+ <translation>Funkcja:</translation>
</message>
<message>
<location line="-13"/>
<location line="+14"/>
<source>File:</source>
- <translation type="unfinished"></translation>
+ <translation>Plik:</translation>
</message>
<message>
<location line="-13"/>
<location line="+14"/>
<source>Line:</source>
- <translation type="unfinished"></translation>
+ <translation>Linia:</translation>
</message>
<message>
<location line="-13"/>
<location line="+14"/>
<source>From:</source>
- <translation type="unfinished"></translation>
+ <translation>Od:</translation>
</message>
<message>
<location line="-13"/>
<location line="+14"/>
<source>To:</source>
- <translation type="unfinished"></translation>
+ <translation>Do:</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+57"/>
<source>...</source>
- <translation type="unfinished"></translation>
+ <translation>...</translation>
</message>
<message>
<location line="+2"/>
<source><More></source>
- <translation type="unfinished"></translation>
+ <translation><Więcej></translation>
</message>
<message>
<location line="+44"/>
<source>Level</source>
- <translation type="unfinished"></translation>
+ <translation>Poziom</translation>
</message>
<message>
<location line="+1"/>
<source>Function</source>
- <translation type="unfinished"></translation>
+ <translation>Funkcja</translation>
</message>
<message>
<location line="+1"/>
<source>File</source>
- <translation type="unfinished"></translation>
+ <translation>Plik</translation>
</message>
<message>
<location line="+1"/>
<source>Line</source>
- <translation type="unfinished"></translation>
+ <translation>Linia</translation>
</message>
<message>
<location line="+1"/>
<source>Address</source>
- <translation type="unfinished"></translation>
+ <translation>Adres</translation>
</message>
</context>
<context>
@@ -8453,42 +8538,42 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+137"/>
<source>Thread: %1</source>
- <translation type="unfinished"></translation>
+ <translation>WÄ…tek: %1</translation>
</message>
<message>
<location line="+3"/>
<source>Thread: %1 at %2 (0x%3)</source>
- <translation type="unfinished"></translation>
+ <translation>WÄ…tek: %1 w %2 (0x%3)</translation>
</message>
<message>
<location line="+1"/>
<source>Thread: %1 at %2, %3:%4 (0x%5)</source>
- <translation type="unfinished"></translation>
+ <translation>WÄ…tek: %1 w %2, %3:%4 (0x%5)</translation>
</message>
<message>
<location line="+16"/>
<source>Thread ID</source>
- <translation type="unfinished"></translation>
+ <translation>Identyfikator wÄ…tku</translation>
</message>
<message>
<location line="+2"/>
<source>Function</source>
- <translation type="unfinished"></translation>
+ <translation>Funkcja</translation>
</message>
<message>
<location line="+2"/>
<source>File</source>
- <translation type="unfinished"></translation>
+ <translation>Plik</translation>
</message>
<message>
<location line="+2"/>
<source>Line</source>
- <translation type="unfinished"></translation>
+ <translation>Linia</translation>
</message>
<message>
<location line="+2"/>
<source>Address</source>
- <translation type="unfinished"></translation>
+ <translation>Adres</translation>
</message>
</context>
<context>
@@ -8496,22 +8581,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+60"/>
<source>Stack</source>
- <translation type="unfinished"></translation>
+ <translation>Stos</translation>
</message>
<message>
<location line="+36"/>
<source>Copy contents to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj zawartość do schowka</translation>
</message>
<message>
<location line="+5"/>
<source>Open memory editor</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz edytor pamięci</translation>
</message>
<message>
<location line="+3"/>
<source>Open memory editor at %1</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz edytor pamięci z adresem %1</translation>
</message>
<message>
<location line="+5"/>
@@ -8526,51 +8611,57 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+9"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrównaj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+3"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
</context>
<context>
<name>Debugger::Internal::ThreadsWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+53"/>
+ <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+46"/>
<source>Thread</source>
- <translation type="unfinished"></translation>
+ <translation>WÄ…tek</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+21"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrównaj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+1"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
</context>
<context>
<name>Debugger::Internal::WatchData</name>
<message>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+70"/>
+ <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+71"/>
+ <location line="+250"/>
<source><not in scope></source>
+ <translation><poza zakresem></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1 <shadowed %2></source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Debugger::Internal::WatchHandler</name>
<message>
- <location line="+226"/>
+ <location line="-27"/>
<source>Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrażenie</translation>
</message>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
<message>
<location line="+4"/>
@@ -8580,12 +8671,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+2"/>
<source>Value</source>
- <translation type="unfinished"></translation>
+ <translation>Wartość</translation>
</message>
<message>
<location line="+1"/>
<source>Object Address</source>
- <translation type="unfinished"></translation>
+ <translation>Adres obiektu</translation>
</message>
<message>
<location line="+1"/>
@@ -8595,7 +8686,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+1"/>
<source>Internal ID</source>
- <translation type="unfinished"></translation>
+ <translation>Wewnętrzny identyfikator</translation>
</message>
<message>
<location line="+1"/>
@@ -8603,9 +8694,9 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+31"/>
<source>Root</source>
- <translation type="unfinished"></translation>
+ <translation>Korzeń</translation>
</message>
<message>
<location line="+7"/>
@@ -8620,63 +8711,63 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+4"/>
<source>Tooltip</source>
- <translation type="unfinished"></translation>
+ <translation>Podpowiedź</translation>
</message>
<message>
- <location line="+1055"/>
+ <location line="+1069"/>
<source><Edit></source>
- <translation type="unfinished"></translation>
+ <translation><Zmodyfikuj></translation>
</message>
</context>
<context>
<name>Debugger::Internal::WatchModel</name>
<message>
- <location line="-655"/>
+ <location line="-668"/>
<source>decimal</source>
- <translation type="unfinished"></translation>
+ <translation>dziesiętny</translation>
</message>
<message>
<location line="+0"/>
<source>hexadecimal</source>
- <translation type="unfinished"></translation>
+ <translation>szesnastkowy</translation>
</message>
<message>
<location line="+1"/>
<source>binary</source>
- <translation type="unfinished"></translation>
+ <translation>binarny</translation>
</message>
<message>
<location line="+0"/>
<source>octal</source>
- <translation type="unfinished"></translation>
+ <translation>ósemkowy</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+86"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location line="+1"/>
<source>Value</source>
- <translation type="unfinished"></translation>
+ <translation>Wartość</translation>
</message>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
</context>
<context>
<name>QtDumperHelper</name>
<message>
<location filename="../../../src/plugins/debugger/watchutils.cpp" line="+103"/>
- <source>Found a too-old version of the debugging helper library (%1); version %2 is required.</source>
+ <source>Found an outdated version of the debugging helper library (%1); version %2 is required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+36"/>
<source><none></source>
- <translation type="unfinished"></translation>
+ <translation><brak></translation>
</message>
<message numerus="yes">
<location line="+1"/>
@@ -8696,22 +8787,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+95"/>
<source>Change format for type '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień format typu "%1"</translation>
</message>
<message>
<location line="+1"/>
<source>Change format for expression '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień format wyrażenia "%1"</translation>
</message>
<message>
<location line="+21"/>
<source>Change format for type</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień format typu</translation>
</message>
<message>
<location line="+2"/>
<source>Change format for expression</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień format wyrażenia</translation>
</message>
<message>
<location line="+6"/>
@@ -8724,24 +8815,29 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Open memory editor...</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz edytor pamięci...</translation>
</message>
<message>
<location line="+4"/>
<source>Open memory editor at %1</source>
+ <translation>Otwórz edytor pamięci z adresem %1</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Refresh code model snapshot</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+9"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrównaj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
</context>
<context>
@@ -8749,7 +8845,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/cpp/formclasswizarddialog.cpp" line="+50"/>
<source>Qt Designer Form Class</source>
- <translation type="unfinished"></translation>
+ <translation>Klasa formularza Qt Designer</translation>
</message>
</context>
<context>
@@ -8757,27 +8853,27 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/designerconstants.h" line="+38"/>
<source>Designer</source>
- <translation type="unfinished"></translation>
+ <translation>Designer</translation>
</message>
<message>
<location line="+1"/>
<source>Class Generation</source>
- <translation type="unfinished"></translation>
+ <translation>Generowanie klasy</translation>
</message>
<message>
<location filename="../../../src/shared/qrceditor/resourcefile.cpp" line="+54"/>
<source>The file name is empty.</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa pliku jest pusta.</translation>
</message>
<message>
<location line="+54"/>
<source>XML error on line %1, col %2: %3</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d XML w linii %1, w kolumnie %2: %3</translation>
</message>
<message>
<location line="+7"/>
<source>The <RCC> root element is missing.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak głównego elementu <RCC>.</translation>
</message>
</context>
<context>
@@ -8785,22 +8881,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formeditorplugin.cpp" line="+137"/>
<source>Qt</source>
- <translation type="unfinished"></translation>
+ <translation>Qt</translation>
</message>
<message>
<location line="+2"/>
<source>Qt Designer Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz Qt Designer</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt Designer form file (.ui).</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy plik z formularzem Qt Designer (.ui).</translation>
</message>
<message>
<location line="+5"/>
<source>Qt Designer Form Class</source>
- <translation type="unfinished"></translation>
+ <translation>Klasa formularza Qt Designer</translation>
</message>
<message>
<location line="+1"/>
@@ -8814,70 +8910,70 @@ Using gdb 6.7 or later is strongly recommended.</source>
<location filename="../../../src/plugins/designer/formeditorw.cpp" line="+335"/>
<location line="+170"/>
<source>Widget Box</source>
- <translation type="unfinished"></translation>
+ <translation>Panel widżetów</translation>
</message>
<message>
<location line="-165"/>
<location line="+169"/>
<source>Object Inspector</source>
- <translation type="unfinished"></translation>
+ <translation>Hierarchia obiektów</translation>
</message>
<message>
<location line="-164"/>
<location line="+168"/>
<source>Property Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor właściwości</translation>
</message>
<message>
<location line="-163"/>
<source>Signals & Slots Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor sygnałów / slotów</translation>
</message>
<message>
<location line="+4"/>
<location line="+167"/>
<source>Action Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor akcji</translation>
</message>
<message>
<location line="-125"/>
<source>For&m editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor for&mularzy</translation>
</message>
<message>
<location line="+35"/>
<source>Edit widgets</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj widżety</translation>
</message>
<message>
<location line="+1"/>
<source>F3</source>
- <translation type="unfinished"></translation>
+ <translation>F3</translation>
</message>
<message>
<location line="+4"/>
<source>Edit signals/slots</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj sygnały / sloty</translation>
</message>
<message>
<location line="+1"/>
<source>F4</source>
- <translation type="unfinished"></translation>
+ <translation>F4</translation>
</message>
<message>
<location line="+4"/>
<source>Edit buddies</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj skojarzone etykiety</translation>
</message>
<message>
<location line="+5"/>
<source>Edit tab order</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj kolejność tabulacji</translation>
</message>
<message>
<location line="+5"/>
<source>Meta+H</source>
- <translation type="unfinished"></translation>
+ <translation>Meta+H</translation>
</message>
<message>
<location line="+0"/>
@@ -8917,12 +9013,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+20"/>
<source>Views</source>
- <translation type="unfinished"></translation>
+ <translation>Widoki</translation>
</message>
<message>
<location line="+15"/>
<source>Signals && Slots Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor sygnałów / slotów</translation>
</message>
<message>
<location line="+10"/>
@@ -8932,7 +9028,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+7"/>
<source>Reset to Default Layout</source>
- <translation type="unfinished"></translation>
+ <translation>Przywróć domyślne rozmieszczenie</translation>
</message>
<message>
<location line="+10"/>
@@ -8942,17 +9038,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+15"/>
<source>About Qt Designer plugins....</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje o wtyczkach Qt Designer...</translation>
</message>
<message>
<location line="+35"/>
<source>Preview in</source>
- <translation type="unfinished"></translation>
+ <translation>PodglÄ…d w stylu</translation>
</message>
<message>
<location line="+48"/>
<source>Designer</source>
- <translation type="unfinished"></translation>
+ <translation>Designer</translation>
</message>
<message>
<location line="+161"/>
@@ -8965,12 +9061,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formtemplatewizardpage.cpp" line="+62"/>
<source>Choose a form template</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz szablon formularza</translation>
</message>
<message>
<location line="+30"/>
<source>%1 - Error</source>
- <translation type="unfinished"></translation>
+ <translation>%1 - BÅ‚Ä…d</translation>
</message>
</context>
<context>
@@ -8978,7 +9074,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+167"/>
<source>untitled</source>
- <translation type="unfinished"></translation>
+ <translation>nienazwany</translation>
</message>
</context>
<context>
@@ -8986,17 +9082,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formwindowfile.cpp" line="+77"/>
<source>Error saving %1</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas zachowywania %1</translation>
</message>
<message>
<location line="+106"/>
<source>Unable to open %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć %1: %2</translation>
</message>
<message>
<location line="+12"/>
<source>Unable to write to %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać do %1: %2</translation>
</message>
</context>
<context>
@@ -9004,7 +9100,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formwizarddialog.cpp" line="+60"/>
<source>Qt Designer Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formularz Qt Designer</translation>
</message>
</context>
<context>
@@ -9028,7 +9124,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+59"/>
<source>Unable to add the method definition.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dodać definicji metody.</translation>
</message>
</context>
<context>
@@ -9036,18 +9132,18 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/fakevim/fakevimactions.cpp" line="+119"/>
<source>Toggle vim-style editing</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz ustawienie edycji w stylu vim</translation>
</message>
<message>
<location line="+56"/>
<source>FakeVim properties...</source>
- <translation type="unfinished"></translation>
+ <translation>Właściwości FakeVim...</translation>
</message>
</context>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+245"/>
+ <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+249"/>
<source>E20: Mark '%1' not set</source>
<translation type="unfinished"></translation>
</message>
@@ -9067,7 +9163,7 @@ Rebuilding the project might help.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1001"/>
+ <location line="+1003"/>
<source>File '%1' exists (add ! to override)</source>
<translation type="unfinished"></translation>
</message>
@@ -9131,7 +9227,7 @@ Rebuilding the project might help.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>Already at newest change</source>
<translation type="unfinished"></translation>
</message>
@@ -9141,7 +9237,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+114"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ogólne</translation>
</message>
<message>
<location line="+2"/>
@@ -9160,7 +9256,7 @@ Rebuilding the project might help.</source>
<message>
<location line="-117"/>
<source>Saving succeeded</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowywanie pomyślnie zakończone</translation>
</message>
<message numerus="yes">
<location line="+2"/>
@@ -9172,7 +9268,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+10"/>
<source>Not an editor command: %1</source>
- <translation type="unfinished"></translation>
+ <translation>%1 nie jest komendÄ… edytora</translation>
</message>
<message>
<location line="+112"/>
@@ -9185,12 +9281,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/find/findplugin.cpp" line="+150"/>
<source>&Find/Replace</source>
- <translation type="unfinished"></translation>
+ <translation>Z&najdź / zastąp</translation>
</message>
<message>
<location line="+17"/>
<source>Find...</source>
- <translation type="unfinished"></translation>
+ <translation>Znajdź...</translation>
</message>
<message>
<location line="+2"/>
@@ -9203,12 +9299,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/find/findtoolbar.cpp" line="+139"/>
<source>Current Document</source>
- <translation type="unfinished"></translation>
+ <translation>Bieżący dokument</translation>
</message>
<message>
<location line="+7"/>
<source>Enter Find String</source>
- <translation type="unfinished"></translation>
+ <translation>Podaj ciÄ…g do znalezienia</translation>
</message>
<message>
<location line="+2"/>
@@ -9218,17 +9314,17 @@ Rebuilding the project might help.</source>
<message>
<location line="+6"/>
<source>Find Next</source>
- <translation type="unfinished"></translation>
+ <translation>Znajdź następne</translation>
</message>
<message>
<location line="+7"/>
<source>Find Previous</source>
- <translation type="unfinished"></translation>
+ <translation>Znajdź poprzednie</translation>
</message>
<message>
<location line="+7"/>
<source>Replace && Find Next</source>
- <translation type="unfinished"></translation>
+ <translation>Zastąp i znajdź następne</translation>
</message>
<message>
<location line="+2"/>
@@ -9238,27 +9334,27 @@ Rebuilding the project might help.</source>
<message>
<location line="+5"/>
<source>Replace && Find Previous</source>
- <translation type="unfinished"></translation>
+ <translation>Zastąp i znajdź poprzednie</translation>
</message>
<message>
<location line="+8"/>
<source>Replace All</source>
- <translation type="unfinished"></translation>
+ <translation>ZastÄ…p wszystkie</translation>
</message>
<message>
<location line="+6"/>
<source>Case Sensitive</source>
- <translation type="unfinished"></translation>
+ <translation>Uwzględniaj wielkość liter</translation>
</message>
<message>
<location line="+9"/>
<source>Whole Words Only</source>
- <translation type="unfinished"></translation>
+ <translation>Tylko całe słowa</translation>
</message>
<message>
<location line="+9"/>
<source>Use Regular Expressions</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj wyrażeń regularnych</translation>
</message>
</context>
<context>
@@ -9271,40 +9367,40 @@ Rebuilding the project might help.</source>
<message>
<location line="+8"/>
<source>Expand All</source>
- <translation type="unfinished"></translation>
+ <translation>Rozwiń wszystko</translation>
</message>
<message>
<location line="+2"/>
<source>Replace with:</source>
- <translation type="unfinished"></translation>
+ <translation>ZastÄ…p:</translation>
</message>
<message>
<location line="+4"/>
<source>Replace all occurrences</source>
- <translation type="unfinished"></translation>
+ <translation>ZastÄ…p wszystkie wystÄ…pienia</translation>
</message>
<message>
<location line="+1"/>
<source>Replace</source>
- <translation type="unfinished"></translation>
+ <translation>ZastÄ…p</translation>
</message>
<message>
<location filename="../../../src/plugins/find/searchresultwindow.h" line="+89"/>
<source>Search Results</source>
- <translation type="unfinished"></translation>
+ <translation>Wyniki poszukiwania</translation>
</message>
</context>
<context>
<name>GenericProjectManager::Internal::GenericMakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+189"/>
+ <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+190"/>
<source>Override %1:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nadpisanie %1:</translation>
</message>
<message>
<location line="+32"/>
<source><b>Make:</b> %1 %2</source>
- <translation type="unfinished"></translation>
+ <translation><b>Make:</b> %1 %2</translation>
</message>
</context>
<context>
@@ -9312,7 +9408,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+93"/>
<source><new></source>
- <translation type="unfinished"></translation>
+ <translation><nowy></translation>
</message>
</context>
<context>
@@ -9320,17 +9416,17 @@ Rebuilding the project might help.</source>
<message>
<location line="+38"/>
<source>Create</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz</translation>
</message>
<message>
<location line="+10"/>
<source>New configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Nowa konfiguracja</translation>
</message>
<message>
<location line="+1"/>
<source>New Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa nowej konfiguracji:</translation>
</message>
</context>
<context>
@@ -9338,12 +9434,12 @@ Rebuilding the project might help.</source>
<message>
<location line="+450"/>
<source>Build directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog budowania wersji:</translation>
</message>
<message>
<location line="+17"/>
<source>Tool Chain:</source>
- <translation type="unfinished"></translation>
+ <translation>ÅaÅ„cuch narzÄ™dzi:</translation>
</message>
<message>
<location line="+8"/>
@@ -9356,27 +9452,27 @@ 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"></translation>
+ <translation type="unfinished">Zaimportuj projekt bazujÄ…cy na pliku Makefile</translation>
</message>
<message>
<location line="+4"/>
<source>Generic Project</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólny projekt</translation>
</message>
<message>
<location line="+1"/>
<source>Project name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa projektu:</translation>
</message>
<message>
<location line="+1"/>
<source>Location:</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie:</translation>
</message>
<message>
<location line="+7"/>
<source>Second Page Title</source>
- <translation type="unfinished"></translation>
+ <translation>Tytuł drugiej strony</translation>
</message>
</context>
<context>
@@ -9384,22 +9480,22 @@ Rebuilding the project might help.</source>
<message>
<location line="+109"/>
<source>Import of Makefile-based Project</source>
- <translation type="unfinished"></translation>
+ <translation>Zaimportuj projekt bazujÄ…cy na pliku Makefile</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a generic project, supporting any build system.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy ogólny projekt obsługujący dowolny system budowania.</translation>
</message>
<message>
<location line="+2"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekty</translation>
</message>
<message>
<location line="+124"/>
<source>The project %1 could not be opened.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu %1.</translation>
</message>
</context>
<context>
@@ -9407,12 +9503,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/git/branchmodel.cpp" line="+181"/>
<source><New branch></source>
- <translation type="unfinished"></translation>
+ <translation><Nowa gałąź></translation>
</message>
<message>
<location line="+1"/>
<source>Type to create a new branch</source>
- <translation type="unfinished"></translation>
+ <translation>Wpisz w celu utworzenia nowej gałęzi</translation>
</message>
</context>
<context>
@@ -9425,17 +9521,17 @@ Rebuilding the project might help.</source>
<message>
<location line="+7"/>
<source>Select Git repository</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz składnicę Git</translation>
</message>
<message>
<location line="+17"/>
<source>Error</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d</translation>
</message>
<message>
<location line="+1"/>
<source>Selected directory is not a Git repository</source>
- <translation type="unfinished"></translation>
+ <translation>Wybrany katalog nie jest składnicą Git</translation>
</message>
</context>
<context>
@@ -9443,12 +9539,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/git/clonewizard.cpp" line="+53"/>
<source>Clones a project from a git repository.</source>
- <translation type="unfinished"></translation>
+ <translation>Klonuje projekt ze składnicy git.</translation>
</message>
<message>
<location line="+5"/>
<source>Git Repository Clone</source>
- <translation type="unfinished"></translation>
+ <translation>Klon składnicy Git</translation>
</message>
</context>
<context>
@@ -9474,24 +9570,25 @@ Rebuilding the project might help.</source>
<message>
<location line="+15"/>
<source>Unable to determine the repository for %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można określić składnicy dla %1.</translation>
</message>
<message>
<location line="+5"/>
<source>Unable to parse the file output.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przetworzyć wyjścia pliku.</translation>
</message>
<message>
<location line="+7"/>
<source>Executing: %1 %2
</source>
<extracomment>Executing: <executable> <arguments></extracomment>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie: %1 %2
+</translation>
</message>
<message>
<location line="+5"/>
<source>Waiting for data...</source>
- <translation type="unfinished"></translation>
+ <translation>Oczekiwanie na dane...</translation>
</message>
<message>
<location line="+100"/>
@@ -9521,8 +9618,10 @@ Rebuilding the project might help.</source>
<message numerus="yes">
<location line="+56"/>
<source>Unable to add %n file(s) to %1: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Nie można dodać %n pliku do %1: %2</numerusform>
+ <numerusform>Nie można dodać %n plików do %1: %2</numerusform>
+ <numerusform>Nie można dodać %n plików do %1: %2</numerusform>
</translation>
</message>
<message numerus="yes">
@@ -9547,32 +9646,32 @@ Rebuilding the project might help.</source>
<message>
<location line="+16"/>
<source>Unable to run branch command: %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić komendy "branch": %1: %2</translation>
</message>
<message>
<location line="+18"/>
<source>Unable to run show: %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić komendy "show": %1: %2</translation>
</message>
<message>
<location line="+148"/>
<source>Changes</source>
- <translation type="unfinished"></translation>
+ <translation>Zmiany</translation>
</message>
<message>
<location line="+1"/>
<source>You have modified files. Would you like to stash your changes?</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikowałeś pliki. Czy chcesz odłożyć swoje zmiany na później?</translation>
</message>
<message>
<location line="+51"/>
<source>Unable to obtain the status: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otrzymać stanu: %1</translation>
</message>
<message>
<location line="+31"/>
<source>The repository %1 is not initialized yet.</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica %1 nie jest jeszcze zainicjalizowana.</translation>
</message>
<message numerus="yes">
<location line="+106"/>
@@ -9593,22 +9692,22 @@ Rebuilding the project might help.</source>
<message>
<location line="+79"/>
<source>Revert</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany</translation>
</message>
<message>
<location line="+1"/>
<source>The file has been changed. Do you want to revert it?</source>
- <translation type="unfinished"></translation>
+ <translation>Plik został zmieniony. Czy chcesz odwrócić w nim zmiany?</translation>
</message>
<message>
<location line="+24"/>
<source>The file is not modified.</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nie jest zmodyfikowany.</translation>
</message>
<message>
<location line="+22"/>
<source>There are no modified files.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak zmodyfikowanych plików.</translation>
</message>
</context>
<context>
@@ -9618,14 +9717,18 @@ Rebuilding the project might help.</source>
<source>
'%1' failed (exit code %2).
</source>
- <translation type="unfinished"></translation>
+ <translation>
+'%1' zakończone niepowodzeniem (kod wyjściowy %2).
+</translation>
</message>
<message>
<location line="+1"/>
<source>
'%1' completed (exit code %2).
</source>
- <translation type="unfinished"></translation>
+ <translation>
+'%1' zakończyło się (kod wyjściowy %2).
+</translation>
</message>
</context>
<context>
@@ -9633,17 +9736,17 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/git/gitorious/gitorious.cpp" line="+471"/>
<source>Error parsing reply from '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d przetwarzania odpowiedzi z "%1": %2</translation>
</message>
<message>
<location line="+45"/>
<source>Request failed for '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Żądanie zostało niepomyślnie zakończone dla "%1": %2</translation>
</message>
<message>
<location line="+80"/>
<source>Open source projects that use Git.</source>
- <translation type="unfinished"></translation>
+ <translation>Projekty otwartego oprogramowania używające Git.</translation>
</message>
</context>
<context>
@@ -9651,12 +9754,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/git/gitorious/gitoriousclonewizard.cpp" line="+81"/>
<source>Clones a project from a Gitorious repository.</source>
- <translation type="unfinished"></translation>
+ <translation>Klonuje projekt ze składnicy Gitorious.</translation>
</message>
<message>
<location line="+5"/>
<source>Gitorious Repository Clone</source>
- <translation type="unfinished"></translation>
+ <translation>Klon składnicy Gitorious</translation>
</message>
</context>
<context>
@@ -9664,7 +9767,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/git/gitorious/gitorioushostwizardpage.cpp" line="+76"/>
<source>Select a host.</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz host.</translation>
</message>
</context>
<context>
@@ -9672,7 +9775,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp" line="+57"/>
<source>Choose a project from '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz projekt z "%1"</translation>
</message>
</context>
<context>
@@ -9680,17 +9783,17 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/git/gitplugin.cpp" line="+232"/>
<source>&Git</source>
- <translation type="unfinished"></translation>
+ <translation>&Git</translation>
</message>
<message>
<location line="+9"/>
<source>Diff Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w bieżącym pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Diff "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w "%1"</translation>
</message>
<message>
<location line="+3"/>
@@ -9700,12 +9803,12 @@ Rebuilding the project might help.</source>
<message>
<location line="+4"/>
<source>File Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Status Related to "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Stan zwiÄ…zany z "%1"</translation>
</message>
<message>
<location line="+2"/>
@@ -9745,12 +9848,12 @@ Rebuilding the project might help.</source>
<message>
<location line="+5"/>
<source>Undo Changes</source>
- <translation type="unfinished"></translation>
+ <translation>Cofnij zmiany</translation>
</message>
<message>
<location line="+0"/>
<source>Undo Changes for "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Cofnij zmiany w "%1"</translation>
</message>
<message>
<location line="+2"/>
@@ -9785,22 +9888,22 @@ Rebuilding the project might help.</source>
<message>
<location line="+8"/>
<source>Diff Current Project</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w bieżącym projekcie</translation>
</message>
<message>
<location line="+0"/>
<source>Diff Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w projekcie "%1"</translation>
</message>
<message>
<location line="+7"/>
<source>Project Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan projektu</translation>
</message>
<message>
<location line="+0"/>
<source>Status Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Stan projektu "%1"</translation>
</message>
<message>
<location line="+6"/>
@@ -9865,7 +9968,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+8"/>
<source>Branches...</source>
- <translation type="unfinished"></translation>
+ <translation>Gałęzie...</translation>
</message>
<message>
<location line="+6"/>
@@ -9880,32 +9983,32 @@ Rebuilding the project might help.</source>
<message>
<location line="+9"/>
<source>Commit</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Wyślij</translation>
</message>
<message>
<location line="+4"/>
<source>Diff Selected Files</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w zaznaczonych plikach</translation>
</message>
<message>
<location line="+3"/>
<source>&Undo</source>
- <translation type="unfinished"></translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished"></translation>
+ <translation>&Przywróć</translation>
</message>
<message>
<location line="+60"/>
<source>Could not find working directory</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć katalogu roboczego</translation>
</message>
<message>
<location line="+61"/>
<source>Revert</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany</translation>
</message>
<message>
<location line="+1"/>
@@ -9920,17 +10023,17 @@ Rebuilding the project might help.</source>
<message>
<location line="+30"/>
<source>Cannot create temporary file: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć tymczasowego pliku: %1</translation>
</message>
<message>
<location line="+58"/>
<source>Closing git editor</source>
- <translation type="unfinished"></translation>
+ <translation>Zamykanie edytora git</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to commit the change?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz wysłać zmianę?</translation>
</message>
<message>
<location line="+1"/>
@@ -9943,7 +10046,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/git/gitsettings.cpp" line="+110"/>
<source>The binary '%1' could not be located in the path '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć pliku binarnego "%1" w ścieżce "%2"</translation>
</message>
</context>
<context>
@@ -10005,38 +10108,38 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/help/centralwidget.cpp" line="+97"/>
<source>Add new page</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj nowÄ… stronÄ™</translation>
</message>
<message>
<location line="+238"/>
<source>Print Document</source>
- <translation type="unfinished"></translation>
+ <translation>Wydrukuj dokument</translation>
</message>
<message>
<location line="+120"/>
<location line="+2"/>
<source>unknown</source>
- <translation type="unfinished"></translation>
+ <translation>nieznany</translation>
</message>
<message>
<location line="+87"/>
<source>Add New Page</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj nowÄ… stronÄ™</translation>
</message>
<message>
<location line="+3"/>
<source>Close This Page</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij tÄ… stronÄ™</translation>
</message>
<message>
<location line="+3"/>
<source>Close Other Pages</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij pozostałe strony</translation>
</message>
<message>
<location line="+5"/>
<source>Add Bookmark for this Page...</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj zakładkę do tej strony...</translation>
</message>
</context>
<context>
@@ -10045,33 +10148,33 @@ Rebuilding the project might help.</source>
<location filename="../../../src/plugins/help/docsettingspage.cpp" line="+51"/>
<location line="+84"/>
<source>Documentation</source>
- <translation type="unfinished"></translation>
+ <translation>Dokumentacja</translation>
</message>
<message>
<location line="-73"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Pomoc</translation>
</message>
<message>
<location line="+23"/>
<location line="+10"/>
<source>Add Documentation</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj dokumentacjÄ™</translation>
</message>
<message>
<location line="-9"/>
<source>Qt Help Files (*.qch)</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki pomocy Qt (*.qch)</translation>
</message>
<message>
<location line="+10"/>
<source>The file %1 is not a valid Qt Help file!</source>
- <translation type="unfinished"></translation>
+ <translation>Plik %1 nie jest poprawnym plikiem pomocy Qt!</translation>
</message>
<message>
<location line="+40"/>
<source>Cannot unregister documentation file %1!</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można wyrejestrować pliku dokumentacji %1!</translation>
</message>
</context>
<context>
@@ -10079,12 +10182,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/help/filtersettingspage.cpp" line="+51"/>
<source>Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Filtry</translation>
</message>
<message>
<location line="+10"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Pomoc</translation>
</message>
</context>
<context>
@@ -10092,12 +10195,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/help/generalsettingspage.cpp" line="+74"/>
<source>General settings</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia ogólne</translation>
</message>
<message>
<location line="+10"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Pomoc</translation>
</message>
<message>
<location line="+122"/>
@@ -10108,17 +10211,17 @@ Rebuilding the project might help.</source>
<location line="+1"/>
<location line="+22"/>
<source>Files (*.xbel)</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki (*.xbel)</translation>
</message>
<message>
<location line="-8"/>
<source>There was an error while importing bookmarks!</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił błąd podczas importowania zakładek!</translation>
</message>
<message>
<location line="+7"/>
<source>Save File</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj plik</translation>
</message>
</context>
<context>
@@ -10126,7 +10229,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/help/helpindexfilter.cpp" line="+72"/>
<source>Help index</source>
- <translation type="unfinished"></translation>
+ <translation>Indeks pomocy</translation>
</message>
</context>
<context>
@@ -10134,7 +10237,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/help/helpmode.cpp" line="+46"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Pomoc</translation>
</message>
</context>
<context>
@@ -10143,24 +10246,24 @@ Rebuilding the project might help.</source>
<location filename="../../../src/plugins/help/helpplugin.cpp" line="+209"/>
<location line="+46"/>
<source>Contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zawartość</translation>
</message>
<message>
<location line="-44"/>
<location line="+38"/>
<source>Index</source>
- <translation type="unfinished"></translation>
+ <translation>Indeks</translation>
</message>
<message>
<location line="-36"/>
<location line="+48"/>
<source>Search</source>
- <translation type="unfinished"></translation>
+ <translation>Wyszukaj</translation>
</message>
<message>
<location line="-45"/>
<source>Bookmarks</source>
- <translation type="unfinished"></translation>
+ <translation>Zakładki</translation>
</message>
<message>
<location line="+8"/>
@@ -10170,42 +10273,42 @@ Rebuilding the project might help.</source>
<message>
<location line="+6"/>
<source>Previous Page</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia strona</translation>
</message>
<message>
<location line="+6"/>
<source>Next Page</source>
- <translation type="unfinished"></translation>
+ <translation>Następna strona</translation>
</message>
<message>
<location line="+7"/>
<source>Add Bookmark</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj zakładkę</translation>
</message>
<message>
<location line="+24"/>
<source>Context Help</source>
- <translation type="unfinished"></translation>
+ <translation>Pomoc podręczna</translation>
</message>
<message>
<location line="+58"/>
<source>Activate Index in Help mode</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktywnij indeks w trybie pomocy</translation>
</message>
<message>
<location line="+8"/>
<source>Activate Contents in Help mode</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktywnij zawartość w trybie pomocy</translation>
</message>
<message>
<location line="+8"/>
<source>Activate Search in Help mode</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktywnij wyszukiwanie w trybie pomocy</translation>
</message>
<message>
<location line="+74"/>
<source>Increase Font Size</source>
- <translation type="unfinished"></translation>
+ <translation>Zwiększ rozmiar czcionki</translation>
</message>
<message>
<location line="+3"/>
@@ -10215,7 +10318,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+4"/>
<source>Decrease Font Size</source>
- <translation type="unfinished"></translation>
+ <translation>Zmniejsz rozmiar czcionki</translation>
</message>
<message>
<location line="+3"/>
@@ -10225,7 +10328,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+4"/>
<source>Reset Font Size</source>
- <translation type="unfinished"></translation>
+ <translation>Przywróć domyślny rozmiar czcionki</translation>
</message>
<message>
<location line="+3"/>
@@ -10233,31 +10336,36 @@ Rebuilding the project might help.</source>
<translation>Ctrl+0</translation>
</message>
<message>
- <location line="+23"/>
- <source>Previous</source>
+ <location line="+20"/>
+ <source>Go to Help Mode</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+3"/>
+ <source>Previous</source>
+ <translation>Poprzedni</translation>
+ </message>
<message>
<location line="+2"/>
<source>Next</source>
- <translation type="unfinished"></translation>
+ <translation>Następny</translation>
</message>
<message>
<location line="+176"/>
<location line="+4"/>
<location line="+146"/>
<source>Unfiltered</source>
- <translation type="unfinished"></translation>
+ <translation>Nieprzefiltrowane</translation>
</message>
<message>
<location line="+12"/>
<source><html><head><title>No Documentation</title></head><body><br/><center><b>%1</b><br/>No documentation available.</center></body></html></source>
- <translation type="unfinished"></translation>
+ <translation><html><head><title>Brak dokumentacji</title></head><body><br/><center><b>%1</b><br/>Brak dostępnej dokumentacji.</center></body></html></translation>
</message>
<message>
<location line="+54"/>
<source>Filtered by:</source>
- <translation type="unfinished"></translation>
+ <translation>Przefiltrowane przez:</translation>
</message>
</context>
<context>
@@ -10265,22 +10373,22 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/help/searchwidget.cpp" line="+169"/>
<source>&Copy</source>
- <translation type="unfinished"></translation>
+ <translation>S&kopiuj</translation>
</message>
<message>
<location line="+4"/>
<source>Copy &Link Location</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj &adres odsyłacza</translation>
</message>
<message>
<location line="+4"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz odsyłacz w nowej karcie</translation>
</message>
<message>
<location line="+8"/>
<source>Select All</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznacz wszystko</translation>
</message>
</context>
<context>
@@ -10288,12 +10396,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/help/xbelsupport.cpp" line="+119"/>
<source>The file is not an XBEL version 1.0 file.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten plik nie jest plikiem XBEL wersji 1.0.</translation>
</message>
<message>
<location line="+73"/>
<source>Unknown title</source>
- <translation type="unfinished"></translation>
+ <translation>Nieznany plik</translation>
</message>
</context>
<context>
@@ -10301,17 +10409,17 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/perforce/perforceplugin.cpp" line="+243"/>
<source>&Perforce</source>
- <translation type="unfinished"></translation>
+ <translation>&Perforce</translation>
</message>
<message>
<location line="+17"/>
<source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Edycja</translation>
</message>
<message>
<location line="+0"/>
<source>Edit "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj "%1"</translation>
</message>
<message>
<location line="+3"/>
@@ -10321,17 +10429,17 @@ Rebuilding the project might help.</source>
<message>
<location line="+1"/>
<source>Edit File</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj plik</translation>
</message>
<message>
<location line="+4"/>
<source>Add</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj</translation>
</message>
<message>
<location line="+0"/>
<source>Add "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj "%1"</translation>
</message>
<message>
<location line="+3"/>
@@ -10341,32 +10449,32 @@ Rebuilding the project might help.</source>
<message>
<location line="+1"/>
<source>Add File</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj plik</translation>
</message>
<message>
<location line="+4"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
<message>
<location line="+0"/>
<source>Delete "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń "%1"</translation>
</message>
<message>
<location line="+3"/>
<source>Delete File</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń plik</translation>
</message>
<message>
<location line="+4"/>
<source>Revert</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany</translation>
</message>
<message>
<location line="+0"/>
<source>Revert "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w "%1"</translation>
</message>
<message>
<location line="+3"/>
@@ -10376,28 +10484,28 @@ Rebuilding the project might help.</source>
<message>
<location line="+1"/>
<source>Revert File</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w pliku</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Diff Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w bieżącym pliku</translation>
</message>
<message>
<location line="-3"/>
<source>Diff "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w "%1"</translation>
</message>
<message>
<location line="+7"/>
<source>Diff Current Project/Session</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w bieżącym projekcie / sesji</translation>
</message>
<message>
<location line="+1"/>
<source>Diff Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w projekcie "%1"</translation>
</message>
<message>
<location line="+3"/>
@@ -10407,12 +10515,12 @@ Rebuilding the project might help.</source>
<message>
<location line="+5"/>
<source>Diff Opened Files</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w otwartych plikach</translation>
</message>
<message>
<location line="+10"/>
<source>Opened</source>
- <translation type="unfinished"></translation>
+ <translation>Otwarto</translation>
</message>
<message>
<location line="+2"/>
@@ -10432,38 +10540,38 @@ Rebuilding the project might help.</source>
<message>
<location line="+4"/>
<source>Pending Changes...</source>
- <translation type="unfinished"></translation>
+ <translation>OczekujÄ…ce zmiany...</translation>
</message>
<message>
<location line="+5"/>
<source>Update Current Project/Session</source>
- <translation type="unfinished"></translation>
+ <translation>Odśwież bieżący projekt / sesję</translation>
</message>
<message>
<location line="+1"/>
<source>Update Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Odśwież projekt "%1"</translation>
</message>
<message>
<location line="+12"/>
<source>Describe...</source>
- <translation type="unfinished"></translation>
+ <translation>Opisz...</translation>
</message>
<message>
<location line="+5"/>
<location line="+3"/>
<source>Annotate Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację do bieżącego pliku</translation>
</message>
<message>
<location line="-3"/>
<source>Annotate "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację do "%1"</translation>
</message>
<message>
<location line="+7"/>
<source>Annotate...</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację...</translation>
</message>
<message>
<location line="+5"/>
@@ -10489,93 +10597,94 @@ Rebuilding the project might help.</source>
<message>
<location line="+5"/>
<source>Update All</source>
- <translation type="unfinished"></translation>
+ <translation>Odśwież wszystko</translation>
</message>
<message>
<location line="+5"/>
<source>Submit</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij</translation>
</message>
<message>
<location line="+4"/>
<source>Diff Selected Files</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w zaznaczonych plikach</translation>
</message>
<message>
<location line="+3"/>
<source>&Undo</source>
- <translation type="unfinished"></translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished"></translation>
+ <translation>&Przywróć</translation>
</message>
<message>
<location line="+49"/>
<source>p4 revert</source>
- <translation type="unfinished"></translation>
+ <translation>p4 revert</translation>
</message>
<message>
<location line="+1"/>
<source>The file has been changed. Do you want to revert it?</source>
- <translation type="unfinished"></translation>
+ <translation>Plik został zmieniony. Czy chcesz odwrócić w nim zmiany?</translation>
</message>
<message>
<location line="+93"/>
<source>Another submit is currently executed.</source>
- <translation type="unfinished"></translation>
+ <translation>Trwa inna wysyłka.</translation>
</message>
<message>
<location line="+7"/>
<source>Cannot create temporary file.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć tymczasowego pliku.</translation>
</message>
<message>
<location line="+33"/>
<source>Project has no files</source>
- <translation type="unfinished"></translation>
+ <translation>Brak plików w projekcie</translation>
</message>
<message>
<location line="+49"/>
<source>p4 annotate</source>
- <translation type="unfinished"></translation>
+ <translation>p4 annotate</translation>
</message>
<message>
<location line="+15"/>
<source>p4 annotate %1</source>
- <translation type="unfinished"></translation>
+ <translation>p4 annotate %1</translation>
</message>
<message>
<location line="+15"/>
<source>p4 filelog</source>
- <translation type="unfinished"></translation>
+ <translation>p4 filelog</translation>
</message>
<message>
<location line="+14"/>
<source>p4 filelog %1</source>
- <translation type="unfinished"></translation>
+ <translation>p4 filelog %1</translation>
</message>
<message>
<location line="+110"/>
<source>Executing: %1
</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonywanie: %1
+</translation>
</message>
<message>
<location line="+70"/>
<source>The process terminated with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces zakończył się kodem wyjściowym %1.</translation>
</message>
<message>
<location line="+3"/>
<source>The process terminated abnormally.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces niepoprawnie zakończony.</translation>
</message>
<message>
<location line="+3"/>
<source>Could not start perforce '%1'. Please check your settings in the preferences.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić perforce "%1". Sprawdź stosowne ustawienia.</translation>
</message>
<message>
<location line="+3"/>
@@ -10585,22 +10694,22 @@ Rebuilding the project might help.</source>
<message>
<location line="+84"/>
<source>p4 diff %1</source>
- <translation type="unfinished"></translation>
+ <translation>p4 diff %1</translation>
</message>
<message>
<location line="+22"/>
<source>p4 describe %1</source>
- <translation type="unfinished"></translation>
+ <translation>p4 describe %1</translation>
</message>
<message>
<location line="+41"/>
<source>Closing p4 Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Zamykanie edytora p4</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to submit this change list?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz wysłać tą listę zmian?</translation>
</message>
<message>
<location line="+1"/>
@@ -10610,23 +10719,23 @@ Rebuilding the project might help.</source>
<message>
<location line="+18"/>
<source>Cannot open temporary file.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć tymczasowego pliku.</translation>
</message>
<message>
<location line="+19"/>
<location line="+8"/>
<source>Cannot execute p4 submit.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić "p4 submit".</translation>
</message>
<message>
<location line="+6"/>
<source>p4 submit failed (exit code %1).</source>
- <translation type="unfinished"></translation>
+ <translation>"p4 submit" zakończone niepowodzeniem (kod wyjściowy %1).</translation>
</message>
<message>
<location line="+7"/>
<source>Pending change</source>
- <translation type="unfinished"></translation>
+ <translation>OczekujÄ…ca zmiana</translation>
</message>
<message>
<location line="+0"/>
@@ -10636,7 +10745,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+59"/>
<source>Invalid configuration: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna konfiguracja: %1</translation>
</message>
<message>
<location line="+63"/>
@@ -10654,12 +10763,12 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/perforce/perforcesettings.cpp" line="+100"/>
<source>No executable specified</source>
- <translation type="unfinished"></translation>
+ <translation>Nie podano programu do uruchomienia</translation>
</message>
<message>
<location line="+11"/>
<source>Unable to launch "%1": %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić "%1": %2</translation>
</message>
<message>
<location line="+8"/>
@@ -10669,12 +10778,12 @@ Rebuilding the project might help.</source>
<message>
<location line="+4"/>
<source>"%1" crashed.</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił błąd w "%1" - proces zakończony.</translation>
</message>
<message>
<location line="+5"/>
<source>"%1" terminated with exit code %2: %3</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" zakończone kodem wyjściowym %2: %3</translation>
</message>
<message>
<location line="+8"/>
@@ -10695,17 +10804,17 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/perforce/settingspage.cpp" line="-59"/>
<source>Perforce Command</source>
- <translation type="unfinished"></translation>
+ <translation>Komenda Perforce</translation>
</message>
<message>
<location line="+9"/>
<source>Testing...</source>
- <translation type="unfinished"></translation>
+ <translation>Testowanie...</translation>
</message>
<message>
<location line="+5"/>
<source>Test succeeded.</source>
- <translation type="unfinished"></translation>
+ <translation>Test pomyślnie zakończony.</translation>
</message>
</context>
<context>
@@ -10737,7 +10846,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/projectexplorer/allprojectsfilter.h" line="+51"/>
<source>Files in any project</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki we wszystkich projektach</translation>
</message>
</context>
<context>
@@ -10745,30 +10854,30 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+64"/>
<source>All Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Wszystkie projekty</translation>
</message>
<message>
<location line="+52"/>
<source>File &pattern:</source>
- <translation type="unfinished"></translation>
+ <translation>&Wzorzec:</translation>
</message>
</context>
<context>
<name>ProjectExplorer::ApplicationLauncher</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+123"/>
+ <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+126"/>
<source>Failed to start program. Path or permissions wrong?</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić programu. Sprawdź ścieżkę i prawa dostępu do programu.</translation>
</message>
<message>
<location line="+3"/>
<source>The program has unexpectedly finished.</source>
- <translation type="unfinished"></translation>
+ <translation>Program niespodziewanie przerwał pracę.</translation>
</message>
<message>
<location line="+3"/>
<source>Some error has occurred while running the program.</source>
- <translation type="unfinished"></translation>
+ <translation>Pojawiły się błędy podczas działania programu.</translation>
</message>
</context>
<context>
@@ -10776,7 +10885,7 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/projectexplorer/applicationrunconfiguration.cpp" line="+89"/>
<source>Run</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom</translation>
</message>
</context>
<context>
@@ -10784,12 +10893,12 @@ Rebuilding the project might help.</source>
<message>
<location line="+48"/>
<source>Starting %1...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie %1...</translation>
</message>
<message>
<location line="+26"/>
<source>%1 exited with code %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 zakończone kodem %2</translation>
</message>
</context>
<context>
@@ -10797,14 +10906,16 @@ Rebuilding the project might help.</source>
<message numerus="yes">
<location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+61"/>
<source>Finished %n of %1 build steps</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Zakończono %n krok budowania (wszystkich kroków: %1)</numerusform>
+ <numerusform>Zakończono %n kroki budowania (wszystkich kroków: %1)</numerusform>
+ <numerusform>Zakończono %n kroków budowania (wszystkich kroków: %1)</numerusform>
</translation>
</message>
<message>
<location line="+80"/>
<source><font color="#ff0000">Canceled build.</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Anulowano budowanie.</font></translation>
</message>
<message>
<location line="+61"/>
@@ -10815,18 +10926,18 @@ Rebuilding the project might help.</source>
<location line="+55"/>
<location line="+39"/>
<source><font color="#ff0000">Error while building project %1</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">BÅ‚Ä…d podczas budowania projektu %1</font></translation>
</message>
<message>
<location line="-38"/>
<location line="+39"/>
<source><font color="#ff0000">When executing build step '%1'</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Podczas wykonywania kroku budowania "%1"</font></translation>
</message>
<message>
<location line="-37"/>
<source>Error while building project %1</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas budowania projektu %1</translation>
</message>
<message>
<location line="+44"/>
@@ -10847,42 +10958,42 @@ Rebuilding the project might help.</source>
<message>
<location line="+75"/>
<source>Edit Build Configuration:</source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj konfiguracjÄ™ budowania:</translation>
</message>
<message>
<location line="+6"/>
<source>Add</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj</translation>
</message>
<message>
<location line="+5"/>
<source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
<message>
<location line="+32"/>
<source>&Clone Selected</source>
- <translation type="unfinished"></translation>
+ <translation>S&klonuj wybranÄ…</translation>
</message>
<message>
<location line="+38"/>
<source>Build Steps</source>
- <translation type="unfinished"></translation>
+ <translation>Kroki procesu budowania</translation>
</message>
<message>
<location line="+1"/>
<source>Clean Steps</source>
- <translation type="unfinished"></translation>
+ <translation>Kroki procesu czyszczenia</translation>
</message>
<message>
<location line="+69"/>
<source>Clone configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Sklonuj konfiguracjÄ™</translation>
</message>
<message>
<location line="+0"/>
<source>New Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa nowej konfiguracji:</translation>
</message>
</context>
<context>
@@ -10890,37 +11001,37 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+61"/>
<source>No Build Steps</source>
- <translation type="unfinished"></translation>
+ <translation>Brak kroków procesu budowania</translation>
</message>
<message>
<location line="+6"/>
<source>Add clean step</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj krok do procesu czyszczenia</translation>
</message>
<message>
<location line="+0"/>
<source>Add build step</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj krok do procesu budowania</translation>
</message>
<message>
<location line="+5"/>
<source>Remove clean step</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń krok z procesu czyszczenia</translation>
</message>
<message>
<location line="+0"/>
<source>Remove build step</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń krok z procesu budowania</translation>
</message>
<message>
<location line="+41"/>
<source>Clean Steps</source>
- <translation type="unfinished"></translation>
+ <translation>Kroki procesu czyszczenia</translation>
</message>
<message>
<location line="+0"/>
<source>Build Steps</source>
- <translation type="unfinished"></translation>
+ <translation>Kroki procesu budowania</translation>
</message>
</context>
<context>
@@ -10937,27 +11048,27 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/projectexplorer/corelistenercheckingforrunningbuild.cpp" line="+48"/>
<source>Cancel Build && Close</source>
- <translation type="unfinished"></translation>
+ <translation>Anuluj budowanie i zamknij</translation>
</message>
<message>
<location line="+1"/>
<source>Do not Close</source>
- <translation type="unfinished"></translation>
+ <translation>Nie zamykaj</translation>
</message>
<message>
<location line="+2"/>
<source>Close Qt Creator?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy zamknąć Qt Creator?</translation>
</message>
<message>
<location line="+1"/>
<source>A project is currently being built.</source>
- <translation type="unfinished"></translation>
+ <translation>Trwa budowanie projektu.</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to cancel the build process and close Qt Creator anyway?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz anulować proces budowania i zamknąć Qt Creator?</translation>
</message>
</context>
<context>
@@ -10978,7 +11089,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+47"/>
<source>File &pattern:</source>
- <translation type="unfinished"></translation>
+ <translation>&Wzorzec pliku:</translation>
</message>
</context>
<context>
@@ -10986,62 +11097,62 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+79"/>
<source>Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa:</translation>
</message>
<message>
<location line="+4"/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Program:</translation>
</message>
<message>
<location line="+4"/>
<source>Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumenty:</translation>
</message>
<message>
<location line="+4"/>
<source>Working Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog roboczy:</translation>
</message>
<message>
<location line="+2"/>
<source>Run in &Terminal</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom w &terminalu</translation>
</message>
<message>
<location line="+14"/>
<source>Run Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko procesu uruchamiania</translation>
</message>
<message>
<location line="+10"/>
<source>Base environment for this runconfiguration:</source>
- <translation type="unfinished"></translation>
+ <translation>Podstawowe środowisko dla tej konfiguracji uruchamiania:</translation>
</message>
<message>
<location line="+4"/>
<source>Clean Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Czyste środowisko</translation>
</message>
<message>
<location line="+1"/>
<source>System Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko systemowe</translation>
</message>
<message>
<location line="+1"/>
<source>Build Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko procesu budowania</translation>
</message>
<message>
<location line="+102"/>
<source>No Executable specified.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie podano programu.</translation>
</message>
<message>
<location line="+2"/>
<source>Running executable: <b>%1</b> %2</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchomiony program: <b>%1</b> %2</translation>
</message>
</context>
<context>
@@ -11049,18 +11160,18 @@ Rebuilding the project might help.</source>
<message>
<location line="+22"/>
<source>Custom Executable</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚asny program</translation>
</message>
<message>
<location line="+44"/>
<source>Could not find the executable, please specify one.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można znaleźć programu. Podaj go.</translation>
</message>
<message>
<location line="+124"/>
<location line="+32"/>
<source>Run %1</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom %1</translation>
</message>
</context>
<context>
@@ -11069,7 +11180,7 @@ Rebuilding the project might help.</source>
<location line="+49"/>
<location line="+16"/>
<source>Custom Executable</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚asny program</translation>
</message>
</context>
<context>
@@ -11077,17 +11188,17 @@ Rebuilding the project might help.</source>
<message>
<location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+131"/>
<source>The target directory %1 could not be created.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć docelowego katalogu %1.</translation>
</message>
<message>
<location line="+11"/>
<source>The existing file %1 could not be removed.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć pliku %1.</translation>
</message>
<message>
<location line="+5"/>
<source>The file %1 could not be copied to %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można skopiować pliku %1 do %2.</translation>
</message>
<message>
<location line="+25"/>
@@ -11107,21 +11218,24 @@ Reason: %2</source>
<location line="+7"/>
<source>Running %1 %2...
</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie %1 %2...
+</translation>
</message>
<message>
<location line="+5"/>
<location line="+21"/>
<source>%1 not found in PATH
</source>
- <translation type="unfinished"></translation>
+ <translation>Nie znaleziono %1 w zmiennej PATH
+</translation>
</message>
<message>
<location line="-16"/>
<location line="+11"/>
<source>Running %1 ...
</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie %1...
+</translation>
</message>
</context>
<context>
@@ -11129,12 +11243,12 @@ Reason: %2</source>
<message>
<location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+121"/>
<source>Unable to add dependency</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dodać zależności</translation>
</message>
<message>
<location line="+1"/>
<source>This would create a circular dependency.</source>
- <translation type="unfinished"></translation>
+ <translation>Utworzyłoby to cykliczną zależność.</translation>
</message>
</context>
<context>
@@ -11142,17 +11256,17 @@ Reason: %2</source>
<message>
<location line="+143"/>
<source>%1 has no dependencies.</source>
- <translation type="unfinished"></translation>
+ <translation>%1 nie ma zależności.</translation>
</message>
<message>
<location line="+2"/>
<source>%1 depends on %2.</source>
- <translation type="unfinished"></translation>
+ <translation>%1 zależy od %2.</translation>
</message>
<message>
<location line="+2"/>
<source>%1 depends on: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>%1 zależy od: %2.</translation>
</message>
</context>
<context>
@@ -11160,7 +11274,7 @@ Reason: %2</source>
<message>
<location line="+22"/>
<source>Dependencies</source>
- <translation type="unfinished"></translation>
+ <translation>Zależności</translation>
</message>
</context>
<context>
@@ -11168,7 +11282,7 @@ Reason: %2</source>
<message>
<location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+63"/>
<source>Editor Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia edytora</translation>
</message>
</context>
<context>
@@ -11177,28 +11291,28 @@ Reason: %2</source>
<location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+68"/>
<location line="+72"/>
<source><UNSET></source>
- <translation type="unfinished"></translation>
+ <translation><SKASUJ></translation>
</message>
<message>
<location line="+39"/>
<source>Variable</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienna</translation>
</message>
<message>
<location line="+0"/>
<source>Value</source>
- <translation type="unfinished"></translation>
+ <translation>Wartość</translation>
</message>
<message>
<location line="+119"/>
<location line="+254"/>
<source><VARIABLE></source>
- <translation type="unfinished"></translation>
+ <translation><ZMIENNA></translation>
</message>
<message>
<location line="-243"/>
<source><VALUE></source>
- <translation type="unfinished"></translation>
+ <translation><WARTOŚĆ></translation>
</message>
</context>
<context>
@@ -11206,37 +11320,37 @@ Reason: %2</source>
<message>
<location line="+163"/>
<source>&Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Z&modyfikuj</translation>
</message>
<message>
<location line="+4"/>
<source>&Add</source>
- <translation type="unfinished"></translation>
+ <translation>&Dodaj</translation>
</message>
<message>
<location line="+5"/>
<source>&Reset</source>
- <translation type="unfinished"></translation>
+ <translation>&Wyczyść</translation>
</message>
<message>
<location line="+5"/>
<source>&Unset</source>
- <translation type="unfinished"></translation>
+ <translation>&Usuń</translation>
</message>
<message>
<location line="+68"/>
<source>Unset <b>%1</b></source>
- <translation type="unfinished"></translation>
+ <translation>Skasuj <b>%1</b></translation>
</message>
<message>
<location line="+2"/>
<source>Set <b>%1</b> to <b>%2</b></source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw <b>%1</b> na <b>%2</b></translation>
</message>
<message>
<location line="+4"/>
<source>Summary: No changes to Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Podsumowanie: brak zmian w środowisku</translation>
</message>
</context>
<context>
@@ -11283,7 +11397,7 @@ Reason: %2</source>
<message>
<location line="+1"/>
<source>Unable to close</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zamknąć</translation>
</message>
</context>
<context>
@@ -11291,7 +11405,7 @@ Reason: %2</source>
<message>
<location line="+84"/>
<source>Application Output Window</source>
- <translation>Okno wyjściowe aplikacji</translation>
+ <translation>Okno z wyjściem aplikacji</translation>
</message>
</context>
<context>
@@ -11307,13 +11421,13 @@ Reason: %2</source>
<message>
<location filename="../../../src/plugins/projectexplorer/processstep.cpp" line="+86"/>
<source>Custom Process Step</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚asny krok procesu</translation>
</message>
<message>
<location line="+41"/>
<source>Custom Process Step</source>
<comment>item in combobox</comment>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚asny krok procesu</translation>
</message>
</context>
<context>
@@ -11321,12 +11435,12 @@ Reason: %2</source>
<message>
<location line="+30"/>
<source><b>%1</b> %2 %3 %4</source>
- <translation type="unfinished"></translation>
+ <translation><b>%1</b> %2 %3 %4</translation>
</message>
<message>
<location line="+4"/>
<source>(disabled)</source>
- <translation type="unfinished"></translation>
+ <translation>(nieaktywny)</translation>
</message>
</context>
<context>
@@ -11334,37 +11448,37 @@ Reason: %2</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+256"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekty</translation>
</message>
<message>
<location line="+86"/>
<source>&Build</source>
- <translation type="unfinished"></translation>
+ <translation>&Budowanie</translation>
</message>
<message>
<location line="+6"/>
<source>&Debug</source>
- <translation type="unfinished"></translation>
+ <translation>&Debugowanie</translation>
</message>
<message>
<location line="+5"/>
<source>&Start Debugging</source>
- <translation type="unfinished"></translation>
+ <translation>&Rozpocznij debugowanie</translation>
</message>
<message>
<location line="+43"/>
<source>Open With</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz przy pomocy</translation>
</message>
<message>
<location line="+66"/>
<source>Session Manager...</source>
- <translation type="unfinished"></translation>
+ <translation>ZarzÄ…dzanie sesjami...</translation>
</message>
<message>
<location line="+5"/>
<source>New Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy projekt...</translation>
</message>
<message>
<location line="+2"/>
@@ -11374,7 +11488,7 @@ Reason: %2</source>
<message>
<location line="+5"/>
<source>Load Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Załaduj projekt...</translation>
</message>
<message>
<location line="+2"/>
@@ -11384,57 +11498,57 @@ Reason: %2</source>
<message>
<location line="+6"/>
<source>Open File</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz plik</translation>
</message>
<message>
<location line="+6"/>
<source>Show in Explorer...</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż w "Explorer"...</translation>
</message>
<message>
<location line="+2"/>
<source>Show in Finder...</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż w "Finder"...</translation>
</message>
<message>
<location line="+2"/>
<source>Show containing folder...</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż zawierający katalog...</translation>
</message>
<message>
<location line="+13"/>
<source>Recent Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnie projekty</translation>
</message>
<message>
<location line="+6"/>
<source>Close Project</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij projekt</translation>
</message>
<message>
<location line="+0"/>
<source>Close Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij projekt "%1"</translation>
</message>
<message>
<location line="+9"/>
<source>Close All Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij wszystkie projekty</translation>
</message>
<message>
<location line="+7"/>
<source>Session</source>
- <translation type="unfinished"></translation>
+ <translation>Sesja</translation>
</message>
<message>
<location line="+10"/>
<source>Set Build Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw konfiguracjÄ™ budowania</translation>
</message>
<message>
<location line="+10"/>
<source>Build All</source>
- <translation type="unfinished"></translation>
+ <translation>Zbuduj wszystko</translation>
</message>
<message>
<location line="+2"/>
@@ -11444,22 +11558,22 @@ Reason: %2</source>
<message>
<location line="+9"/>
<source>Rebuild All</source>
- <translation type="unfinished"></translation>
+ <translation>Przebuduj wszystko</translation>
</message>
<message>
<location line="+8"/>
<source>Clean All</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść wszystko</translation>
</message>
<message>
<location line="+6"/>
<source>Build Project</source>
- <translation type="unfinished"></translation>
+ <translation>Zbuduj projekt</translation>
</message>
<message>
<location line="+0"/>
<source>Build Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Zbuduj projekt "%1"</translation>
</message>
<message>
<location line="+5"/>
@@ -11469,43 +11583,43 @@ Reason: %2</source>
<message>
<location line="+5"/>
<source>Rebuild Project</source>
- <translation type="unfinished"></translation>
+ <translation>Przebuduj projekt</translation>
</message>
<message>
<location line="+0"/>
<source>Rebuild Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Przebuduj projekt "%1"</translation>
</message>
<message>
<location line="+9"/>
<source>Clean Project</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść projekt</translation>
</message>
<message>
<location line="+0"/>
<source>Clean Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść projekt "%1"</translation>
</message>
<message>
<location line="+9"/>
<source>Build Without Dependencies</source>
- <translation type="unfinished"></translation>
+ <translation>Zbuduj bez zależności</translation>
</message>
<message>
<location line="+4"/>
<source>Rebuild Without Dependencies</source>
- <translation type="unfinished"></translation>
+ <translation>Przebuduj bez zależności</translation>
</message>
<message>
<location line="+4"/>
<source>Clean Without Dependencies</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść bez zależności</translation>
</message>
<message>
<location line="+10"/>
<location line="+18"/>
<source>Run</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom</translation>
</message>
<message>
<location line="-16"/>
@@ -11515,109 +11629,113 @@ Reason: %2</source>
<message>
<location line="+5"/>
<source>Set Run Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw konfiguracjÄ™ uruchamiania</translation>
</message>
<message>
<location line="+16"/>
<source>Cancel Build</source>
- <translation type="unfinished"></translation>
+ <translation>Anuluj budowanie</translation>
</message>
<message>
<location line="+7"/>
<location line="+4"/>
<source>Start Debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Rozpocznij debugowanie</translation>
</message>
<message>
<location line="+1"/>
<source>F5</source>
- <translation type="unfinished"></translation>
+ <translation>F5</translation>
</message>
<message>
<location line="+5"/>
<source>Add New...</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj nowy...</translation>
</message>
<message>
<location line="+8"/>
<source>Add Existing Files...</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj istniejÄ…ce pliki...</translation>
</message>
<message>
<location line="+8"/>
<source>Remove File...</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń plik...</translation>
</message>
<message>
<location line="+6"/>
<source>Rename</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień nazwę</translation>
</message>
<message>
<location line="+126"/>
<source>Load Project</source>
- <translation type="unfinished"></translation>
+ <translation>Załaduj projekt</translation>
</message>
<message>
<location line="+83"/>
<source>New Project</source>
<comment>Title of dialog</comment>
- <translation type="unfinished"></translation>
+ <translation>Nowy projekt</translation>
</message>
<message>
<location line="+867"/>
<source>New File</source>
<comment>Title of dialog</comment>
- <translation type="unfinished"></translation>
+ <translation>Nowy plik</translation>
</message>
<message>
<location line="+14"/>
<source>Add Existing Files</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj istniejÄ…ce pliki</translation>
</message>
<message>
<location line="+15"/>
<source>Could not add following files to project %1:
</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dodać następujących plików do projektu %1:
+</translation>
</message>
<message>
<location line="+2"/>
<source>Add files to project failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dodać plików do projektu</translation>
</message>
<message>
<location line="+10"/>
<source>Add to Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj do systemu kontroli wersji</translation>
</message>
<message>
<location line="+1"/>
<source>Add files
%1
to version control (%2)?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy dodać pliki
+%1
+do systemu kontroli wersji (%2)?</translation>
</message>
<message>
<location line="+10"/>
<source>Could not add following files to version control (%1)
</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dodać następujących plików do systemu kontroli wersji (%1)
+</translation>
</message>
<message>
<location line="+2"/>
<source>Add files to version control failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dodać plików do systemu kontroli wersji</translation>
</message>
<message>
<location line="+22"/>
<source>Launching Windows Explorer failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić "Windows Explorer"</translation>
</message>
<message>
<location line="+1"/>
<source>Could not find explorer.exe in path to launch Windows Explorer.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć explorer.exe w ścieżce w celu uruchomienia "Windows Explorer".</translation>
</message>
<message>
<location line="+20"/>
@@ -11632,22 +11750,22 @@ to version control (%2)?</source>
<message>
<location line="+26"/>
<source>Remove file failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć pliku</translation>
</message>
<message>
<location line="+1"/>
<source>Could not remove file %1 from project %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć pliku %1 z projektu %2.</translation>
</message>
<message>
<location line="+14"/>
<source>Delete file failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć pliku</translation>
</message>
<message>
<location line="+1"/>
<source>Could not delete file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć pliku %1.</translation>
</message>
</context>
<context>
@@ -11655,12 +11773,12 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+56"/>
<source>Build and Run</source>
- <translation type="unfinished"></translation>
+ <translation>Zbuduj i uruchom</translation>
</message>
<message>
<location line="+10"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekty</translation>
</message>
</context>
<context>
@@ -11669,12 +11787,13 @@ to version control (%2)?</source>
<location filename="../../../src/plugins/projectexplorer/projectfilewizardextension.cpp" line="+168"/>
<source>Failed to add one or more files to project
'%1' (%2).</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dodać jednego lub więcej plików do projektu
+"%1" (%2).</translation>
</message>
<message>
<location line="+10"/>
<source>Failed to add '%1' to the version control system.</source>
- <translation type="unfinished"></translation>
+ <translation>Dodanie "%1" do systemu kontroli wersji zakończone niepowodzeniem.</translation>
</message>
</context>
<context>
@@ -11682,17 +11801,17 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projectmodels.cpp" line="+232"/>
<source>%1 of project %2</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog %1 projektu %2</translation>
</message>
<message>
<location line="+37"/>
<source>Could not rename file</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zmienić nazwy pliku</translation>
</message>
<message>
<location line="+1"/>
<source>Renaming file %1 to %2 failed.</source>
- <translation type="unfinished"></translation>
+ <translation>Zmiana nazwy pliku z %1 na %2 zakończona błędem.</translation>
</message>
</context>
<context>
@@ -11700,17 +11819,17 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projecttreewidget.cpp" line="+144"/>
<source>Simplify tree</source>
- <translation type="unfinished"></translation>
+ <translation>Uprość drzewo</translation>
</message>
<message>
<location line="+5"/>
<source>Hide generated files</source>
- <translation type="unfinished"></translation>
+ <translation>Ukryj wygenerowane pliki</translation>
</message>
<message>
<location line="+23"/>
<source>Synchronize with Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Synchronizuj z edytorem</translation>
</message>
</context>
<context>
@@ -11718,12 +11837,12 @@ to version control (%2)?</source>
<message>
<location line="+191"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekty</translation>
</message>
<message>
<location line="+16"/>
<source>Filter tree</source>
- <translation type="unfinished"></translation>
+ <translation>Przefiltruj drzewo</translation>
</message>
</context>
<context>
@@ -11747,12 +11866,12 @@ to version control (%2)?</source>
<message>
<location line="+375"/>
<source>Edit Project Settings for Project <b>%1</b></source>
- <translation type="unfinished"></translation>
+ <translation>Zmodyfikuj ustawienia projektu <b>%1</b></translation>
</message>
<message>
<location line="+2"/>
<source>No Project loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Brak załadowanego projektu</translation>
</message>
</context>
<context>
@@ -11769,12 +11888,12 @@ to version control (%2)?</source>
<location line="+104"/>
<location line="+105"/>
<source>Active Build and Run Configurations</source>
- <translation type="unfinished"></translation>
+ <translation>Aktywne konfiguracje procesu budowania i uruchamiania</translation>
</message>
<message>
<location line="-67"/>
<source>No project loaded.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak załadowanego projektu.</translation>
</message>
</context>
<context>
@@ -11816,13 +11935,13 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/projectexplorer/session.cpp" line="+157"/>
<source>Session</source>
- <translation type="unfinished"></translation>
+ <translation>Sesja</translation>
</message>
<message>
<location line="+184"/>
<source>Untitled</source>
<comment>default file name to display</comment>
- <translation type="unfinished"></translation>
+ <translation>Nienazwany</translation>
</message>
</context>
<context>
@@ -11830,38 +11949,38 @@ to version control (%2)?</source>
<message>
<location line="+300"/>
<source>Error while restoring session</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas przywracania sesji</translation>
</message>
<message>
<location line="+1"/>
<source>Could not restore session %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przywrócić sesji %1</translation>
</message>
<message>
<location line="+36"/>
<source>Error while saving session</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas zachowywania sesji</translation>
</message>
<message>
<location line="+1"/>
<source>Could not save session to file %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zachować sesji w pliku %1</translation>
</message>
<message>
<location line="+204"/>
<source>Qt Creator</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator</translation>
</message>
<message>
<location line="+4"/>
<location line="+24"/>
<source>Untitled</source>
- <translation type="unfinished"></translation>
+ <translation>Nienazwany</translation>
</message>
<message>
<location line="+2"/>
<source>Session ('%1')</source>
- <translation type="unfinished"></translation>
+ <translation>Sesja ("%1")</translation>
</message>
</context>
<context>
@@ -11883,17 +12002,17 @@ to version control (%2)?</source>
<location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+336"/>
<location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+62"/>
<source>Build Issues</source>
- <translation type="unfinished"></translation>
+ <translation>Problemy podczas budowania</translation>
</message>
<message>
<location line="+11"/>
<source>&Copy</source>
- <translation type="unfinished"></translation>
+ <translation>S&kopiuj</translation>
</message>
<message>
<location line="+16"/>
<source>Show Warnings</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż ostrzeżenia</translation>
</message>
</context>
<context>
@@ -11909,62 +12028,62 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/projectexplorer/toolchain.cpp" line="+113"/>
<source>GCC</source>
- <translation type="unfinished"></translation>
+ <translation>GCC</translation>
</message>
<message>
<location line="+2"/>
<source>Intel C++ Compiler (Linux)</source>
- <translation type="unfinished"></translation>
+ <translation>Kompilator Intel C++ (Linux)</translation>
</message>
<message>
<location line="+2"/>
<source>MinGW</source>
- <translation type="unfinished"></translation>
+ <translation>MinGW</translation>
</message>
<message>
<location line="+2"/>
<source>Microsoft Visual C++</source>
- <translation type="unfinished"></translation>
+ <translation>Microsoft Visual C++</translation>
</message>
<message>
<location line="+2"/>
<source>Windows CE</source>
- <translation type="unfinished"></translation>
+ <translation>Windows CE</translation>
</message>
<message>
<location line="+2"/>
<source>WINSCW</source>
- <translation type="unfinished"></translation>
+ <translation>WINSCW</translation>
</message>
<message>
<location line="+2"/>
<source>GCCE</source>
- <translation type="unfinished"></translation>
+ <translation>GCCE</translation>
</message>
<message>
<location line="+2"/>
<source>RVCT (ARMV5)</source>
- <translation type="unfinished"></translation>
+ <translation>RVCT (ARMV5)</translation>
</message>
<message>
<location line="+2"/>
<source>RVCT (ARMV6)</source>
- <translation type="unfinished"></translation>
+ <translation>RVCT (ARMV6)</translation>
</message>
<message>
<location line="+2"/>
<source>Other</source>
- <translation type="unfinished"></translation>
+ <translation>Inne</translation>
</message>
<message>
<location line="+2"/>
<source><Invalid></source>
- <translation type="unfinished"></translation>
+ <translation><Niepoprawny></translation>
</message>
<message>
<location line="+6"/>
<source><Unknown></source>
- <translation type="unfinished"></translation>
+ <translation><Nieznany></translation>
</message>
</context>
<context>
@@ -11972,7 +12091,7 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+122"/>
<source>The process could not be started!</source>
- <translation type="unfinished"></translation>
+ <translation>Proces nie może zostać rozpoczęty!</translation>
</message>
<message>
<location line="+7"/>
@@ -11985,40 +12104,40 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qmleditor/qmleditor.cpp" line="+468"/>
<source><Select Symbol></source>
- <translation type="unfinished"></translation>
+ <translation><Wybierz symbol></translation>
</message>
<message>
<location line="+101"/>
<source>Rename...</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień nazwę...</translation>
</message>
<message>
<location line="+1"/>
<source>New id:</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy identyfikator:</translation>
</message>
<message>
<location line="+191"/>
<source>Rename id '%1'...</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień nazwę identyfikatora "%1"...</translation>
</message>
</context>
<context>
<name>QmlEditor::Internal::QmlEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+103"/>
+ <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+106"/>
<source>Qt</source>
- <translation type="unfinished"></translation>
+ <translation>Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt QML file.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy plik QML Qt.</translation>
</message>
<message>
<location line="+1"/>
<source>Qt QML File</source>
- <translation type="unfinished"></translation>
+ <translation>Plik QML Qt</translation>
</message>
</context>
<context>
@@ -12034,7 +12153,7 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlmakestep.cpp" line="+134"/>
<source><b>QML Make</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>QML Make</b></translation>
</message>
</context>
<context>
@@ -12042,12 +12161,12 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlnewprojectwizard.cpp" line="+125"/>
<source>New QML Project</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy QML projekt</translation>
</message>
<message>
<location line="+3"/>
<source>This wizard generates a QML application project.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten kreator generuje projekt aplikacji QML.</translation>
</message>
</context>
<context>
@@ -12055,29 +12174,29 @@ to version control (%2)?</source>
<message>
<location line="+60"/>
<source>QML Application</source>
- <translation type="unfinished"></translation>
+ <translation>Aplikacja QML</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a QML application.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy aplikacjÄ™ QML.</translation>
</message>
<message>
<location line="+2"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekty</translation>
</message>
<message>
<location line="+69"/>
<source>The project %1 could not be opened.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu %1.</translation>
</message>
</context>
<context>
<name>QmlProjectManager::Internal::QmlRunConfiguration</name>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+339"/>
- <location line="+101"/>
+ <location line="+106"/>
<source>QML Viewer</source>
<translation type="unfinished"></translation>
</message>
@@ -12109,17 +12228,17 @@ to version control (%2)?</source>
<message>
<location line="+4"/>
<source>QML Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt QML</translation>
</message>
<message>
<location line="+1"/>
<source>Project name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa projektu:</translation>
</message>
<message>
<location line="+1"/>
<source>Location:</source>
- <translation type="unfinished"></translation>
+ <translation>Położenie:</translation>
</message>
</context>
<context>
@@ -12127,22 +12246,22 @@ to version control (%2)?</source>
<message>
<location line="+60"/>
<source>Import of existing QML directory</source>
- <translation type="unfinished"></translation>
+ <translation>Import istniejÄ…cego katalogu QML</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a QML project from an existing directory of QML files.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy projekt QML na podstawie istniejÄ…cego katalogu z plikami QML.</translation>
</message>
<message>
<location line="+2"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekty</translation>
</message>
<message>
<location line="+94"/>
<source>The project %1 could not be opened.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu %1.</translation>
</message>
</context>
<context>
@@ -12151,17 +12270,17 @@ to version control (%2)?</source>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp" line="+48"/>
<location line="+11"/>
<source><New class></source>
- <translation type="unfinished"></translation>
+ <translation><Nowa klasa></translation>
</message>
<message>
<location line="+10"/>
<source>Confirm Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Potwierdź usunięcie</translation>
</message>
<message>
<location line="+1"/>
<source>Delete class %1 from list?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy usunąć klasę %1 z listy?</translation>
</message>
</context>
<context>
@@ -12169,12 +12288,12 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp" line="+43"/>
<source>Qt4 Designer Custom Widget</source>
- <translation type="unfinished"></translation>
+ <translation>Własny widżet Qt4 Designer</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt4 Designer Custom Widget or a Custom Widget Collection.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy własny widżet Qt4 Designer lub kolekcję własnych widżetów.</translation>
</message>
</context>
<context>
@@ -12182,7 +12301,7 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp" line="+56"/>
<source>This wizard generates a Qt4 Designer Custom Widget or a Qt4 Designer Custom Widget Collection project.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten kreator generuje projekt własnego widżetu Qt4 Designer lub projekt kolekcji własnych widżetów Qt4 Designer.</translation>
</message>
</context>
<context>
@@ -12190,17 +12309,17 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp" line="+60"/>
<source>Cannot open icon file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć pliku z ikoną %1.</translation>
</message>
<message>
<location line="+102"/>
<source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzenie wielu bibliotek z widżetami (%1, %2) w jednym projekcie (%3) nie jest obsługiwane.</translation>
</message>
<message>
<location line="+133"/>
<source>Cannot open %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć %1: %2</translation>
</message>
</context>
<context>
@@ -12216,12 +12335,12 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/externaleditors.cpp" line="+38"/>
<source>Unable to start "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić "%1"</translation>
</message>
<message>
<location line="+5"/>
<source>The application "%1" could not be found.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć aplikacji "%1".</translation>
</message>
</context>
<context>
@@ -12229,12 +12348,12 @@ to version control (%2)?</source>
<message>
<location line="+172"/>
<source>Qt Designer is not responding (%1).</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Designer nie odpowiada (%1).</translation>
</message>
<message>
<location line="+8"/>
<source>Unable to create server socket: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć gniazda serwera: %1</translation>
</message>
</context>
<context>
@@ -12248,14 +12367,14 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::MakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+80"/>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+76"/>
<source><font color="#ff0000">Could not find make command: %1 in the build environment</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Nie można odnaleźć komendy make: %1 w środowisku procesu budowania</font></translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source><font color="#0000ff"><b>No Makefile found, assuming project is clean.</b></font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff"><b>Nie odnaleziono pliku Makefile. Przyjęto, że projekt jest czysty.</b></font></translation>
</message>
</context>
<context>
@@ -12263,17 +12382,17 @@ to version control (%2)?</source>
<message>
<location line="+54"/>
<source>Override %1:</source>
- <translation type="unfinished"></translation>
+ <translation>Nadpisanie %1:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+19"/>
<source><b>Make Step:</b> %1 not found in the environment.</source>
- <translation type="unfinished"></translation>
+ <translation><b>Krok Make:</b> Nie odnaleziono %1 w środowisku.</translation>
</message>
<message>
<location line="+20"/>
<source><b>Make:</b> %1 %2 in %3</source>
- <translation type="unfinished"></translation>
+ <translation><b>Make:</b> %1 %2 in %3</translation>
</message>
</context>
<context>
@@ -12281,30 +12400,35 @@ to version control (%2)?</source>
<message>
<location line="+93"/>
<source>Make</source>
- <translation type="unfinished"></translation>
+ <translation>Make</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+175"/>
<source>Import existing settings</source>
+ <translation type="obsolete">Zaimportuj istniejÄ…ce ustawienia</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+51"/>
+ <location line="+125"/>
+ <source>Import existing build settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source>Qt Creator has found an already existing build in the source directory.<br><br><b>Qt Version:</b> %1<br><b>Build configuration:</b> %2<br><b>Additional QMake Arguments:</b>%3</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator odnalazł istniejącą wersję zbudowaną w katalogu ze źródłami.<br><br><b>Wersja Qt:</b> %1<br><b>Konfiguracja wersji:</b> %2<br><b>Dodatkowe argumenty QMake:</b>%3</translation>
</message>
<message>
<location line="+12"/>
<source>Import existing build settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Zaimportuj istniejÄ…ce ustawienia procesu budowania.</translation>
</message>
<message>
<location line="+6"/>
<source><b>Note:</b> Importing the settings will automatically add the Qt Version identified by <br><b>%1</b> to the list of Qt versions.</source>
- <translation type="unfinished"></translation>
+ <translation><b>Uwaga:</b> Zaimportowanie ustawień doda automatycznie wersję Qt identyfikowaną przez <br><b>%1</b> do listy wersji Qt.</translation>
</message>
</context>
<context>
@@ -12314,19 +12438,23 @@ to version control (%2)?</source>
<source>
<font color="#ff0000"><b>No valid Qt version set. Set one in Preferences </b></font>
</source>
- <translation type="unfinished"></translation>
+ <translation>
+<font color="#ff0000"><b>Nie ustawiono poprawnej wersji Qt. Popraw to w "Ustawieniach" </b></font>
+</translation>
</message>
<message>
<location line="+2"/>
<source>
<font color="#ff0000"><b>No valid Qt version set. Set one in Tools/Options </b></font>
</source>
- <translation type="unfinished"></translation>
+ <translation>
+<font color="#ff0000"><b>Nie ustawiono poprawnej wersji Qt. Popraw to w "Narzędziach | Opcje" </b></font>
+</translation>
</message>
<message>
<location line="+40"/>
<source><font color="#0000ff">Configuration unchanged, skipping QMake step.</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff">Konfiguracja nie została zmieniona, opuszczono krok QMake.</font></translation>
</message>
</context>
<context>
@@ -12334,17 +12462,17 @@ to version control (%2)?</source>
<message>
<location line="+78"/>
<source><b>QMake:</b> No Qt version set. QMake can not be run.</source>
- <translation type="unfinished"></translation>
+ <translation><b>QMake:</b> Brak ustawionej wersji Qt. Nie można uruchomić QMake.</translation>
</message>
<message>
<location line="+13"/>
<source><b>QMake:</b> %1 %2</source>
- <translation type="unfinished"></translation>
+ <translation><b>QMake:</b> %1 %2</translation>
</message>
<message>
<location line="+61"/>
<source>No valid Qt version set.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie ustawiono poprawnej wersji Qt.</translation>
</message>
</context>
<context>
@@ -12352,58 +12480,68 @@ to version control (%2)?</source>
<message>
<location line="+38"/>
<source>QMake</source>
- <translation type="unfinished"></translation>
+ <translation>QMake</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+77"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+81"/>
<source>%1 on Symbian Device</source>
- <translation type="unfinished"></translation>
+ <translation>%1 na urzÄ…dzeniu Symbian</translation>
</message>
<message>
<location line="+2"/>
<source>QtS60DeviceRunConfiguration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja procesu uruchamiania urzÄ…dzenia QtS60</translation>
</message>
<message>
- <location line="+185"/>
+ <location line="+197"/>
<source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przetworzyć %1. Nie można rozpocząć konfiguracji procesu uruchamiania %2 dla urządzenia QtS60.</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
<message>
- <location line="+67"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp" line="+73"/>
+ <source>Device:</source>
+ <translation>UrzÄ…dzenie:</translation>
+ </message>
+ <message>
+ <location line="+20"/>
<source>Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa:</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+3"/>
<source>Install File:</source>
- <translation type="unfinished"></translation>
+ <translation>Zainstaluj plik:</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>Device on Serial Port:</source>
- <translation type="unfinished"></translation>
+ <translation>UrzÄ…dzenie na porcie szeregowym:</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
+ <source>Queries the device for information</source>
+ <translation>Zapytaj urzÄ…dzenie o informacje</translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>Self-signed certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
<source>Choose certificate file (.cer)</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz certyfikat (.cer)</translation>
</message>
<message>
<location line="+1"/>
<source>Custom certificate:</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚asny certyfikat:</translation>
</message>
<message>
<location line="+3"/>
@@ -12415,75 +12553,108 @@ to version control (%2)?</source>
<source>Key file:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+125"/>
+ <source><No Device></source>
+ <extracomment>Summary text of S60 device run configuration</extracomment>
+ <translation><Brak urzÄ…dzenia></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>(custom certificate)</source>
+ <translation>(własny certyfikat)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(self-signed certificate)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Summary: Run on '%1' %2</source>
+ <translation>Podsumowanie: Uruchomiono na "%1" %2</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Connecting...</source>
+ <translation>ÅÄ…czenie...</translation>
+ </message>
+ <message>
+ <location line="+53"/>
+ <source>A timeout occurred while querying the device. Check whether Trk is running</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
<message>
- <location line="+116"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+87"/>
<source>%1 on Symbian Device</source>
- <translation type="unfinished"></translation>
+ <translation>%1 na urzÄ…dzeniu Symbian</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunControlBase</name>
<message>
- <location line="+74"/>
+ <location line="+83"/>
<source>Creating %1.sisx ...</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzenie %1.sisx ...</translation>
</message>
<message>
<location line="+1"/>
<source>Executable file: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z programem: %1</translation>
</message>
<message>
<location line="+8"/>
<source>Debugger for Symbian Platform</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger dla platformy Symbian</translation>
</message>
<message>
<location line="+12"/>
<location line="+76"/>
<source>%1 %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 %2</translation>
</message>
<message>
<location line="-41"/>
<source>Could not read template package file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odczytać pliku z pakietem szablonów "%1"</translation>
</message>
<message>
<location line="+9"/>
<source>Could not write package file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać pliku z pakietem "%1"</translation>
</message>
<message>
<location line="+16"/>
<location line="+28"/>
<source>An error occurred while creating the package.</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpił błąd podczas tworzenia pakietu.</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+24"/>
<source>Package: %1
Deploying application to '%2'...</source>
- <translation type="unfinished"></translation>
+ <translation>Pakiet: %1
+Umieszczanie aplikacji w "%2"...</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+23"/>
<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="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="+8"/>
<source>Could not create file %1 on device: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć pliku %1 na urządzeniu: %2</translation>
</message>
<message>
<location line="+5"/>
<source>Could not write to file %1 on device: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać do pliku %1 na urządzeniu: %2</translation>
</message>
<message>
<location line="+5"/>
@@ -12492,38 +12663,43 @@ Check if the phone is connected and the TRK application is running.</source>
</message>
<message>
<location line="+6"/>
- <source>Copying install file...</source>
+ <source>Could not connect to App TRK on device: %1. Restarting App TRK might help.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+5"/>
+ <source>Copying install file...</source>
+ <translation>Kopiowanie pliku instalacyjnego...</translation>
+ </message>
<message>
<location line="+5"/>
<source>%1% copied.</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiowano %1%.</translation>
</message>
<message>
<location line="+5"/>
<source>Installing application...</source>
- <translation type="unfinished"></translation>
+ <translation>Instalowanie aplikacji...</translation>
</message>
<message>
<location line="+5"/>
<source>Could not install from package %1 on device: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zainstalować z pakietu %1 na urządzeniu: %2</translation>
</message>
<message>
<location line="+15"/>
<source>Failed to start %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić %1.</translation>
</message>
<message>
<location line="+3"/>
<source>%1 has unexpectedly finished.</source>
- <translation type="unfinished"></translation>
+ <translation>%1 niespodziewanie zakończył się.</translation>
</message>
<message>
<location line="+3"/>
<source>An error has occurred while running %1.</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas wykonywania %1.</translation>
</message>
</context>
<context>
@@ -12531,61 +12707,61 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+37"/>
<source>Finished.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono.</translation>
</message>
<message>
<location line="+5"/>
<source>Starting application...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie aplikacji...</translation>
</message>
<message>
<location line="+5"/>
<source>Application running with pid %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Aplikacja wykonuje siÄ™ z pid %1.</translation>
</message>
<message>
<location line="+4"/>
<source>Could not start application: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić aplikacji: %1</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
- <location line="+50"/>
+ <location line="+51"/>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source>Launching debugger...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie debuggera...</translation>
</message>
<message>
<location line="+6"/>
<source>Debugging finished.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono debugowanie.</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DevicesWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-23"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-28"/>
<source>No Qt installed</source>
- <translation type="unfinished"></translation>
+ <translation>Brak zainstalowanego Qt</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+55"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+59"/>
<source>%1 in Symbian Emulator</source>
- <translation type="unfinished"></translation>
+ <translation>%1 w emulatorze Symbian</translation>
</message>
<message>
<location line="+2"/>
<source>QtSymbianEmulatorRunConfiguration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja procesu uruchamiania emulatora Qt Symbian</translation>
</message>
<message>
<location line="+87"/>
@@ -12596,22 +12772,27 @@ Check if the phone is connected and the TRK application is running.</source>
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
<message>
- <location line="+40"/>
+ <location line="+50"/>
<source>Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa:</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Program:</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Summary: Run %1 in emulator</source>
+ <translation>Podsumowanie: Uruchomiono %1 w emulatorze</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
<message>
- <location line="+52"/>
+ <location line="+37"/>
<source>%1 in Symbian Emulator</source>
- <translation type="unfinished"></translation>
+ <translation>%1 w emulatorze Symbian</translation>
</message>
</context>
<context>
@@ -12619,17 +12800,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+48"/>
<source>Starting %1...</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie %1...</translation>
</message>
<message>
<location line="+21"/>
<source>[Qt Message]</source>
- <translation type="unfinished"></translation>
+ <translation>[Komunikat Qt]</translation>
</message>
<message>
<location line="+10"/>
<source>%1 exited with code %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 zakończone kodem %2</translation>
</message>
</context>
<context>
@@ -12637,17 +12818,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+111"/>
<source>Run in Emulator</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom w emulatorze</translation>
</message>
<message>
<location line="+5"/>
<source>Run on Device</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom na urzÄ…dzeniu</translation>
</message>
<message>
<location line="+6"/>
<source>Debug on Device</source>
- <translation type="unfinished"></translation>
+ <translation>Zdebuguj na urzÄ…dzeniu</translation>
</message>
</context>
<context>
@@ -12655,12 +12836,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+51"/>
<source>Clear system environment</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść środowisko systemowe</translation>
</message>
<message>
<location line="+14"/>
<source>Build Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko procesu budowania</translation>
</message>
</context>
<context>
@@ -12668,33 +12849,33 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+352"/>
<source>Headers</source>
- <translation type="unfinished"></translation>
+ <translation>Nagłówki</translation>
</message>
<message>
<location line="+1"/>
<source>Sources</source>
- <translation type="unfinished"></translation>
+ <translation>Źródła</translation>
</message>
<message>
<location line="+1"/>
<source>Forms</source>
- <translation type="unfinished"></translation>
+ <translation>Formularze</translation>
</message>
<message>
<location line="+1"/>
<source>Resources</source>
- <translation type="unfinished"></translation>
+ <translation>Zasoby</translation>
</message>
<message>
<location line="+1"/>
<source>Other files</source>
- <translation type="unfinished"></translation>
+ <translation>Inne pliki</translation>
</message>
<message>
<location line="+155"/>
<location line="+7"/>
<source>Failed!</source>
- <translation type="unfinished"></translation>
+ <translation>Niepomyślnie zakończone!</translation>
</message>
<message>
<location line="-7"/>
@@ -12714,12 +12895,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+22"/>
<source>Error while parsing file %1. Giving up.</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas przetwarzania pliku %1. Przetwarzanie przerwane.</translation>
</message>
<message>
<location line="+7"/>
<source>Error while changing pro file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas modyfikowania pliku pro %1.</translation>
</message>
</context>
<context>
@@ -12727,12 +12908,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+240"/>
<source>Error while parsing file %1. Giving up.</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas przetwarzania pliku %1. Przetwarzanie przerwane.</translation>
</message>
<message>
<location line="+364"/>
<source>Could not find .pro file for sub dir '%1' in '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć pliku .pro w podkatalogu "%1" w "%2"</translation>
</message>
</context>
<context>
@@ -12740,32 +12921,32 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+252"/>
<source>Using Default Qt Version</source>
- <translation type="unfinished"></translation>
+ <translation>Używając domyślnej wersji Qt</translation>
</message>
<message>
<location line="+4"/>
<source>Using Qt Version "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Używając wersji "%1"</translation>
</message>
<message>
<location line="+23"/>
<source>New configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Nowa konfiguracja</translation>
</message>
<message>
<location line="+1"/>
<source>New Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa nowej konfiguracji:</translation>
</message>
<message>
<location line="+9"/>
<source>%1 Debug</source>
- <translation type="unfinished"></translation>
+ <translation>%1 Debug</translation>
</message>
<message>
<location line="+3"/>
<source>%1 Release</source>
- <translation type="unfinished"></translation>
+ <translation>%1 Release</translation>
</message>
</context>
<context>
@@ -12773,33 +12954,33 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+192"/>
<source>Loading project %1 ...</source>
- <translation type="unfinished"></translation>
+ <translation>Åadowanie projektu %1...</translation>
</message>
<message>
<location line="+9"/>
<source>Failed opening project '%1': Project file does not exist</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu "%1": projekt nie istnieje</translation>
</message>
<message>
<location line="+1"/>
<location line="+7"/>
<source>Failed opening project</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu</translation>
</message>
<message>
<location line="-1"/>
<source>Failed opening project '%1': Project already open</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu "%1": projekt jest już otwarty</translation>
</message>
<message>
<location line="+6"/>
<source>Opening %1 ...</source>
- <translation type="unfinished"></translation>
+ <translation>Otwieranie %1...</translation>
</message>
<message>
<location line="+5"/>
<source>Done opening project</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono otwieranie projektu</translation>
</message>
</context>
<context>
@@ -12808,7 +12989,7 @@ Check if the phone is connected and the TRK application is running.</source>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+181"/>
<location line="+5"/>
<source>Run qmake</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom qmake</translation>
</message>
</context>
<context>
@@ -12817,12 +12998,12 @@ Check if the phone is connected and the TRK application is running.</source>
<location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+72"/>
<location line="+458"/>
<source>Qt4RunConfiguration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja procesu uruchamiania Qt4</translation>
</message>
<message>
<location line="+50"/>
<source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przetworzyć %1. Konfiguracja Qt4 %2 nie może zostać uruchomiona.</translation>
</message>
</context>
<context>
@@ -12830,37 +13011,37 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="-447"/>
<source>Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa:</translation>
</message>
<message>
<location line="+6"/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Program:</translation>
</message>
<message>
<location line="+5"/>
<source>Select the working directory</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz katalog roboczy</translation>
</message>
<message>
<location line="+3"/>
<source>Reset to default</source>
- <translation type="unfinished"></translation>
+ <translation>Przywróć domyślne</translation>
</message>
<message>
<location line="+7"/>
<source>Working Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog roboczy:</translation>
</message>
<message>
<location line="+2"/>
<source>Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumenty:</translation>
</message>
<message>
<location line="+5"/>
<source>Run in Terminal</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom w terminalu</translation>
</message>
<message>
<location line="+5"/>
@@ -12870,37 +13051,37 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+8"/>
<source>Run Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko procesu uruchamiania</translation>
</message>
<message>
<location line="+10"/>
<source>Base environment for this runconfiguration:</source>
- <translation type="unfinished"></translation>
+ <translation>Podstawowe środowisko dla tej konfiguracji uruchamiania:</translation>
</message>
<message>
<location line="+4"/>
<source>Clean Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Czyste środowisko</translation>
</message>
<message>
<location line="+1"/>
<source>System Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko systemowe</translation>
</message>
<message>
<location line="+1"/>
<source>Build Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodowisko procesu budowania</translation>
</message>
<message>
<location line="+56"/>
<source>Running executable: <b>%1</b> %2 (in terminal)</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie programu: <b>%1</b> %2 (w terminalu)</translation>
</message>
<message>
<location line="+1"/>
<source>Running executable: <b>%1</b> %2</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie programu: <b>%1</b> %2</translation>
</message>
</context>
<context>
@@ -12908,203 +13089,208 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qtmodulesinfo.cpp" line="+54"/>
<source>QtCore Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtCore</translation>
</message>
<message>
<location line="+1"/>
<source>Core non-GUI classes used by other modules</source>
- <translation type="unfinished"></translation>
+ <translation>Podstawowe klasy używane przez inne moduły</translation>
</message>
<message>
<location line="+3"/>
<source>QtGui Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtGui</translation>
</message>
<message>
<location line="+1"/>
<source>Graphical user interface components</source>
- <translation type="unfinished"></translation>
+ <translation>Komponenty graficznego interfejsu użytkownika</translation>
</message>
<message>
<location line="+3"/>
<source>QtNetwork Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtNetwork</translation>
</message>
<message>
<location line="+1"/>
<source>Classes for network programming</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy służące do programowania sieciowego</translation>
</message>
<message>
<location line="+3"/>
<source>QtOpenGL Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtOpenGL</translation>
</message>
<message>
<location line="+1"/>
<source>OpenGL support classes</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy obsługujące OpenGL</translation>
</message>
<message>
<location line="+3"/>
<source>QtSql Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtSql</translation>
</message>
<message>
<location line="+1"/>
<source>Classes for database integration using SQL</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy służące do integracji z bazami danych SQL</translation>
</message>
<message>
<location line="+3"/>
<source>QtScript Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtScript</translation>
</message>
<message>
<location line="+1"/>
<source>Classes for evaluating Qt Scripts</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy wykonujÄ…ce skrypty Qt</translation>
</message>
<message>
<location line="+3"/>
<source>QtScriptTools Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtScriptTools</translation>
</message>
<message>
<location line="+1"/>
<source>Additional Qt Script components</source>
- <translation type="unfinished"></translation>
+ <translation>Dodatkowe komponenty skryptów Qt</translation>
</message>
<message>
<location line="+3"/>
<source>QtSvg Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtSvg</translation>
</message>
<message>
<location line="+1"/>
<source>Classes for displaying the contents of SVG files</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy służące do wyświetlania zawartości plików SVG</translation>
</message>
<message>
<location line="+3"/>
<source>QtWebKit Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtWebKit</translation>
</message>
<message>
<location line="+1"/>
<source>Classes for displaying and editing Web content</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy służące do wyświetlania i modyfikacji zawartości stron internetowych</translation>
</message>
<message>
<location line="+3"/>
<source>QtXml Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtXml</translation>
</message>
<message>
<location line="+1"/>
<source>Classes for handling XML</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy do obsługi XML</translation>
</message>
<message>
<location line="+3"/>
<source>QtXmlPatterns Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtXmlPatterns</translation>
</message>
<message>
<location line="+1"/>
<source>An XQuery/XPath engine for XML and custom data models</source>
- <translation type="unfinished"></translation>
+ <translation>Silnik XQuery / XPath dla XML i własnych modeli danych</translation>
</message>
<message>
<location line="+3"/>
<source>Phonon Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł Phonon</translation>
</message>
<message>
<location line="+1"/>
<source>Multimedia framework classes</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy do obsługi multimediów</translation>
</message>
<message>
<location line="+3"/>
<source>QtMultimedia Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtMultimedia</translation>
</message>
<message>
<location line="+1"/>
<source>Classes for low-level multimedia functionality</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy do niskopoziomowej obsługi multimediów</translation>
</message>
<message>
<location line="+3"/>
<source>Qt3Support Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł Qt3Support</translation>
</message>
<message>
<location line="+1"/>
<source>Classes that ease porting from Qt 3 to Qt 4</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy pomocne w przenoszeniu kodu z Qt 3 do Qt 4</translation>
</message>
<message>
<location line="+3"/>
<source>QtTest Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtTest</translation>
</message>
<message>
<location line="+1"/>
<source>Tool classes for unit testing</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy służące do testowania kodu, wykrywania regresji</translation>
</message>
<message>
<location line="+3"/>
<source>QtDBus Module</source>
- <translation type="unfinished"></translation>
+ <translation>Moduł QtDBus</translation>
</message>
<message>
<location line="+1"/>
<source>Classes for Inter-Process Communication using the D-Bus</source>
- <translation type="unfinished"></translation>
+ <translation>Klasy do międzyprocesowej komunikacji z użyciem D-Bus</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::QtOptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+109"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+111"/>
<source><specify a name></source>
- <translation type="unfinished"></translation>
+ <translation><Podaj nazwÄ™></translation>
</message>
<message>
<location line="+1"/>
<source><specify a qmake location></source>
- <translation type="unfinished"></translation>
+ <translation><Podaj ścieżkę do qmake></translation>
</message>
<message>
<location line="+10"/>
<source>Select QMake Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Wskaż program QMake</translation>
</message>
<message>
<location line="+2"/>
<source>Select the MinGW Directory</source>
+ <translation>Wskaż katalog MinGW</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Select Carbide Install Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Select "x86build" Directory from Carbide Install</source>
+ <source>Select S60 SDK Root</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+11"/>
<source>Auto-detected</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie wykryte</translation>
</message>
<message>
<location line="+3"/>
<source>Manual</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawione ręcznie</translation>
</message>
<message>
- <location line="+120"/>
+ <location line="+142"/>
<source>Building helpers</source>
<translation type="unfinished"></translation>
</message>
@@ -13115,9 +13301,9 @@ Check if the phone is connected and the TRK application is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+120"/>
<source>The Qt Version identified by %1 is not installed. Run make install</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja Qt identyfikowana przez %1 nie jest zainstalowana. Uruchom "make install"</translation>
</message>
<message>
<location line="+3"/>
@@ -13133,14 +13319,62 @@ 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="+329"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+332"/>
<source><not found></source>
- <translation type="unfinished"></translation>
+ <translation><nie znaleziony></translation>
</message>
<message>
<location line="+6"/>
<location line="+6"/>
<source>Qt in PATH</source>
+ <translation>Qt w PATH</translation>
+ </message>
+ <message>
+ <location line="+147"/>
+ <source>Name:</source>
+ <translation type="unfinished">Nazwa:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Source:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>mkspec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>qmake:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Default:</source>
+ <translation type="unfinished">Domyślna:</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Compiler:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Version:</source>
+ <translation type="unfinished">Wersja:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Debugging helper:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>QApplication</name>
+ <message>
+ <location line="+862"/>
+ <source>The Qt Version has no toolchain.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -13170,12 +13404,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp" line="+40"/>
<source>Empty Qt4 Project</source>
- <translation type="unfinished"></translation>
+ <translation>Pusty projekt Qt4</translation>
</message>
<message>
<location line="+1"/>
<source>Creates an empty Qt project.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy pusty projekt Qt.</translation>
</message>
</context>
<context>
@@ -13183,7 +13417,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp" line="+50"/>
<source>This wizard generates an empty Qt4 project. Add files to it later on by using the other wizards.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten kreator generuje pusty projekt Qt4. Możesz później dodawać pliki do niego używając innych kreatorów.</translation>
</message>
</context>
<context>
@@ -13191,12 +13425,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/filespage.cpp" line="+45"/>
<source>Class Information</source>
- <translation type="unfinished"></translation>
+ <translation>Informacja o klasie</translation>
</message>
<message>
<location line="+2"/>
<source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Podaj podstawowe informacje o klasach dla których chcesz wygenerować szkielet</translation>
</message>
</context>
<context>
@@ -13204,17 +13438,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizard.cpp" line="+76"/>
<source>Qt4 Gui Application</source>
- <translation type="unfinished"></translation>
+ <translation>Aplikacja Gui Qt4</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt4 Gui Application with one form.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy aplikacjÄ™ Gui Qt4 z jednym formularzem.</translation>
</message>
<message>
<location line="+125"/>
<source>The template file '%1' could not be opened for reading: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odczytać pliku z szablonem "%1": %2</translation>
</message>
</context>
<context>
@@ -13222,7 +13456,7 @@ Check if the phone is connected and the TRK application is running.</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 type="unfinished"></translation>
+ <translation>Ten kreator generuje projekt aplikacji GUI Qt4. Aplikacja wywodzi się domyślnie z QApplication i zawiera pusty widżet.</translation>
</message>
</context>
<context>
@@ -13230,12 +13464,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizard.cpp" line="+51"/>
<source>C++ Library</source>
- <translation type="unfinished"></translation>
+ <translation>Biblioteka C++</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a C++ Library.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy bibliotekÄ™ C++.</translation>
</message>
</context>
<context>
@@ -13243,27 +13477,27 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp" line="+122"/>
<source>Shared library</source>
- <translation type="unfinished"></translation>
+ <translation>Biblioteka współdzielona</translation>
</message>
<message>
<location line="+2"/>
<source>Statically linked library</source>
- <translation type="unfinished"></translation>
+ <translation>Biblioteka statycznie dowiÄ…zana</translation>
</message>
<message>
<location line="+2"/>
<source>Qt 4 plugin</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczka Qt 4</translation>
</message>
<message>
<location line="+2"/>
<source>Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
<message>
<location line="+35"/>
<source>This wizard generates a C++ library project.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten kreator generuje projekt biblioteki C++.</translation>
</message>
</context>
<context>
@@ -13297,12 +13531,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>Expected Failure</source>
- <translation type="unfinished"></translation>
+ <translation>Spodziewany błąd</translation>
</message>
<message>
<location line="+1"/>
<source>Failure</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d</translation>
</message>
<message>
<location line="+1"/>
@@ -13312,17 +13546,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+9"/>
<source>Warning</source>
- <translation type="unfinished"></translation>
+ <translation>Ostrzeżenie</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Warning</source>
- <translation type="unfinished"></translation>
+ <translation>Ostrzeżenie Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Debug</source>
- <translation type="unfinished"></translation>
+ <translation>Komunikat debugowy Qt</translation>
</message>
<message>
<location line="+1"/>
@@ -13342,7 +13576,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>Info</source>
- <translation type="unfinished"></translation>
+ <translation>Informacja</translation>
</message>
</context>
<context>
@@ -13350,17 +13584,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+266"/>
<source>Test Results</source>
- <translation type="unfinished"></translation>
+ <translation>Rezultaty testu</translation>
</message>
<message>
<location line="+7"/>
<source>Result</source>
- <translation type="unfinished"></translation>
+ <translation>Rezultat</translation>
</message>
<message>
<location line="+0"/>
<source>Message</source>
- <translation type="unfinished"></translation>
+ <translation>Komunikat</translation>
</message>
</context>
<context>
@@ -13368,12 +13602,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+45"/>
<source>All Incidents</source>
- <translation type="unfinished"></translation>
+ <translation>Wszystkie zajścia</translation>
</message>
<message>
<location line="+9"/>
<source>Show Only:</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż tylko:</translation>
</message>
</context>
<context>
@@ -13421,73 +13655,32 @@ Check if the phone is connected and the TRK application is running.</source>
</message>
</context>
<context>
- <name>Locator::Internal::DirectoryFilter</name>
- <message>
- <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
- <source>Generic Directory Filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+59"/>
- <source>Filter Configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+45"/>
- <location line="+11"/>
- <source>Choose a directory to add</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+30"/>
- <source>%1 filter update: 0 files</source>
- <translation type="unfinished"></translation>
- </message>
- <message numerus="yes">
- <location line="+23"/>
- <source>%1 filter update: %n files</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- </translation>
- </message>
- <message>
- <location line="+41"/>
- <source>%1 filter update: canceled</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Locator::Internal::FileSystemFilter</name>
+ <name>QuickOpen::Internal::FileSystemFilter</name>
<message>
- <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
<source>Files in file system</source>
- <translation>Pliki w systemie plików</translation>
+ <translation type="obsolete">Pliki w systemie plików</translation>
</message>
</context>
<context>
- <name>Locator::ILocatorFilter</name>
+ <name>QuickOpen::IQuickOpenFilter</name>
<message>
- <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
<source>Filter Configuration</source>
- <translation>Konfiguracja filtra</translation>
+ <translation type="obsolete">Konfiguracja filtra</translation>
</message>
<message>
- <location line="+5"/>
<source>Limit to prefix</source>
- <translation>Ogranicz do przedrostka</translation>
+ <translation type="obsolete">Ogranicz do przedrostka</translation>
</message>
<message>
- <location line="+3"/>
<source>Prefix:</source>
- <translation>Przedrostek:</translation>
+ <translation type="obsolete">Przedrostek:</translation>
</message>
</context>
<context>
- <name>Locator::Internal::OpenDocumentsFilter</name>
+ <name>QuickOpen::Internal::OpenDocumentsFilter</name>
<message>
- <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
<source>Open documents</source>
- <translation>Otwarte dokumenty</translation>
+ <translation type="obsolete">Otwarte dokumenty</translation>
</message>
</context>
<context>
@@ -13504,55 +13697,39 @@ Check if the phone is connected and the TRK application is running.</source>
</message>
</context>
<context>
- <name>Locator::Internal::LocatorFiltersFilter</name>
+ <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
<message>
- <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
<source>Available filters</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Dostępne filtry</translation>
</message>
</context>
<context>
- <name>Locator::Internal::LocatorPlugin</name>
+ <name>QuickOpen::Internal::QuickOpenPlugin</name>
<message>
- <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
<source>Indexing</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Indeksowanie</translation>
</message>
</context>
<context>
- <name>Locator::Internal::LocatorWidget</name>
+ <name>QuickOpen::Internal::QuickOpenToolWindow</name>
<message>
- <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
<source>Refresh</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Odśwież</translation>
</message>
<message>
- <location line="+1"/>
<source>Configure...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Locate...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Type to locate</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Skonfiguruj...</translation>
</message>
<message>
- <location line="+178"/>
<source><type here></source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete"><wpisz tutaj></translation>
</message>
</context>
<context>
- <name>Locator::Internal::SettingsPage</name>
+ <name>QuickOpen::Internal::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
<source>%1 (Prefix: %2)</source>
- <translation>%1 (Przedrostek: %2)</translation>
+ <translation type="obsolete">%1 (Przedrostek: %2)</translation>
</message>
</context>
<context>
@@ -13560,7 +13737,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/regexp/regexpwindow.cpp" line="+46"/>
<source>&Pattern:</source>
- <translation type="unfinished"></translation>
+ <translation>&Wzorzec:</translation>
</message>
<message>
<location line="+1"/>
@@ -13570,17 +13747,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>&Pattern Syntax:</source>
- <translation type="unfinished"></translation>
+ <translation>Składnia &wzorca:</translation>
</message>
<message>
<location line="+1"/>
<source>&Text:</source>
- <translation type="unfinished"></translation>
+ <translation>&Tekst:</translation>
</message>
<message>
<location line="+4"/>
<source>Case &Sensitive</source>
- <translation type="unfinished"></translation>
+ <translation>Uwzględniaj &wielkość liter</translation>
</message>
<message>
<location line="+1"/>
@@ -13590,32 +13767,32 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+2"/>
<source>Index of Match:</source>
- <translation type="unfinished"></translation>
+ <translation>Indeks dopasowania:</translation>
</message>
<message>
<location line="+1"/>
<source>Matched Length:</source>
- <translation type="unfinished"></translation>
+ <translation>Dopasowana długość:</translation>
</message>
<message>
<location line="+25"/>
<source>Regular expression v1</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrażenie regularne v1</translation>
</message>
<message>
<location line="+1"/>
<source>Regular expression v2</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrażenie regularne v2</translation>
</message>
<message>
<location line="+1"/>
<source>Wildcard</source>
- <translation type="unfinished"></translation>
+ <translation>Dżoker</translation>
</message>
<message>
<location line="+1"/>
<source>Fixed string</source>
- <translation type="unfinished"></translation>
+ <translation>Stały ciąg</translation>
</message>
<message>
<location line="+39"/>
@@ -13630,32 +13807,32 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+13"/>
<source>Regular Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrażenie regularne</translation>
</message>
<message>
<location line="+129"/>
<source>Enter pattern from code...</source>
- <translation type="unfinished"></translation>
+ <translation>Wprowadź wzorzec z kodu...</translation>
</message>
<message>
<location line="+4"/>
<source>Clear patterns</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść wzorce</translation>
</message>
<message>
<location line="+3"/>
<source>Clear texts</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść teksty</translation>
</message>
<message>
<location line="+9"/>
<source>Enter pattern from code</source>
- <translation type="unfinished"></translation>
+ <translation>Wprowadź wzorzec z kodu</translation>
</message>
<message>
<location line="+0"/>
<source>Pattern</source>
- <translation type="unfinished"></translation>
+ <translation>Wzorzec</translation>
</message>
</context>
<context>
@@ -13663,27 +13840,27 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/resourceeditor/resourceeditorplugin.cpp" line="+77"/>
<source>Creates a Qt Resource file (.qrc).</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy plik z zasobami Qt (.qrc).</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Resource file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z zasobami Qt</translation>
</message>
<message>
<location line="+2"/>
<source>Qt</source>
- <translation type="unfinished"></translation>
+ <translation>Qt</translation>
</message>
<message>
<location line="+12"/>
<source>&Undo</source>
- <translation type="unfinished"></translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+1"/>
<source>&Redo</source>
- <translation type="unfinished"></translation>
+ <translation>&Przywróć</translation>
</message>
</context>
<context>
@@ -13699,7 +13876,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/snippets/snippetsplugin.cpp" line="+94"/>
<source>Snippets</source>
- <translation type="unfinished"></translation>
+ <translation>Urywki</translation>
</message>
</context>
<context>
@@ -13707,7 +13884,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/snippets/snippetswindow.cpp" line="+58"/>
<source>Snippets</source>
- <translation type="unfinished"></translation>
+ <translation>Urywki</translation>
</message>
</context>
<context>
@@ -13715,7 +13892,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/subversion/checkoutwizard.cpp" line="+54"/>
<source>Checks out a project from a Subversion repository.</source>
- <translation type="unfinished"></translation>
+ <translation>Wyciąga projekt ze składnicy Subversion.</translation>
</message>
<message>
<location line="+5"/>
@@ -13733,7 +13910,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+1"/>
<source>Repository:</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica:</translation>
</message>
</context>
<context>
@@ -13749,17 +13926,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+281"/>
<source>&Subversion</source>
- <translation type="unfinished"></translation>
+ <translation>&Subversion</translation>
</message>
<message>
<location line="+11"/>
<source>Add</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj</translation>
</message>
<message>
<location line="+0"/>
<source>Add "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj "%1"</translation>
</message>
<message>
<location line="+4"/>
@@ -13769,37 +13946,37 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+4"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
<message>
<location line="+0"/>
<source>Delete "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń "%1"</translation>
</message>
<message>
<location line="+7"/>
<source>Revert</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany</translation>
</message>
<message>
<location line="+0"/>
<source>Revert "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w "%1"</translation>
</message>
<message>
<location line="+9"/>
<source>Diff Project</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w projekcie</translation>
</message>
<message>
<location line="+6"/>
<source>Diff Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w bieżącym pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Diff "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w "%1"</translation>
</message>
<message>
<location line="+4"/>
@@ -13809,17 +13986,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+6"/>
<source>Commit All Files</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij wszystkie pliki</translation>
</message>
<message>
<location line="+6"/>
<source>Commit Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij bieżący plik</translation>
</message>
<message>
<location line="+0"/>
<source>Commit "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij "%1"</translation>
</message>
<message>
<location line="+4"/>
@@ -13839,57 +14016,57 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+8"/>
<source>Annotate Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację do bieżącego pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Annotate "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację do "%1"</translation>
</message>
<message>
<location line="+8"/>
<source>Describe...</source>
- <translation type="unfinished"></translation>
+ <translation>Opisz...</translation>
</message>
<message>
<location line="+7"/>
<source>Project Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan projektu</translation>
</message>
<message>
<location line="+6"/>
<source>Update Project</source>
- <translation type="unfinished"></translation>
+ <translation>Odśwież projekt</translation>
</message>
<message>
<location line="+9"/>
<source>Commit</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij</translation>
</message>
<message>
<location line="+4"/>
<source>Diff Selected Files</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice w zaznaczonych plikach</translation>
</message>
<message>
<location line="+3"/>
<source>&Undo</source>
- <translation type="unfinished"></translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished"></translation>
+ <translation>&Przywróć</translation>
</message>
<message>
<location line="+40"/>
<source>Closing Subversion Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Zamykanie edytora Subversion</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to commit the change?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz wysłać zmianę?</translation>
</message>
<message>
<location line="+1"/>
@@ -13899,7 +14076,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+124"/>
<source>The file has been changed. Do you want to revert it?</source>
- <translation type="unfinished"></translation>
+ <translation>Plik został zmieniony. Czy chcesz odwrócić w nim zmiany?</translation>
</message>
<message>
<location line="+80"/>
@@ -13914,17 +14091,17 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+15"/>
<source>There are no modified files.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak zmodyfikowanych plików.</translation>
</message>
<message>
<location line="+8"/>
<source>Cannot create temporary file: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć tymczasowego pliku: %1</translation>
</message>
<message>
<location line="+186"/>
<source>Describe</source>
- <translation type="unfinished"></translation>
+ <translation>Opisz</translation>
</message>
<message>
<location line="+1"/>
@@ -13941,22 +14118,23 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Executing: %1 %2
</source>
<extracomment>Executing: <executable> <arguments></extracomment>
- <translation type="unfinished"></translation>
+ <translation>Wykonywanie: %1 %2
+</translation>
</message>
<message>
<location line="+29"/>
<source>The process terminated with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces zakończył się kodem wyjściowym %1.</translation>
</message>
<message>
<location line="+3"/>
<source>The process terminated abnormally.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces niepoprawnie zakończony.</translation>
</message>
<message>
<location line="+3"/>
<source>Could not start subversion '%1'. Please check your settings in the preferences.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić subversion "%1". Sprawdź stosowne ustawienia.</translation>
</message>
<message>
<location line="+3"/>
@@ -13969,7 +14147,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/subversion/subversionsubmiteditor.cpp" line="+42"/>
<source>Subversion Submit</source>
- <translation type="unfinished"></translation>
+ <translation>Wyślij do Subversion</translation>
</message>
</context>
<context>
@@ -13978,7 +14156,7 @@ Check if the phone is connected and the TRK application is running.</source>
<location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+119"/>
<location line="+20"/>
<source>%1 found</source>
- <translation type="unfinished"></translation>
+ <translation>Ilość znalezionych: %1</translation>
</message>
<message>
<location line="+12"/>
@@ -13988,7 +14166,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location line="+27"/>
<source>Use Regular E&xpressions</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj wyrażeń &regularnych</translation>
</message>
</context>
<context>
@@ -13996,12 +14174,12 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+159"/>
<source>untitled</source>
- <translation type="unfinished"></translation>
+ <translation>nienazwany</translation>
</message>
<message>
<location line="+67"/>
<source><em>Binary data</em></source>
- <translation type="unfinished"></translation>
+ <translation><em>Dane binarne</em></translation>
</message>
</context>
<context>
@@ -14009,30 +14187,30 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+252"/>
<source>Print Document</source>
- <translation type="unfinished"></translation>
+ <translation>Wydrukuj dokument</translation>
</message>
<message>
<location line="+290"/>
<source><b>Error:</b> Could not decode "%1" with "%2"-encoding. Editing not possible.</source>
- <translation type="unfinished"></translation>
+ <translation><b>Błąd:</b> Nie można odkodować "%1" używając kodowania "%2". Edycja nie jest możliwa.</translation>
</message>
<message>
<location line="+2"/>
<source>Select Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz kodowanie</translation>
</message>
</context>
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+4274"/>
+ <location line="+4275"/>
<source>Line: %1, Col: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Linia: %1, kolumna: %2</translation>
</message>
<message>
<location line="+1"/>
<source>Line: %1, Col: 999</source>
- <translation type="unfinished"></translation>
+ <translation>Linia: %1, kolumna: 999</translation>
</message>
</context>
<context>
@@ -14040,7 +14218,7 @@ Check if the phone is connected and the TRK application is running.</source>
<message>
<location filename="../../../src/plugins/texteditor/codecselector.cpp" line="+72"/>
<source>Text Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Kodowanie tekstu</translation>
</message>
<message>
<location line="+4"/>
@@ -14051,17 +14229,17 @@ The following encodings are likely to fit:</source>
<message>
<location line="+1"/>
<source>Select encoding for "%1".%2</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz kodowanie dla "%1".%2</translation>
</message>
<message>
<location line="+44"/>
<source>Reload with Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Przeładuj z kodowaniem</translation>
</message>
<message>
<location line="+1"/>
<source>Save with Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj z kodowaniem</translation>
</message>
</context>
<context>
@@ -14069,7 +14247,7 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/colorscheme.cpp" line="+210"/>
<source>Not a color scheme file.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie jest to plik ze schematem kolorów.</translation>
</message>
</context>
<context>
@@ -14077,7 +14255,7 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/findincurrentfile.cpp" line="+62"/>
<source>Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Bieżący plik</translation>
</message>
</context>
<context>
@@ -14085,27 +14263,27 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/findinfiles.cpp" line="+56"/>
<source>Files on Disk</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki na dysku</translation>
</message>
<message>
<location line="+37"/>
<source>&Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>&Katalog:</translation>
</message>
<message>
<location line="+13"/>
<source>&Browse</source>
- <translation type="unfinished"></translation>
+ <translation>&PrzeglÄ…daj</translation>
</message>
<message>
<location line="+4"/>
<source>File &pattern:</source>
- <translation type="unfinished"></translation>
+ <translation>&Wzorzec pliku:</translation>
</message>
<message>
<location line="+18"/>
<source>Directory to search</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog w którym przeszukiwać</translation>
</message>
</context>
<context>
@@ -14113,7 +14291,7 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/fontsettings.cpp" line="+136"/>
<source>Customized</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚asny</translation>
</message>
</context>
<context>
@@ -14121,52 +14299,52 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+314"/>
<source>Font & Colors</source>
- <translation type="unfinished"></translation>
+ <translation>Czcionki i kolory</translation>
</message>
<message>
<location line="+124"/>
<source>Copy Color Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj schemat kolorów</translation>
</message>
<message>
<location line="+1"/>
<source>Color Scheme name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa schematu kolorów:</translation>
</message>
<message>
<location line="+1"/>
<source>%1 (copy)</source>
- <translation type="unfinished"></translation>
+ <translation>%1 (kopia)</translation>
</message>
<message>
<location line="+45"/>
<source>Delete Color Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń schemat kolorów</translation>
</message>
<message>
<location line="+1"/>
<source>Are you sure you want to delete this color scheme permanently?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy jesteś pewien że chcesz usunąć ten schemat kolorów bezpowrotnie?</translation>
</message>
<message>
<location line="+6"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
</message>
<message>
<location line="+28"/>
<source>Color Scheme Changed</source>
- <translation type="unfinished"></translation>
+ <translation>Schemat kolorów został zmieniony</translation>
</message>
<message>
<location line="+1"/>
<source>The color scheme "%1" was modified, do you want to save the changes?</source>
- <translation type="unfinished"></translation>
+ <translation>Schemat kolorów "%1" został zmodyfikowany, czy chcesz zachować zmiany?</translation>
</message>
<message>
<location line="+7"/>
<source>Discard</source>
- <translation type="unfinished"></translation>
+ <translation>Odrzuć</translation>
</message>
</context>
<context>
@@ -14174,12 +14352,12 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/linenumberfilter.cpp" line="+55"/>
<source>Line %1</source>
- <translation type="unfinished"></translation>
+ <translation>Linia %1</translation>
</message>
<message>
<location filename="../../../src/plugins/texteditor/linenumberfilter.h" line="+52"/>
<source>Line in current document</source>
- <translation type="unfinished"></translation>
+ <translation>Linia w bieżącym dokumencie</translation>
</message>
</context>
<context>
@@ -14187,22 +14365,22 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/texteditoractionhandler.cpp" line="+117"/>
<source>&Undo</source>
- <translation type="unfinished"></translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+2"/>
<source>&Redo</source>
- <translation type="unfinished"></translation>
+ <translation>&Przywróć</translation>
</message>
<message>
<location line="+13"/>
<source>Select Encoding...</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz kodowanie...</translation>
</message>
<message>
<location line="+6"/>
<source>Auto-&indent Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Automatyczne wc&ięcia dla selekcji</translation>
</message>
<message>
<location line="+2"/>
@@ -14227,17 +14405,17 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>%1+E, R</source>
- <translation type="unfinished"></translation>
+ <translation>%1+E, R</translation>
</message>
<message>
<location line="+5"/>
<source>&Visualize Whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>&Wizualizuj białe znaki</translation>
</message>
<message>
<location line="+4"/>
<source>%1+E, %2+V</source>
- <translation type="unfinished"></translation>
+ <translation>%1+E, %2+V</translation>
</message>
<message>
<location line="+4"/>
@@ -14247,17 +14425,17 @@ The following encodings are likely to fit:</source>
<message>
<location line="+7"/>
<source>Enable Text &Wrapping</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚Ä…cz za&wijanie tekstu</translation>
</message>
<message>
<location line="+3"/>
<source>%1+E, %2+W</source>
- <translation type="unfinished"></translation>
+ <translation>%1+E, %2+W</translation>
</message>
<message>
<location line="+5"/>
<source>(Un)Comment &Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Wykomentuj / odkomentuj &selekcjÄ™</translation>
</message>
<message>
<location line="+2"/>
@@ -14267,7 +14445,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Cut &Line</source>
- <translation type="unfinished"></translation>
+ <translation>Wytnij &liniÄ™</translation>
</message>
<message>
<location line="+2"/>
@@ -14277,12 +14455,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Delete &Line</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń &linię</translation>
</message>
<message>
<location line="+4"/>
<source>Collapse</source>
- <translation type="unfinished"></translation>
+ <translation>Zwiń</translation>
</message>
<message>
<location line="+2"/>
@@ -14292,7 +14470,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Expand</source>
- <translation type="unfinished"></translation>
+ <translation>Rozwiń</translation>
</message>
<message>
<location line="+2"/>
@@ -14302,12 +14480,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>(Un)&Collapse All</source>
- <translation type="unfinished"></translation>
+ <translation>&Zwiń / rozwiń wszystko</translation>
</message>
<message>
<location line="+5"/>
<source>Increase Font Size</source>
- <translation type="unfinished"></translation>
+ <translation>Zwiększ rozmiar czcionki</translation>
</message>
<message>
<location line="+2"/>
@@ -14317,7 +14495,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Decrease Font Size</source>
- <translation type="unfinished"></translation>
+ <translation>Zmniejsz rozmiar czcionki</translation>
</message>
<message>
<location line="+2"/>
@@ -14327,7 +14505,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Goto Block Start</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do początku bloku</translation>
</message>
<message>
<location line="+2"/>
@@ -14337,7 +14515,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Goto Block End</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do końca bloku</translation>
</message>
<message>
<location line="+2"/>
@@ -14367,7 +14545,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Select Block Up</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznacz zewnętrzny blok</translation>
</message>
<message>
<location line="+2"/>
@@ -14377,12 +14555,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Select Block Down</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznacz wewnętrzny blok</translation>
</message>
<message>
<location line="+5"/>
<source>Move Line Up</source>
- <translation type="unfinished"></translation>
+ <translation>Przenieś linię w górę</translation>
</message>
<message>
<location line="+2"/>
@@ -14392,7 +14570,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Move Line Down</source>
- <translation type="unfinished"></translation>
+ <translation>Przenieś linię w dół</translation>
</message>
<message>
<location line="+2"/>
@@ -14422,7 +14600,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+92"/>
<source> <line number></source>
- <translation type="unfinished"></translation>
+ <translation> <numer linii></translation>
</message>
</context>
<context>
@@ -14430,22 +14608,22 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+94"/>
<source>Creates a text file (.txt).</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy plik tekstowy (.txt).</translation>
</message>
<message>
<location line="+1"/>
<source>Text File</source>
- <translation type="unfinished"></translation>
+ <translation>Plik tekstowy</translation>
</message>
<message>
<location line="+2"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
</message>
<message>
<location line="+26"/>
<source>Triggers a completion in this scope</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącza uzupełnianie kody w tym zakresie</translation>
</message>
<message>
<location line="+5"/>
@@ -14455,7 +14633,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Meta+Space</source>
- <translation type="unfinished"></translation>
+ <translation>Meta+Space</translation>
</message>
<message>
<location line="+6"/>
@@ -14473,57 +14651,57 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/texteditorsettings.cpp" line="+64"/>
<source>Text</source>
- <translation type="unfinished"></translation>
+ <translation>Tekst</translation>
</message>
<message>
<location line="+4"/>
<source>Link</source>
- <translation type="unfinished"></translation>
+ <translation>Odsyłacz</translation>
</message>
<message>
<location line="+1"/>
<source>Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczone</translation>
</message>
<message>
<location line="+1"/>
<source>Line Number</source>
- <translation type="unfinished"></translation>
+ <translation>Numer linii</translation>
</message>
<message>
<location line="+1"/>
<source>Search Result</source>
- <translation type="unfinished"></translation>
+ <translation>Wyniki wyszukiwania</translation>
</message>
<message>
<location line="+1"/>
<source>Search Scope</source>
- <translation type="unfinished"></translation>
+ <translation>Zakres wyszukiwania</translation>
</message>
<message>
<location line="+1"/>
<source>Parentheses</source>
- <translation type="unfinished"></translation>
+ <translation>Nawiasy</translation>
</message>
<message>
<location line="+1"/>
<source>Current Line</source>
- <translation type="unfinished"></translation>
+ <translation>Bieżąca linia</translation>
</message>
<message>
<location line="+2"/>
<source>Current Line Number</source>
- <translation type="unfinished"></translation>
+ <translation>Numer bieżącej linii</translation>
</message>
<message>
<location line="+4"/>
<source>Occurrences</source>
- <translation type="unfinished"></translation>
+ <translation>WystÄ…pienia</translation>
</message>
<message>
<location line="+1"/>
<source>Unused Occurrence</source>
- <translation type="unfinished"></translation>
+ <translation>Nieużywane wystąpienie</translation>
</message>
<message>
<location line="+1"/>
@@ -14533,72 +14711,72 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Number</source>
- <translation type="unfinished"></translation>
+ <translation>Numer</translation>
</message>
<message>
<location line="+1"/>
<source>String</source>
- <translation type="unfinished"></translation>
+ <translation>CiÄ…g</translation>
</message>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
<message>
<location line="+1"/>
<source>Keyword</source>
- <translation type="unfinished"></translation>
+ <translation>SÅ‚owo kluczowe</translation>
</message>
<message>
<location line="+1"/>
<source>Operator</source>
- <translation type="unfinished"></translation>
+ <translation>Operator</translation>
</message>
<message>
<location line="+1"/>
<source>Preprocessor</source>
- <translation type="unfinished"></translation>
+ <translation>Preprocesor</translation>
</message>
<message>
<location line="+1"/>
<source>Label</source>
- <translation type="unfinished"></translation>
+ <translation>Etykieta</translation>
</message>
<message>
<location line="+1"/>
<source>Comment</source>
- <translation type="unfinished"></translation>
+ <translation>Komentarz</translation>
</message>
<message>
<location line="+1"/>
<source>Doxygen Comment</source>
- <translation type="unfinished"></translation>
+ <translation>Komentarz Doxygen'a</translation>
</message>
<message>
<location line="+1"/>
<source>Doxygen Tag</source>
- <translation type="unfinished"></translation>
+ <translation>Tag Doxygen'a</translation>
</message>
<message>
<location line="+1"/>
<source>Visual Whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>Widoczny biały znak</translation>
</message>
<message>
<location line="+1"/>
<source>Disabled Code</source>
- <translation type="unfinished"></translation>
+ <translation>Nieaktywny kod</translation>
</message>
<message>
<location line="+3"/>
<source>Added Line</source>
- <translation type="unfinished"></translation>
+ <translation>Dodana linia</translation>
</message>
<message>
<location line="+1"/>
<source>Removed Line</source>
- <translation type="unfinished"></translation>
+ <translation>Usunięta linia</translation>
</message>
<message>
<location line="+1"/>
@@ -14615,12 +14793,12 @@ The following encodings are likely to fit:</source>
<location line="+8"/>
<location line="+8"/>
<source>Text Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor tekstu</translation>
</message>
<message>
<location line="-10"/>
<source>Behavior</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowanie</translation>
</message>
<message>
<location line="+8"/>
@@ -14633,17 +14811,17 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/vcsbase/basecheckoutwizard.cpp" line="+103"/>
<source>Cannot Open Project</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to open project in '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu w "%1".</translation>
</message>
<message>
<location line="+10"/>
<source>Could not find any project files matching (%1) in the directory '%2'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć żadnych plików z projekami pasujących do (%1) w katalogu "%2".</translation>
</message>
<message>
<location line="+32"/>
@@ -14653,12 +14831,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+7"/>
<source>'%1' does not exist.</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" nie istnieje.</translation>
</message>
<message>
<location line="+9"/>
<source>Unable to open the project '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć projektu "%1".</translation>
</message>
</context>
<context>
@@ -14666,22 +14844,22 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+109"/>
<source>The process terminated with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces zakończył się kodem wyjściowym %1.</translation>
</message>
<message>
<location line="+4"/>
<source>The process returned exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces zwrócił kod wyjściowy %1.</translation>
</message>
<message>
<location line="+4"/>
<source>The process terminated in an abnormal way.</source>
- <translation type="unfinished"></translation>
+ <translation>Proces niepoprawnie zakończony.</translation>
</message>
<message>
<location line="+15"/>
<source>Stopping...</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymywanie...</translation>
</message>
</context>
<context>
@@ -14694,12 +14872,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+12"/>
<source>Failed.</source>
- <translation type="unfinished"></translation>
+ <translation>Niepomyślnie zakończone.</translation>
</message>
<message>
<location line="+10"/>
<source>Succeeded.</source>
- <translation type="unfinished"></translation>
+ <translation>Pomyślnie zakończone.</translation>
</message>
</context>
<context>
@@ -14707,27 +14885,27 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/vcsbase/nicknamedialog.cpp" line="+217"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>ImiÄ™</translation>
</message>
<message>
<location line="+0"/>
<source>E-mail</source>
- <translation type="unfinished"></translation>
+ <translation>Email</translation>
</message>
<message>
<location line="+1"/>
<source>Alias</source>
- <translation type="unfinished"></translation>
+ <translation>Alias</translation>
</message>
<message>
<location line="+0"/>
<source>Alias e-mail</source>
- <translation type="unfinished"></translation>
+ <translation>Alias email</translation>
</message>
<message>
<location line="+15"/>
<source>Cannot open '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć "%1": %2</translation>
</message>
</context>
<context>
@@ -14735,12 +14913,12 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/vcsbase/submitfilemodel.cpp" line="+43"/>
<source>State</source>
- <translation type="unfinished"></translation>
+ <translation>Stan</translation>
</message>
<message>
<location line="+0"/>
<source>File</source>
- <translation type="unfinished"></translation>
+ <translation>Plik</translation>
</message>
</context>
<context>
@@ -14749,7 +14927,7 @@ The following encodings are likely to fit:</source>
<location filename="../../../src/plugins/vcsbase/vcsbaseconstants.h" line="+38"/>
<location line="+3"/>
<source>Version Control</source>
- <translation>Kontrola Wersji</translation>
+ <translation>System kontroli wersji</translation>
</message>
<message>
<location line="-2"/>
@@ -14762,7 +14940,7 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbaseeditor.cpp" line="+327"/>
<source>Describe change %1</source>
- <translation type="unfinished"></translation>
+ <translation>Opisz zmianÄ™ %1</translation>
</message>
</context>
<context>
@@ -14770,12 +14948,12 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbaseoutputwindow.cpp" line="+90"/>
<source>Clear</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść</translation>
</message>
<message>
<location line="+78"/>
<source>Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>System kontroli wersji</translation>
</message>
</context>
<context>
@@ -14788,12 +14966,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+6"/>
<source>Insert name...</source>
- <translation type="unfinished"></translation>
+ <translation>Wstaw nazwÄ™...</translation>
</message>
<message>
<location line="+313"/>
<source>Prompt to submit</source>
- <translation>Przypominaj o wysyłaniu zmian do serwera</translation>
+ <translation>Pytaj przed wysłaniem zmian do serwera</translation>
</message>
<message>
<location line="+59"/>
@@ -14803,7 +14981,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+28"/>
<source>Unable to open '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć "%1": %2</translation>
</message>
<message>
<location line="+10"/>
@@ -14906,12 +15084,12 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/shared/help/contentwindow.cpp" line="+136"/>
<source>Open Link</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz odsyłacz</translation>
</message>
<message>
<location line="+1"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz odsyłacz w nowej karcie</translation>
</message>
</context>
<context>
@@ -14919,38 +15097,39 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/shared/help/helpviewer.cpp" line="+247"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz odsyłacz w nowej karcie</translation>
</message>
<message>
<location line="+166"/>
<source><title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div></source>
- <translation type="unfinished"></translation>
+ <translation><title>Błąd 404...</title><div align="center"><br><br><h1>Strona nie została znaleziona</h1><br><h3>'%1'</h3></div></translation>
</message>
<message>
<location line="+57"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Pomoc</translation>
</message>
<message>
<location line="+1"/>
<source>Unable to launch external application.
</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić zewnętrznej aplikacji.
+</translation>
</message>
<message>
<location line="+0"/>
<source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>OK</translation>
</message>
<message>
<location line="+63"/>
<source>Copy &Link Location</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj &adres odsyłacza</translation>
</message>
<message>
<location line="+3"/>
<source>Open Link in New Tab Ctrl+LMB</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj adres odsyłacza Ctrl+LMB</translation>
</message>
</context>
<context>
@@ -14958,17 +15137,17 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/shared/help/indexwindow.cpp" line="+52"/>
<source>&Look for:</source>
- <translation type="unfinished"></translation>
+ <translation>Po&szukuj:</translation>
</message>
<message>
<location line="+74"/>
<source>Open Link</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz odsyłacz</translation>
</message>
<message>
<location line="+1"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz odsyłacz w nowej karcie</translation>
</message>
</context>
<context>
@@ -14976,47 +15155,47 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/shared/proparser/proeditormodel.cpp" line="+446"/>
<source><Global Scope></source>
- <translation type="unfinished"></translation>
+ <translation><Zakres globalny></translation>
</message>
<message>
<location line="+74"/>
<source>Change Item</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień element</translation>
</message>
<message>
<location line="+20"/>
<source>Change Variable Assignment</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień podstawienie zmiennej</translation>
</message>
<message>
<location line="+11"/>
<source>Change Variable Type</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień typ zmiennej</translation>
</message>
<message>
<location line="+14"/>
<source>Change Scope Condition</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień warunek zakresu</translation>
</message>
<message>
<location line="+13"/>
<source>Change Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień wyrażenie</translation>
</message>
<message>
<location line="+51"/>
<source>Move Item</source>
- <translation type="unfinished"></translation>
+ <translation>PrzenieÅ› element</translation>
</message>
<message>
<location line="+41"/>
<source>Remove Item</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń element</translation>
</message>
<message>
<location line="+49"/>
<source>Insert Item</source>
- <translation type="unfinished"></translation>
+ <translation>Wstaw element</translation>
</message>
</context>
<context>
@@ -15024,62 +15203,62 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/shared/qrceditor/qrceditor.cpp" line="+57"/>
<source>Add Files</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj pliki</translation>
</message>
<message>
<location line="+1"/>
<source>Add Prefix</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj przedrostek</translation>
</message>
<message>
<location line="+156"/>
<source>Invalid file</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny plik</translation>
</message>
<message>
<location line="+2"/>
<source>Copy</source>
- <translation type="unfinished"></translation>
+ <translation>Skopiuj</translation>
</message>
<message>
<location line="+4"/>
<source>Skip</source>
- <translation type="unfinished"></translation>
+ <translation>Pomiń</translation>
</message>
<message>
<location line="+3"/>
<source>Abort</source>
- <translation type="unfinished"></translation>
+ <translation>Przerwij</translation>
</message>
<message>
<location line="+2"/>
<source>The file %1 is not in a subdirectory of the resource file. Continuing will result in an invalid resource file.</source>
- <translation type="unfinished"></translation>
+ <translation>Plik %1 nie leży w podkatalogu w którym znajduje się plik z zasobami. Kontynuacja spowoduje utworzenie niepoprawnego pliku z zasobami.</translation>
</message>
<message>
<location line="+15"/>
<source>Choose copy location</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz docelowe położenie kopii</translation>
</message>
<message>
<location line="+10"/>
<source>Overwrite failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można nadpisać</translation>
</message>
<message>
<location line="+1"/>
<source>Could not overwrite file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można nadpisać pliku %1.</translation>
</message>
<message>
<location line="+10"/>
<source>Copying failed</source>
- <translation type="unfinished"></translation>
+ <translation>Kopiowanie zakończone niepowodzeniem</translation>
</message>
<message>
<location line="+1"/>
<source>Could not copy the file to %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można skopiować pliku do %1.</translation>
</message>
</context>
<context>
@@ -15087,72 +15266,72 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/shared/qrceditor/resourceview.cpp" line="+362"/>
<source>Add Files...</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj pliki...</translation>
</message>
<message>
<location line="+1"/>
<source>Change Alias...</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień alias...</translation>
</message>
<message>
<location line="+1"/>
<source>Add Prefix...</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj przedrostek...</translation>
</message>
<message>
<location line="+1"/>
<source>Change Prefix...</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień przedrostek...</translation>
</message>
<message>
<location line="+1"/>
<source>Change Language...</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień język...</translation>
</message>
<message>
<location line="+2"/>
<source>Remove Item</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń element</translation>
</message>
<message>
<location line="+41"/>
<source>Open file</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz plik</translation>
</message>
<message>
<location line="+2"/>
<source>All files (*)</source>
- <translation type="unfinished"></translation>
+ <translation>Wszystkie pliki (*)</translation>
</message>
<message>
<location line="+93"/>
<source>Change Prefix</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień przedrostek</translation>
</message>
<message>
<location line="+0"/>
<source>Input Prefix:</source>
- <translation type="unfinished"></translation>
+ <translation>Wprowadź przedrostek:</translation>
</message>
<message>
<location line="+13"/>
<source>Change Language</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień język</translation>
</message>
<message>
<location line="+0"/>
<source>Language:</source>
- <translation type="unfinished"></translation>
+ <translation>Język:</translation>
</message>
<message>
<location line="+16"/>
<source>Change File Alias</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień alias pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Alias:</source>
- <translation type="unfinished"></translation>
+ <translation>Alias:</translation>
</message>
</context>
<context>
@@ -15160,7 +15339,7 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/tools/qdebugger/mainwindow.cpp" line="+155"/>
<source>Open file</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz plik</translation>
</message>
<message>
<location line="+1"/>
@@ -15170,7 +15349,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+2"/>
<source>Quit</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończ</translation>
</message>
<message>
<location line="+1"/>
@@ -15251,12 +15430,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+7"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation>Debugowanie</translation>
</message>
<message>
<location line="+105"/>
<source>Not a runnable project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt nie jest uruchamialny</translation>
</message>
<message>
<location line="+1"/>
@@ -15295,47 +15474,47 @@ in your .pro file.</source>
<message>
<location filename="mime_tr.h" line="+1"/>
<source>unknown</source>
- <translation type="unfinished"></translation>
+ <translation>nieznany</translation>
</message>
<message>
<location line="+1"/>
<source>CMake Project file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik projektu CMake</translation>
</message>
<message>
<location line="+1"/>
<source>C Source file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik źródłowy C</translation>
</message>
<message>
<location line="+1"/>
<source>C Header file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nagłówkowy C</translation>
</message>
<message>
<location line="+1"/>
<source>C++ Header file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nagłówkowy C++</translation>
</message>
<message>
<location line="+1"/>
<source>C++ header</source>
- <translation type="unfinished"></translation>
+ <translation>Plik nagłówkowy C++</translation>
</message>
<message>
<location line="+1"/>
<source>C++ Source file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik źródłowy C++</translation>
</message>
<message>
<location line="+1"/>
<source>C++ source code</source>
- <translation type="unfinished"></translation>
+ <translation>Kod źródłowy C++</translation>
</message>
<message>
<location line="+1"/>
<source>Objective-C source code</source>
- <translation type="unfinished"></translation>
+ <translation>Kod źródłowy Objective-C</translation>
</message>
<message>
<location line="+1"/>
@@ -15345,17 +15524,17 @@ in your .pro file.</source>
<message>
<location line="+1"/>
<source>Qt Designer file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik Qt Designer</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Qt Creator Project file</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólny plik projektu Qt Creator</translation>
</message>
<message>
<location line="+1"/>
<source>Generic Project Files</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne pliki projektów</translation>
</message>
<message>
<location line="+1"/>
@@ -15375,17 +15554,17 @@ in your .pro file.</source>
<message>
<location line="+1"/>
<source>QML file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik QML</translation>
</message>
<message>
<location line="+1"/>
<source>Qml Project file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik projektu Qml</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Project file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik projektu Qt</translation>
</message>
<message>
<location line="+1"/>
@@ -15400,12 +15579,12 @@ in your .pro file.</source>
<message>
<location line="+1"/>
<source>Qt Script file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik ze skryptem Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Resource file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik z zasobami Qt</translation>
</message>
<message>
<location line="+1"/>
@@ -15420,12 +15599,475 @@ in your .pro file.</source>
<message>
<location line="+1"/>
<source>XML document</source>
- <translation type="unfinished"></translation>
+ <translation>Dokument XML</translation>
</message>
<message>
<location line="+1"/>
<source>Differences between files</source>
- <translation type="unfinished"></translation>
+ <translation>Różnice pomiędzy plikami</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::DirectoryFilterOptions</name>
+ <message>
+ <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
+ <source>Name:</source>
+ <translation>Nazwa:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>File Types:</source>
+ <translation>Typy plików:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Specify file name filters, separated by comma. Filters may contain wildcards.</source>
+ <translation>Podaj filtry nazw plików. oddzielone przecinkiem. Filtry mogą zawierać dżokery.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Prefix:</source>
+ <translation>Przedrostek:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree.
+To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for.</source>
+ <translation>Podaj krótkie słowo lub skrót który będzie użyty do odfiltrowania plików w podanych katalogach.
+Aby uaktywnić ten filtr wpisz w lokalizatorze powyższy skrót i po spacji podaj szukane słowo.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Limit to prefix</source>
+ <translation>Ogranicz aktywność filtru:
+aktywny tylko po wpisaniu przedrostka</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add...</source>
+ <translation>Dodaj...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Edit...</source>
+ <translation>Zmodyfikuj...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Usuń</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Directories:</source>
+ <translation>Katalogi:</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::FileSystemFilterOptions</name>
+ <message>
+ <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
+ <source>Filter configuration</source>
+ <translation>Konfiguracja filtra</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Prefix:</source>
+ <translation>Przedrostek:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Limit to prefix</source>
+ <translation>Ogranicz aktywność filtru:
+aktywny tylko po wpisaniu przedrostka</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Include hidden files</source>
+ <translation>WÅ‚Ä…cz ukryte pliki</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Filter:</source>
+ <translation>Filtr:</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::SettingsWidget</name>
+ <message>
+ <location filename="../../../src/plugins/locator/settingspage.ui"/>
+ <source>Configure Filters</source>
+ <translation>Skonfiguruj filtry</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add</source>
+ <translation>Dodaj</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Usuń</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Edit</source>
+ <translation>Zmodyfikuj</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Refresh Interval:</source>
+ <translation>Odświeżanie co:</translation>
+ </message>
+ <message>
+ <location/>
+ <source> min</source>
+ <translation> min</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::Internal::CppLocatorFilter</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
+ <source>Classes and Methods</source>
+ <translation>Klasy i metody</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::TermGdbAdapter</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+142"/>
+ <source>Debugger Error</source>
+ <translation>BÅ‚Ä…d debuggera</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::DirectoryFilter</name>
+ <message>
+ <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
+ <source>Generic Directory Filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Filter Configuration</source>
+ <translation>Konfiguracja filtra</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <location line="+11"/>
+ <source>Choose a directory to add</source>
+ <translation>Wybierz katalog do dodania</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>%1 filter update: 0 files</source>
+ <translation>Odświeżenie filtra %1: 0 plików</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+23"/>
+ <source>%1 filter update: %n files</source>
+ <translation>
+ <numerusform>Odświeżenie filtra %1: %n plik</numerusform>
+ <numerusform>Odświeżenie filtra %1: %n pliki</numerusform>
+ <numerusform>Odświeżenie filtra %1: %n plików</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>%1 filter update: canceled</source>
+ <translation>Odświeżenie filtra %1: anulowano</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::FileSystemFilter</name>
+ <message>
+ <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
+ <source>Files in file system</source>
+ <translation>Pliki w systemie plików</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::ILocatorFilter</name>
+ <message>
+ <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
+ <source>Filter Configuration</source>
+ <translation>Konfiguracja filtra</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Limit to prefix</source>
+ <translation>Ogranicz aktywność filtru:
+aktywny tylko po wpisaniu przedrostka</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Prefix:</source>
+ <translation>Przedrostek:</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::LocatorFiltersFilter</name>
+ <message>
+ <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
+ <source>Available filters</source>
+ <translation>Dostępne filtry</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::LocatorPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
+ <source>Indexing</source>
+ <translation>Indeksowanie</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::LocatorWidget</name>
+ <message>
+ <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
+ <source>Refresh</source>
+ <translation>Odśwież</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Configure...</source>
+ <translation>Skonfiguruj...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Locate...</source>
+ <translation>Znajdź...</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Type to locate</source>
+ <translation>Wpisz aby znaleźć</translation>
+ </message>
+ <message>
+ <location line="+178"/>
+ <source><type here></source>
+ <translation><wpisz tutaj></translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::OpenDocumentsFilter</name>
+ <message>
+ <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
+ <source>Open documents</source>
+ <translation>Otwarte dokumenty</translation>
+ </message>
+</context>
+<context>
+ <name>Locator::Internal::SettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
+ <source>%1 (Prefix: %2)</source>
+ <translation>%1 (Przedrostek: %2)</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::S60Devices::Device</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devices.cpp" line="+66"/>
+ <source>Id:</source>
+ <translation>Identyfikator:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Name:</source>
+ <translation>Nazwa:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>EPOC:</source>
+ <translation>EPOC:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Tools:</source>
+ <translation>Narzędzia:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt:</source>
+ <translation>Qt:</translation>
+ </message>
+</context>
+<context>
+ <name>trk::BluetoothListener</name>
+ <message>
+ <location filename="../../../src/shared/trk/bluetoothlistener.cpp" line="+133"/>
+ <source>%1: Stopping listener %2...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>%1: Starting Bluetooth listener %2...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Unable to run '%1': %2</source>
+ <translation>Nie można uruchomić "%1": %2</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>%1: Bluetooth listener running (%2).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>%1: Process %2 terminated with exit code %3.</source>
+ <translation>%1: Proces %2 zakończył się kodem wyjściowym %3.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>%1: Process %2 crashed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1: Process error %2: %3</source>
+ <translation>%1: BÅ‚Ä…d procesu %2: %3</translation>
+ </message>
+</context>
+<context>
+ <name>trk::AbstractBluetoothStarter</name>
+ <message>
+ <source>%1: Connection attempt %2 succeeded.</source>
+ <translation type="obsolete">%1: %2 próba połączenia powiodła się.</translation>
+ </message>
+ <message>
+ <source>%1: Connection attempt %2 failed: %3 (retrying)...</source>
+ <translation type="obsolete">%1: %2 próba połączenia nie powiodła się; %3 (ponowna próba)...</translation>
+ </message>
+</context>
+<context>
+ <name>trk::startBluetoothGui</name>
+ <message>
+ <source>Waiting for Bluetooth Connection</source>
+ <translation type="obsolete">Oczekiwanie na połączenie Bluetooth</translation>
+ </message>
+ <message>
+ <source>Connecting to %1...</source>
+ <translation type="obsolete">ÅÄ…czenie z %1...</translation>
+ </message>
+ <message>
+ <source>Connection on %1 canceled.</source>
+ <translation type="obsolete">Anulowano połączenie z %1.</translation>
+ </message>
+</context>
+<context>
+ <name>QmlParser</name>
+ <message>
+ <location filename="../../../src/plugins/qmleditor/parser/qmljslexer.cpp" line="+553"/>
+ <source>Illegal character</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Unclosed string at end of line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Illegal escape squence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Illegal unicode escape sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Unclosed comment at end of file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Illegal syntax for exponential number</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Identifier cannot start with numeric literal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+331"/>
+ <source>Unterminated regular expression literal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Invalid regular expression flag '%0'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qmleditor/parser/qmljsparser.cpp" line="+1752"/>
+ <source>Unexpected token `%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <location line="+23"/>
+ <source>Expected token `%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Syntax error</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>trk::promptStartCommunication</name>
+ <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>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Waiting for TRK</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Waiting for TRK to start on %1...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Waiting for Bluetooth Connection</source>
+ <translation type="unfinished">Oczekiwanie na połączenie Bluetooth</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Connecting to %1...</source>
+ <translation type="unfinished">ÅÄ…czenie z %1...</translation>
+ </message>
+</context>
+<context>
+ <name>trk::BaseCommunicationStarter</name>
+ <message numerus="yes">
+ <location filename="../../../src/shared/trk/communicationstarter.cpp" line="+165"/>
+ <source>%1: timed out after %n attempts using an interval of %2ms.</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1: Connection attempt %2 succeeded.</source>
+ <translation>%1: %2 próba połączenia zakończona pomyślnie.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1: Connection attempt %2 failed: %3 (retrying)...</source>
+ <translation>%1: %2 próba połączenia zakończona niepomyślnie: %3 (ponowna próba)...</translation>
</message>
</context>
</TS>
diff --git a/src/libs/cplusplus/CppBindings.cpp b/src/libs/cplusplus/CppBindings.cpp
index 1eb11b312733247ab07a6c09027108284c41b97f..acbeb6f6fd114a5a2a965d4cbc4c9d4945fe3ca6 100644
--- a/src/libs/cplusplus/CppBindings.cpp
+++ b/src/libs/cplusplus/CppBindings.cpp
@@ -404,6 +404,11 @@ Binding *ClassBinding::findClassOrNamespaceBinding(Identifier *id, QSet<Binding
if (id->isEqualTo(identifier()))
return this;
+ if (processed->contains(this))
+ return 0;
+
+ processed->insert(this);
+
foreach (ClassBinding *nestedClassBinding, children) {
if (id->isEqualTo(nestedClassBinding->identifier()))
return nestedClassBinding;
@@ -412,6 +417,7 @@ Binding *ClassBinding::findClassOrNamespaceBinding(Identifier *id, QSet<Binding
foreach (ClassBinding *baseClassBinding, baseClassBindings) {
if (! baseClassBinding)
continue;
+
else if (Binding *b = baseClassBinding->findClassOrNamespaceBinding(id, processed))
return b;
}
diff --git a/src/libs/cplusplus/FindUsages.cpp b/src/libs/cplusplus/FindUsages.cpp
index 46f98920f738dedd22ec24b1573f571977a58cda..5b3e77ee8d1ff466079b5239f4501a1788922c20 100644
--- a/src/libs/cplusplus/FindUsages.cpp
+++ b/src/libs/cplusplus/FindUsages.cpp
@@ -62,8 +62,10 @@ QList<int> FindUsages::operator()(Symbol *symbol, Identifier *id, AST *ast)
_references.clear();
_declSymbol = symbol;
_id = id;
- _exprDoc = Document::create("<references>");
- accept(ast);
+ if (_declSymbol && _id) {
+ _exprDoc = Document::create("<references>");
+ accept(ast);
+ }
return _references;
}
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 2ae4f84da1cb83d09c8e0d99073e189f45765aba..9333d064e91732a62d2a4fb551bb92438721aeef 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -447,13 +447,13 @@ bool ResolveExpression::visit(CallAST *ast)
_results.clear();
// Compute the types of the actual arguments.
- QList< QList<Result> > arguments;
- for (ExpressionListAST *exprIt = ast->expression_list; exprIt;
- exprIt = exprIt->next) {
- arguments.append(operator()(exprIt->expression));
- }
+ int actualArgumentCount = 0;
- const unsigned actualArgumentCount = arguments.count();
+ //QList< QList<Result> > arguments;
+ for (ExpressionListAST *exprIt = ast->expression_list; exprIt; exprIt = exprIt->next) {
+ //arguments.append(operator()(exprIt->expression));
+ ++actualArgumentCount;
+ }
Name *functionCallOp = control()->operatorNameId(OperatorNameId::FunctionCallOp);
@@ -639,10 +639,19 @@ ResolveExpression::resolveBaseExpression(const QList<Result> &baseResults, int a
}
}
- if (ty->isNamedType())
+ if (NamedType *namedTy = ty->asNamedType()) {
+ const QList<Scope *> visibleScopes = _context.visibleScopes(result);
+ const QList<Symbol *> typedefCandidates = _context.resolve(namedTy->name(), visibleScopes);
+ foreach (Symbol *typedefCandidate, typedefCandidates) {
+ if (typedefCandidate->isTypedef() && typedefCandidate->type()->isNamedType()) {
+ ty = typedefCandidate->type();
+ break;
+ }
+ }
+
results.append(Result(ty, lastVisibleSymbol));
- else if (Function *fun = ty->asFunctionType()) {
+ } else if (Function *fun = ty->asFunctionType()) {
Scope *funScope = fun->scope();
if (funScope && (funScope->isBlockScope() || funScope->isNamespaceScope())) {
diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro
index b5fed62800b68341cfb6f7ca712bc162d37fc3e0..9cacadb3306cf3cab76ab3537389966b5e6418a6 100644
--- a/src/libs/extensionsystem/extensionsystem.pro
+++ b/src/libs/extensionsystem/extensionsystem.pro
@@ -19,16 +19,14 @@ HEADERS += pluginerrorview.h \
pluginspec_p.h \
pluginview.h \
pluginview_p.h \
- optionsparser.h \
- iwelcomepage.h
+ optionsparser.h
SOURCES += pluginerrorview.cpp \
plugindetailsview.cpp \
iplugin.cpp \
pluginmanager.cpp \
pluginspec.cpp \
pluginview.cpp \
- optionsparser.cpp \
- iwelcomepage.cpp
+ optionsparser.cpp
FORMS += pluginview.ui \
pluginerrorview.ui \
plugindetailsview.ui
diff --git a/src/libs/extensionsystem/iwelcomepage.cpp b/src/libs/utils/iwelcomepage.cpp
similarity index 51%
rename from src/libs/extensionsystem/iwelcomepage.cpp
rename to src/libs/utils/iwelcomepage.cpp
index 1297037988940c2a41e5c34d990e1d975b99afb9..6dbf44523725d9adbb68b367d32b70492b637c65 100644
--- a/src/libs/extensionsystem/iwelcomepage.cpp
+++ b/src/libs/utils/iwelcomepage.cpp
@@ -1,8 +1,13 @@
#include "iwelcomepage.h"
-using namespace ExtensionSystem;
+using namespace Utils;
IWelcomePage::IWelcomePage()
{
}
+
+IWelcomePage::~IWelcomePage()
+{
+
+}
diff --git a/src/libs/extensionsystem/iwelcomepage.h b/src/libs/utils/iwelcomepage.h
similarity index 72%
rename from src/libs/extensionsystem/iwelcomepage.h
rename to src/libs/utils/iwelcomepage.h
index e4e5e6f1d65c1bb9f0b58f263c840f3d018af409..fbadf5ff44020713c99996943a24643fc33e345d 100644
--- a/src/libs/extensionsystem/iwelcomepage.h
+++ b/src/libs/utils/iwelcomepage.h
@@ -2,20 +2,21 @@
#define IWELCOMEPAGE_H
-#include "extensionsystem_global.h"
+#include "utils_global.h"
#include <QObject>
-namespace ExtensionSystem {
+namespace Utils {
class IWelcomePagePrivate;
-class EXTENSIONSYSTEM_EXPORT IWelcomePage : public QObject
+class QTCREATOR_UTILS_EXPORT IWelcomePage : public QObject
{
Q_OBJECT
public:
IWelcomePage();
+ virtual ~IWelcomePage();
virtual QWidget *page() = 0;
virtual QString title() const = 0;
diff --git a/src/libs/utils/projectintropage.ui b/src/libs/utils/projectintropage.ui
index b527a25420e083e3346436b790cf030449aada40..a37da218c3e0c764fc2c99c4bf0ef58643d0a330 100644
--- a/src/libs/utils/projectintropage.ui
+++ b/src/libs/utils/projectintropage.ui
@@ -91,6 +91,9 @@
</item>
<item>
<widget class="QLabel" name="stateLabel">
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
</layout>
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index 88687c63b433d7e928310d1805cf176b4c68d4ea..14a984654d5dca9574077ed412c4d582ed43ba65 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -33,6 +33,7 @@ SOURCES += reloadpromptutils.cpp \
styledbar.cpp \
stylehelper.cpp \
welcomemodetreewidget.cpp \
+ iwelcomepage.cpp \
fancymainwindow.cpp \
detailsbutton.cpp \
detailswidget.cpp
@@ -76,6 +77,7 @@ HEADERS += utils_global.h \
styledbar.h \
stylehelper.h \
welcomemodetreewidget.h \
+ iwelcomepage.h \
fancymainwindow.h \
detailsbutton.h \
detailswidget.h
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index df7b8ee56bb176fbccae4014e7ababba2cd2c270..39271a21675ef9e4a144e7a9f3ea5df234dc58da 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1347,6 +1347,8 @@ EditorManager::ReadOnlyAction
MakeWritableResult
EditorManager::makeEditorWritable(IEditor *editor)
{
+ if (!editor || !editor->file())
+ return Failed;
QString directory = QFileInfo(editor->file()->fileName()).absolutePath();
IVersionControl *versionControl = m_d->m_core->vcsManager()->findVersionControlForDirectory(directory);
IFile *file = editor->file();
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 5cb4e43ff1b6559bce93e0aecac11fb1a7b617d1..743d2f728e61733199e895fbc65b7a828647a862 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -68,7 +68,7 @@ using namespace Core;
using namespace Core::Internal;
-//================EditorView====================
+// ================EditorView====================
EditorView::EditorView(OpenEditorsModel *model, QWidget *parent) :
QWidget(parent),
diff --git a/src/plugins/cpaster/codepasterprotocol.cpp b/src/plugins/cpaster/codepasterprotocol.cpp
index 7661498717d9ed0e2ee4bef79c6c8480b99b0d5a..00eb1f7c11c5b351ead32ea1fa352a276ad959e6 100644
--- a/src/plugins/cpaster/codepasterprotocol.cpp
+++ b/src/plugins/cpaster/codepasterprotocol.cpp
@@ -67,9 +67,9 @@ bool CodePasterProtocol::isValidHostName(const QString& hostName)
if (hostName.isEmpty()) {
ICore::instance()->messageManager()->printToOutputPane(
#ifdef Q_OS_MAC
- tr("No Server defined in the CodePaster preferences!"),
+ tr("No Server defined in the CodePaster preferences."),
#else
- tr("No Server defined in the CodePaster options!"),
+ tr("No Server defined in the CodePaster options."),
#endif
true /*error*/);
ICore::instance()->messageManager()->showOutputPane();
diff --git a/src/plugins/cppeditor/cppfilewizard.cpp b/src/plugins/cppeditor/cppfilewizard.cpp
index 3f86ea88a5601870d95874a449db3d7225b18fc3..63140ef32ba6ec0a7a2d850e0408aca75f295201 100644
--- a/src/plugins/cppeditor/cppfilewizard.cpp
+++ b/src/plugins/cppeditor/cppfilewizard.cpp
@@ -81,9 +81,7 @@ QString CppFileWizard::fileContents(FileType type, const QString &fileName) cons
}
break;
case Source:
- str << QLatin1String("#include \"") << baseName
- << '.' << preferredSuffix(QLatin1String(Constants::CPP_HEADER_MIMETYPE))
- << QLatin1String("\"\n\n");
+ str << '\n';
break;
}
return contents;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 6fc2b41e0e82fe5c73bd5a81ffc1c667d0207509..9243f88ce6b4621e1677680d81ca19e961d08644 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -249,11 +249,11 @@ bool DebuggerListener::coreAboutToClose()
tr("A debugging session is still in progress. Would you like to terminate it?") :
tr("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 like to terminate it?")
+ " Would you still like to terminate it?")
.arg(QLatin1String(DebuggerManager::stateName(mgr->state())));
- QMessageBox::StandardButton answer = QMessageBox::question(0, title, question,
- QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
- if (answer == QMessageBox::No)
+ QMessageBox::StandardButton answer = QMessageBox::question(mgr->mainWindow(), title, question,
+ QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes);
+ if (answer != QMessageBox::Yes)
return false;
mgr->exitDebugger();
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index 440c29bbd8ec08f8c0d0a912ba8d09c3077f753f..4c0968233f2217269e3a4c28d2d0f5ac1bd64195 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -78,7 +78,16 @@ void AttachGdbAdapter::startInferior()
void AttachGdbAdapter::handleAttach(const GdbResponse &response)
{
if (response.resultClass == GdbResultDone) {
- QTC_ASSERT(state() == InferiorStopped, qDebug() << state());
+ // We don't know the exact 6.8.50 build where gdb started emitting
+ // *stopped here, so allow for some slack.
+ if (m_engine->m_gdbVersion < 60850) {
+ QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
+ setState(InferiorStopped);
+ } else if (m_engine->m_gdbVersion < 70000 && state() == InferiorStarting) {
+ setState(InferiorStopped);
+ } else {
+ QTC_ASSERT(state() == InferiorStopped, qDebug() << state());
+ }
debugMessage(_("INFERIOR ATTACHED"));
showStatusMessage(msgAttachedToStoppedInferior());
emit inferiorPrepared();
@@ -91,8 +100,8 @@ void AttachGdbAdapter::handleAttach(const GdbResponse &response)
void AttachGdbAdapter::interruptInferior()
{
- debugMessage(_("TRYING TO INTERUPT INFERIOR"));
const qint64 pid = startParameters().attachPID;
+ QTC_ASSERT(pid > 0, return);
if (!interruptProcess(pid))
debugMessage(_("CANNOT INTERRUPT %1").arg(pid));
}
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 9df41bc62776633dcd97033e56cefe61a6cac302..04230db5bb8abc942525dda3eda3f1f775b07c53 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -191,6 +191,9 @@ GdbEngine::GdbEngine(DebuggerManager *manager) :
m_trkOptions->fromSettings(Core::ICore::instance()->settings());
m_gdbAdapter = 0;
+ // Needs no resetting in initializeVariables()
+ m_busy = false;
+
connect(theDebuggerAction(AutoDerefPointers), SIGNAL(valueChanged(QVariant)),
this, SLOT(setAutoDerefPointers(QVariant)));
}
@@ -536,6 +539,11 @@ void GdbEngine::handleResponse(const QByteArray &buff)
if (resultClass == "done") {
response.resultClass = GdbResultDone;
} else if (resultClass == "running") {
+ if (state() == InferiorStopped) { // Result of manual command.
+ m_manager->resetLocation();
+ setTokenBarrier();
+ setState(InferiorRunningRequested);
+ }
setState(InferiorRunning);
showStatusMessage(tr("Running..."));
response.resultClass = GdbResultRunning;
@@ -594,6 +602,10 @@ void GdbEngine::readGdbStandardOutput()
m_inbuffer.append(m_gdbProc.readAllStandardOutput());
+ // This can trigger when a dialog starts a nested event loop
+ if (m_busy)
+ return;
+
while (newstart < m_inbuffer.size()) {
int start = newstart;
int end = m_inbuffer.indexOf('\n', scan);
@@ -612,7 +624,9 @@ void GdbEngine::readGdbStandardOutput()
continue;
}
#endif
+ m_busy = true;
handleResponse(QByteArray::fromRawData(m_inbuffer.constData() + start, end - start));
+ m_busy = false;
}
m_inbuffer.clear();
}
@@ -693,11 +707,11 @@ void GdbEngine::postCommandHelper(const GdbCommand &cmd)
if (cmd.flags & RebuildModel) {
++m_pendingRequests;
- PENDING_DEBUG(" COMMAND" << cmd.callbackName
- << "INCREMENTS PENDING TO:" << m_pendingRequests << cmd.command);
+ PENDING_DEBUG(" MODEL:" << cmd.command << "=>" << cmd.callbackName
+ << "INCREMENTS PENDING TO" << m_pendingRequests);
} else {
- PENDING_DEBUG(" UNKNOWN COMMAND" << cmd.callbackName
- << "LEAVES PENDING AT:" << m_pendingRequests << cmd.command);
+ PENDING_DEBUG(" OTHER (IN):" << cmd.command << "=>" << cmd.callbackName
+ << "LEAVES PENDING AT" << m_pendingRequests);
}
if ((cmd.flags & NeedsStop) || !m_commandsToRunOnTemporaryBreak.isEmpty()) {
@@ -817,15 +831,15 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
if (cmd.flags & RebuildModel) {
--m_pendingRequests;
- PENDING_DEBUG(" RESULT " << cmd.callbackName << " DECREMENTS PENDING TO: "
- << m_pendingRequests << cmd.command);
+ PENDING_DEBUG(" WATCH" << cmd.command << "=>" << cmd.callbackName
+ << "DECREMENTS PENDING TO" << m_pendingRequests);
if (m_pendingRequests <= 0) {
- PENDING_DEBUG("\n\n .... AND TRIGGERS MODEL UPDATE\n");
+ PENDING_DEBUG("\n\n ... AND TRIGGERS MODEL UPDATE\n");
rebuildModel();
}
} else {
- PENDING_DEBUG(" UNKNOWN RESULT " << cmd.callbackName << " LEAVES PENDING AT: "
- << m_pendingRequests << cmd.command);
+ PENDING_DEBUG(" OTHER (OUT):" << cmd.command << "=>" << cmd.callbackName
+ << "LEAVES PENDING AT" << m_pendingRequests);
}
// Continue only if there are no commands wire anymore, so this will
@@ -870,7 +884,6 @@ void GdbEngine::updateAll()
void GdbEngine::handleQuerySources(const GdbResponse &response)
{
- m_sourcesListUpdating = false;
if (response.resultClass == GdbResultDone) {
QMap<QString, QString> oldShortToFull = m_shortToFullName;
m_shortToFullName.clear();
@@ -879,17 +892,12 @@ void GdbEngine::handleQuerySources(const GdbResponse &response)
// fullname="/data5/dev/ide/main/bin/gdbmacros/gdbmacros.cpp"},
GdbMi files = response.data.findChild("files");
foreach (const GdbMi &item, files.children()) {
- QString fileName = QString::fromLocal8Bit(item.findChild("file").data());
GdbMi fullName = item.findChild("fullname");
if (fullName.isValid()) {
- QString full = QString::fromLocal8Bit(fullName.data());
- if (QFileInfo(full).isReadable()) {
- #ifdef Q_OS_WIN
- full = QDir::cleanPath(full);
- #endif
- m_shortToFullName[fileName] = full;
- m_fullToShortName[full] = fileName;
- }
+ QString full = cleanupFullName(QString::fromLocal8Bit(fullName.data()));
+ QString fileName = QString::fromLocal8Bit(item.findChild("file").data());
+ m_shortToFullName[fileName] = full;
+ m_fullToShortName[full] = fileName;
}
}
if (m_shortToFullName != oldShortToFull)
@@ -978,7 +986,7 @@ void GdbEngine::handleAqcuiredInferior()
#endif
// It's nicer to see a bit of the world we live in.
- reloadModules();
+ reloadModulesInternal();
attemptBreakpointSynchronization();
}
#endif
@@ -1142,6 +1150,8 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
} else {
handleStop1(data);
}
+ // Dumper loading is sequenced, as otherwise the display functions
+ // will start requesting data without knowing that dumpers are available.
}
void GdbEngine::handleStop1(const GdbResponse &response)
@@ -1152,16 +1162,13 @@ void GdbEngine::handleStop1(const GdbResponse &response)
void GdbEngine::handleStop1(const GdbMi &data)
{
if (m_modulesListOutdated)
- reloadModules(); // This is for display only
+ reloadModulesInternal(); // This is for display only
if (m_sourcesListOutdated)
- reloadSourceFiles(); // This needs to be done before fullName() may need it
+ reloadSourceFilesInternal(); // This needs to be done before fullName() may need it
+
QByteArray reason = data.findChild("reason").data();
if (reason == "breakpoint-hit") {
showStatusMessage(tr("Stopped at breakpoint."));
- //debugMessage(_("HIT BREAKPOINT: " + frame.toString()));
- postCommand(_("-break-list"), CB(handleBreakList));
- QVariant var = QVariant::fromValue<GdbMi>(data);
- postCommand(_("p 2"), CB(handleStop2), var); // dummy
} else {
if (reason == "signal-received"
&& theDebuggerBoolSetting(UseMessageBoxForSignals)) {
@@ -1187,17 +1194,8 @@ void GdbEngine::handleStop1(const GdbMi &data)
showStatusMessage(tr("Stopped."));
else
showStatusMessage(tr("Stopped: \"%1\"").arg(_(reason)));
- handleStop2(data);
}
-}
-void GdbEngine::handleStop2(const GdbResponse &response)
-{
- handleStop2(response.cookie.value<GdbMi>());
-}
-
-void GdbEngine::handleStop2(const GdbMi &data)
-{
const GdbMi gdbmiFrame = data.findChild("frame");
m_currentFrame = _(gdbmiFrame.findChild("addr").data() + '%' +
@@ -1312,23 +1310,26 @@ QString GdbEngine::fullName(const QString &fileName)
return QString();
QTC_ASSERT(!m_sourcesListOutdated, /* */)
QTC_ASSERT(!m_sourcesListUpdating, /* */)
- QString full = m_shortToFullName.value(fileName, QString());
- //debugMessage(_("RESOLVING: ") + fileName + " " + full);
- if (!full.isEmpty())
- return full;
- QFileInfo fi(fileName);
- if (!fi.isReadable())
- return QString();
- full = fi.absoluteFilePath();
- #ifdef Q_OS_WIN
- full = QDir::cleanPath(full);
- #endif
- //debugMessage(_("STORING: ") + fileName + " " + full);
- m_shortToFullName[fileName] = full;
- m_fullToShortName[full] = fileName;
- return full;
+ return m_shortToFullName.value(fileName, QString());
}
+#ifdef Q_OS_WIN
+QString GdbEngine::cleanupFullName(const QString &fileName)
+{
+ QTC_ASSERT(!fileName.isEmpty(), return QString())
+ if (m_gdbVersion < 60800) {
+ // The symbian gdb 6.4 seems to deliver "fullnames" which
+ // a) have no drive letter and b) are not normalized.
+ QFileInfo fi(fileName);
+ if (!fi.isReadable())
+ return QString();
+ return QDir::cleanPath(fi.absoluteFilePath());
+ } else {
+ return fileName;
+ }
+}
+#endif
+
void GdbEngine::shutdown()
{
debugMessage(_("INITIATE GDBENGINE SHUTDOWN"));
@@ -1373,7 +1374,7 @@ void GdbEngine::shutdown()
// fall-through
case InferiorStopFailed: // Tough luck, I guess. But unreachable as of now anyway.
setState(EngineShuttingDown);
- m_gdbProc.terminate();
+ m_gdbProc.kill();
break;
}
}
@@ -1401,7 +1402,7 @@ void GdbEngine::handleGdbExit(const GdbResponse &response)
} else {
QString msg = m_gdbAdapter->msgGdbStopFailed(_(response.data.findChild("msg").data()));
debugMessage(_("GDB WON'T EXIT (%1); KILLING IT").arg(msg));
- m_gdbProc.terminate();
+ m_gdbProc.kill();
}
}
@@ -1729,10 +1730,7 @@ void GdbEngine::breakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt
QString name;
if (!fullName.isEmpty()) {
- name = QFile::decodeName(fullName);
- #ifdef Q_OS_WIN
- name = QDir::cleanPath(name);
- #endif
+ name = cleanupFullName(QFile::decodeName(fullName));
if (data->markerFileName.isEmpty())
data->markerFileName = name;
} else {
@@ -1778,12 +1776,13 @@ void GdbEngine::sendInsertBreakpoint(int index)
//if (!data->condition.isEmpty())
// cmd += _("-c ") + data->condition + _c(' ');
cmd += where;
- gdbOutputAvailable(LogStatus, _("Current state: %1").arg(state()));
postCommand(cmd, NeedsStop, CB(handleBreakInsert), index);
}
void GdbEngine::handleBreakList(const GdbResponse &response)
{
+ m_sourcesListUpdating = false;
+
// 45^done,BreakpointTable={nr_rows="2",nr_cols="6",hdr=[
// {width="3",alignment="-1",col_name="number",colhdr="Num"}, ...
// body=[bkpt={number="1",type="breakpoint",disp="keep",enabled="y",
@@ -1831,7 +1830,6 @@ void GdbEngine::handleBreakList(const GdbMi &table)
}
attemptBreakpointSynchronization();
- handler->updateMarkers();
}
void GdbEngine::handleBreakIgnore(const GdbResponse &response)
@@ -1897,7 +1895,6 @@ void GdbEngine::handleBreakInsert(const GdbResponse &response)
breakpointDataFromOutput(data, bkpt);
//#endif
attemptBreakpointSynchronization();
- handler->updateMarkers();
} else {
if (m_gdbVersion < 60800 && !m_isMacGdb) {
// This gdb version doesn't "do" pending breakpoints.
@@ -1938,7 +1935,11 @@ void GdbEngine::extractDataFromInfoBreak(const QString &output, BreakpointData *
QString full = fullName(re.cap(3));
if (full.isEmpty()) {
qDebug() << "NO FULL NAME KNOWN FOR" << re.cap(3);
- full = re.cap(3); // FIXME: wrong, but prevents recursion
+ full = cleanupFullName(re.cap(3));
+ if (full.isEmpty()) {
+ qDebug() << "FILE IS NOT RESOLVABLE" << re.cap(3);
+ full = re.cap(3); // FIXME: wrong, but prevents recursion
+ }
}
data->markerLineNumber = data->bpLineNumber.toInt();
data->markerFileName = full;
@@ -1960,7 +1961,6 @@ void GdbEngine::handleBreakInfo(const GdbResponse &response)
if (found != -1) {
QString str = QString::fromLocal8Bit(response.data.findChild("consolestreamoutput").data());
extractDataFromInfoBreak(str, handler->at(found));
- handler->updateMarkers();
attemptBreakpointSynchronization(); // trigger "ready"
}
}
@@ -1981,12 +1981,6 @@ void GdbEngine::handleBreakInsert1(const GdbResponse &response)
data->bpNumber = _("<unavailable>");
}
attemptBreakpointSynchronization(); // trigger "ready"
- handler->updateMarkers();
-}
-
-void GdbEngine::attemptBreakpointSynchronization2(const GdbResponse &)
-{
- attemptBreakpointSynchronization();
}
void GdbEngine::attemptBreakpointSynchronization()
@@ -2004,9 +1998,11 @@ void GdbEngine::attemptBreakpointSynchronization()
}
// For best results, we rely on an up-to-date fullname mapping.
+ // The listing completion will retrigger us, so no futher action is needed.
if (m_sourcesListOutdated) {
- reloadSourceFiles();
- postCommand(_("p 5"), CB(attemptBreakpointSynchronization2));
+ reloadSourceFilesInternal();
+ return;
+ } else if (m_sourcesListUpdating) {
return;
}
@@ -2062,6 +2058,8 @@ void GdbEngine::attemptBreakpointSynchronization()
}
}
}
+
+ handler->updateMarkers();
}
@@ -2075,13 +2073,13 @@ void GdbEngine::loadSymbols(const QString &moduleName)
{
// FIXME: gdb does not understand quoted names here (tested with 6.8)
postCommand(_("sharedlibrary ") + dotEscape(moduleName));
- reloadModules();
+ reloadModulesInternal();
}
void GdbEngine::loadAllSymbols()
{
postCommand(_("sharedlibrary .*"));
- reloadModules();
+ reloadModulesInternal();
}
QList<Symbol> GdbEngine::moduleSymbols(const QString &moduleName)
@@ -2119,9 +2117,15 @@ QList<Symbol> GdbEngine::moduleSymbols(const QString &moduleName)
}
void GdbEngine::reloadModules()
+{
+ if (state() == InferiorRunning || state() == InferiorStopped)
+ reloadModulesInternal();
+}
+
+void GdbEngine::reloadModulesInternal()
{
m_modulesListOutdated = false;
- postCommand(_("info shared"), CB(handleModulesList));
+ postCommand(_("info shared"), NeedsStop, CB(handleModulesList));
}
void GdbEngine::handleModulesList(const GdbResponse &response)
@@ -2178,10 +2182,18 @@ void GdbEngine::handleModulesList(const GdbResponse &response)
//////////////////////////////////////////////////////////////////////
void GdbEngine::reloadSourceFiles()
+{
+ if ((state() == InferiorRunning || state() == InferiorStopped)
+ && !m_sourcesListUpdating)
+ reloadSourceFilesInternal();
+}
+
+void GdbEngine::reloadSourceFilesInternal()
{
m_sourcesListUpdating = true;
m_sourcesListOutdated = false;
postCommand(_("-file-list-exec-source-files"), NeedsStop, CB(handleQuerySources));
+ postCommand(_("-break-list"), CB(handleBreakList));
}
@@ -2245,7 +2257,7 @@ StackFrame GdbEngine::parseStackFrame(const GdbMi &frameMi, int level)
frame.level = level;
// We might want to fall back to "file" once we have a mapping which
// is more complete than gdb's own ...
- frame.file = QFile::decodeName(frameMi.findChild("fullname").data());
+ frame.file = cleanupFullName(QFile::decodeName(frameMi.findChild("fullname").data()));
frame.function = _(frameMi.findChild("func").data());
frame.from = _(frameMi.findChild("from").data());
frame.line = frameMi.findChild("line").data().toInt();
@@ -2770,15 +2782,13 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
<<',' << addr << ',' << (dumpChildren ? "1" : "0")
<< ',' << extraArgs.join(QString(_c(','))) << ')';
- QVariant var;
- var.setValue(data);
- postCommand(cmd, WatchUpdate | EmbedToken, CB(handleDebuggingHelperValue1), var);
+ postCommand(cmd, WatchUpdate | EmbedToken);
showStatusMessage(msgRetrievingWatchData(m_pendingRequests + 1), 10000);
// retrieve response
postCommand(_("p (char*)&qDumpOutBuffer"), WatchUpdate,
- CB(handleDebuggingHelperValue2), var);
+ CB(handleDebuggingHelperValue2), qVariantFromValue(data));
}
void GdbEngine::createGdbVariable(const WatchData &data)
@@ -2854,6 +2864,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
data1.exp = QLatin1String("(*(") + data.exp + QLatin1String("))");
data1.type = stripPointerType(data.type);
data1.setValueNeeded();
+ data1.setChildrenUnneeded();
insertData(data1);
}
return;
@@ -3205,27 +3216,6 @@ void GdbEngine::handleDebuggingHelperSetup(const GdbResponse &response)
}
}
-void GdbEngine::handleDebuggingHelperValue1(const GdbResponse &response)
-{
- WatchData data = response.cookie.value<WatchData>();
- QTC_ASSERT(data.isValid(), return);
- if (response.resultClass == GdbResultDone) {
- // ignore this case, data will follow
- } else {
- QString msg = QString::fromLocal8Bit(response.data.findChild("msg").data());
-#ifdef QT_DEBUG
- // Make debugging of dumpers easier
- if (theDebuggerBoolSetting(DebugDebuggingHelpers)
- && msg.startsWith(__("The program being debugged stopped while"))
- && msg.contains(__("qDumpObjectData440"))) {
- // Fake full stop
- postCommand(_("p 3"), CB(handleStop2)); // dummy
- return;
- }
-#endif
- }
-}
-
void GdbEngine::handleDebuggingHelperValue2(const GdbResponse &response)
{
WatchData data = response.cookie.value<WatchData>();
@@ -3394,10 +3384,11 @@ void GdbEngine::updateLocals(const QVariant &cookie)
{
m_pendingRequests = 0;
if (isSynchroneous()) {
+ m_processedNames.clear();
manager()->watchHandler()->beginCycle();
m_toolTipExpression.clear();
QStringList expanded = m_manager->watchHandler()->expandedINames().toList();
- postCommand(_("bb %1 %2")
+ postCommand(_("-interpreter-exec console \"bb %1 %2\"")
.arg(int(theDebuggerBoolSetting(UseDebuggingHelpers)))
.arg(expanded.join(_(","))),
CB(handleStackFrame));
@@ -3514,7 +3505,7 @@ void GdbEngine::handleStackListLocals(const GdbResponse &response)
QMap<QByteArray, int> seen;
// If desired, retrieve list of uninitialized variables looking at
// the current frame. This is invoked first time after a stop from
- // handleStop2, which passes on the frame as cookie. The whole stack
+ // handleStop1, which passes on the frame as cookie. The whole stack
// is not known at this point.
QStringList uninitializedVariables;
if (theDebuggerAction(UseCodeModel)->isChecked()) {
@@ -4157,7 +4148,7 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
m_gdbProc.start(location, gdbArgs);
if (!m_gdbProc.waitForStarted()) {
- const QString msg = tr("Unable to start gdb '%1': %2").arg(gdb, m_gdbProc.errorString());
+ const QString msg = tr("Unable to start gdb '%1': %2").arg(location, m_gdbProc.errorString());
handleAdapterStartFailed(msg, settingsIdHint);
return false;
}
@@ -4175,7 +4166,8 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
debugMessage(_("GDB STARTED, INITIALIZING IT"));
postCommand(_("show version"), CB(handleShowVersion));
- postCommand(_("help bb"), CB(handleIsSynchroneous));
+ postCommand(_("-interpreter-exec console \"help bb\""),
+ CB(handleIsSynchroneous));
//postCommand(_("-enable-timings");
postCommand(_("set print static-members off")); // Seemingly doesn't work.
//postCommand(_("set debug infrun 1"));
@@ -4269,7 +4261,7 @@ void GdbEngine::handleGdbError(QProcess::ProcessError error)
case QProcess::WriteError:
case QProcess::Timedout:
default:
- m_gdbProc.terminate();
+ m_gdbProc.kill();
setState(EngineShuttingDown, true);
showMessageBox(QMessageBox::Critical, tr("Gdb I/O Error"),
errorMessage(error));
@@ -4342,6 +4334,8 @@ void GdbEngine::startInferiorPhase2()
void GdbEngine::handleInferiorStartFailed(const QString &msg)
{
+ if (state() == AdapterStartFailed)
+ return; // Adapter crashed meanwhile, so this notification is meaningless.
debugMessage(_("INFERIOR START FAILED"));
showMessageBox(QMessageBox::Critical, tr("Inferior start failed"), msg);
setState(InferiorStartFailed);
@@ -4360,7 +4354,7 @@ void GdbEngine::handleAdapterCrashed(const QString &msg)
setState(AdapterStartFailed, true);
// No point in being friendly here ...
- m_gdbProc.terminate();
+ m_gdbProc.kill();
if (!msg.isEmpty())
showMessageBox(QMessageBox::Critical, tr("Adapter crashed"), msg);
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 9e23fee2b2ec67c93274d4a6b70aceab4a4ccc0f..c9e20eae299685f307bce861e251cec626db3cc7 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -160,6 +160,7 @@ private:
QTextCodec::ConverterState m_outputCodecState;
QByteArray m_inbuffer;
+ bool m_busy;
QProcess m_gdbProc;
AbstractGdbAdapter *m_gdbAdapter;
@@ -251,8 +252,6 @@ private: ////////// Gdb Output, State & Capability Handling //////////
void handleResultRecord(GdbResponse *response);
void handleStop1(const GdbResponse &response);
void handleStop1(const GdbMi &data);
- void handleStop2(const GdbResponse &response);
- void handleStop2(const GdbMi &data);
StackFrame parseStackFrame(const GdbMi &mi, int level);
virtual bool isSynchroneous() const;
@@ -271,7 +270,6 @@ private: ////////// Inferior Management //////////
// This should be always the last call in a function.
Q_SLOT virtual void attemptBreakpointSynchronization();
- void attemptBreakpointSynchronization2(const GdbResponse &);
virtual void stepExec();
virtual void stepOutExec();
@@ -323,7 +321,8 @@ private: ////////// View & Data Stuff //////////
virtual void loadSymbols(const QString &moduleName);
virtual void loadAllSymbols();
virtual QList<Symbol> moduleSymbols(const QString &moduleName);
- void reloadModules();
+ virtual void reloadModules();
+ void reloadModulesInternal();
void handleModulesList(const GdbResponse &response);
bool m_modulesListOutdated;
@@ -331,8 +330,8 @@ private: ////////// View & Data Stuff //////////
//
// Register specific stuff
//
- Q_SLOT void reloadRegisters();
- void setRegisterValue(int nr, const QString &value);
+ Q_SLOT virtual void reloadRegisters();
+ virtual void setRegisterValue(int nr, const QString &value);
void handleRegisterListNames(const GdbResponse &response);
void handleRegisterListValues(const GdbResponse &response);
@@ -351,10 +350,16 @@ private: ////////// View & Data Stuff //////////
//
// Source file specific stuff
//
- void reloadSourceFiles();
+ virtual void reloadSourceFiles();
+ void reloadSourceFilesInternal();
void handleQuerySources(const GdbResponse &response);
QString fullName(const QString &fileName);
+#ifdef Q_OS_WIN
+ QString cleanupFullName(const QString &fileName);
+#else
+ QString cleanupFullName(const QString &fileName) { return fileName; }
+#endif
// awful hack to keep track of used files
QMap<QString, QString> m_shortToFullName;
@@ -372,7 +377,7 @@ private: ////////// View & Data Stuff //////////
void handleStackListThreads(const GdbResponse &response);
void handleStackFrame(const GdbResponse &response);
Q_SLOT void reloadStack(bool forceGotoLocation);
- Q_SLOT void reloadFullStack();
+ Q_SLOT virtual void reloadFullStack();
int currentFrame() const;
QList<GdbMi> m_currentFunctionArgs;
@@ -396,7 +401,7 @@ private: ////////// View & Data Stuff //////////
void handleChildren(const WatchData &parent, const GdbMi &child,
QList<WatchData> *insertions);
- void updateWatchData(const WatchData &data);
+ void virtual updateWatchData(const WatchData &data);
Q_SLOT void updateWatchDataHelper(const WatchData &data);
void rebuildModel();
bool showToolTip();
@@ -417,7 +422,6 @@ private: ////////// View & Data Stuff //////////
void handleEvaluateExpression(const GdbResponse &response);
//void handleToolTip(const GdbResponse &response);
void handleQueryDebuggingHelper(const GdbResponse &response);
- void handleDebuggingHelperValue1(const GdbResponse &response);
void handleDebuggingHelperValue2(const GdbResponse &response);
void handleDebuggingHelperValue3(const GdbResponse &response);
void handleDebuggingHelperEditValue(const GdbResponse &response);
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index 9eb4da18b775e8d72af220eacced7fcce069925b..342b89ce3a5cfb40fa6fd7ba8e1264a9c889d2cd 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -132,7 +132,6 @@ void PlainGdbAdapter::handleExecRun(const GdbResponse &response)
void PlainGdbAdapter::interruptInferior()
{
- debugMessage(_("TRYING TO INTERUPT INFERIOR"));
const qint64 attachedPID = m_engine->inferiorPid();
if (attachedPID <= 0) {
debugMessage(_("TRYING TO INTERRUPT INFERIOR BEFORE PID WAS OBTAINED"));
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index 5c6d070eddc586ac6ea13c2054858bed78af53cd..fbdc6a6dd84c3ab8d885f46d636efa893e052deb 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -131,8 +131,8 @@ void TermGdbAdapter::startInferiorPhase2()
void TermGdbAdapter::interruptInferior()
{
- debugMessage(_("TRYING TO INTERUPT INFERIOR"));
const qint64 attachedPID = m_engine->inferiorPid();
+ QTC_ASSERT(attachedPID > 0, return);
if (!interruptProcess(attachedPID))
debugMessage(_("CANNOT INTERRUPT %1").arg(attachedPID));
}
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index bf23a09eab59024e29b17094bca9a6fcdafbc692..82ce54376bd0bd6b5a97186a106b01db24d60539 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -757,17 +757,21 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
// http://sourceware.org/ml/gdb/2007-05/msg00038.html
// Name=hexname,TextSeg=textaddr[,DataSeg=dataaddr]
sendGdbServerAck();
- QByteArray response = "m";
- // FIXME: Limit packet length by using qsDllInfo packages?
- for (int i = 0; i != m_session.libraries.size(); ++i) {
- if (i)
- response += ';';
- const Library &lib = m_session.libraries.at(i);
- response += "Name=" + lib.name.toHex()
- + ",TextSeg=" + hexNumber(lib.codeseg)
- + ",DataSeg=" + hexNumber(lib.dataseg);
+ if (!m_session.libraries.isEmpty()) {
+ QByteArray response = "m";
+ // FIXME: Limit packet length by using qsDllInfo packages?
+ for (int i = 0; i != m_session.libraries.size(); ++i) {
+ if (i)
+ response += ';';
+ const Library &lib = m_session.libraries.at(i);
+ response += "Name=" + lib.name.toHex()
+ + ",TextSeg=" + hexNumber(lib.codeseg)
+ + ",DataSeg=" + hexNumber(lib.dataseg);
+ }
+ sendGdbServerMessage(response, "library information transfered");
+ } else {
+ sendGdbServerMessage("l", "library information transfer finished");
}
- sendGdbServerMessage(response, "library information transfered");
}
else if (cmd == "qsDllInfo") {
@@ -1109,7 +1113,7 @@ void TrkGdbAdapter::handleCpuType(const TrkResult &result)
void TrkGdbAdapter::handleDeleteProcess(const TrkResult &result)
{
Q_UNUSED(result);
- logMessage("TRK Process killed");
+ logMessage("Inferior process killed");
//sendTrkMessage(0x01, TrkCB(handleDeleteProcess2)); // Ping
sendTrkMessage(0x02, TrkCB(handleDeleteProcess2)); // Disconnect
}
@@ -1117,7 +1121,7 @@ void TrkGdbAdapter::handleDeleteProcess(const TrkResult &result)
void TrkGdbAdapter::handleDeleteProcess2(const TrkResult &result)
{
Q_UNUSED(result);
- logMessage("process killed");
+ logMessage("App TRK disconnected");
sendGdbServerAck();
sendGdbServerMessage("", "process killed");
}
@@ -1452,9 +1456,9 @@ void TrkGdbAdapter::handleTrkVersionsStartGdb(const TrkResult &result)
QTextStream str(&logMsg);
str << "Versions: ";
if (result.data.size() >= 5) {
- str << "Trk version " << int(result.data.at(1)) << '.'
+ str << "App TRK version " << int(result.data.at(1)) << '.'
<< int(result.data.at(2))
- << ", Protocol version " << int(result.data.at(3))
+ << ", TRK protocol version " << int(result.data.at(3))
<< '.' << int(result.data.at(4));
}
logMessage(logMsg);
@@ -1469,7 +1473,7 @@ void TrkGdbAdapter::handleTrkVersionsStartGdb(const TrkResult &result)
void TrkGdbAdapter::handleDisconnect(const TrkResult & /*result*/)
{
- logMessage(QLatin1String("Trk disconnected"));
+ logMessage(QLatin1String("App TRK disconnected"));
}
void TrkGdbAdapter::readMemory(uint addr, uint len, bool buffered)
@@ -1614,7 +1618,7 @@ void TrkGdbAdapter::handleTargetRemote(const GdbResponse &record)
if (record.resultClass == GdbResultDone) {
emit inferiorPrepared();
} else {
- QString msg = tr("Connecting to trk server adapter failed:\n")
+ QString msg = tr("Connecting to TRK server adapter failed:\n")
+ _(record.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}
diff --git a/src/plugins/debugger/gdb/trkoptionspage.cpp b/src/plugins/debugger/gdb/trkoptionspage.cpp
index 98b103b8d787f7fb6c17bf918e4a42c974650f44..1a7c8a91c9671d928cb5bf200f8e895a7d730f6e 100644
--- a/src/plugins/debugger/gdb/trkoptionspage.cpp
+++ b/src/plugins/debugger/gdb/trkoptionspage.cpp
@@ -40,7 +40,7 @@
namespace Debugger {
namespace Internal {
-const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "Symbian Trk");
+const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "Symbian TRK");
TrkOptionsPage::TrkOptionsPage(const TrkOptionsPtr &options) :
m_options(options)
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index ba7c24ff04f55a8af86aae740acd668dd081a1a1..4819753fd37a1f9b549543ac660eb05637c19c13 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -31,6 +31,7 @@
#include "watchutils.h"
#include "debuggeractions.h"
#include "debuggermanager.h"
+#include "idebuggerengine.h"
#if USE_MODEL_TEST
#include "modeltest.h"
@@ -1125,7 +1126,18 @@ void WatchHandler::insertData(const WatchData &data)
}
if (data.isSomethingNeeded() && data.iname.contains('.')) {
MODEL_DEBUG("SOMETHING NEEDED: " << data.toString());
- m_manager->updateWatchData(data);
+ if (!m_manager->currentEngine()->isSynchroneous()) {
+ m_manager->updateWatchData(data);
+ } else {
+ qDebug() << "ENDLESS LOOP: SOMETHING NEEDED: " << data.toString();
+ WatchData data1 = data;
+ data1.setAllUnneeded();
+ data1.setValue(QLatin1String("<unavailable synchroneous data>"));
+ data1.setHasChildren(false);
+ WatchModel *model = modelForIName(data.iname);
+ QTC_ASSERT(model, return);
+ model->insertData(data1);
+ }
} else {
WatchModel *model = modelForIName(data.iname);
QTC_ASSERT(model, return);
diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp
index 95327a29b24e4da571109ac42befb0984179776b..03a51a94a9d07e340bac44b77fc17d5df5ac6420 100644
--- a/src/plugins/find/findplugin.cpp
+++ b/src/plugins/find/findplugin.cpp
@@ -191,7 +191,7 @@ void FindPlugin::setupFilterMenuItems()
haveEnabledFilters = true;
action->setEnabled(isEnabled);
action->setData(qVariantFromValue(filter));
- cmd = am->registerAction(action, QLatin1String("FindFilter.")+filter->name(), globalcontext);
+ cmd = am->registerAction(action, QLatin1String("FindFilter.")+filter->id(), globalcontext);
cmd->setDefaultKeySequence(filter->defaultShortcut());
mfind->addAction(cmd, Constants::G_FIND_FILTERS);
m_filterActions.insert(filter, action);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index a5aed6fe1fb21c4b9c3ab8bdbb3f52169ad9a3a0..6a57c583e079b8242064103a6e7726f511fa91dc 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -449,7 +449,7 @@ QHelpEngine* HelpPlugin::helpEngine() const
void HelpPlugin::createRightPaneSideBar()
{
- QAction *switchToHelpMode = new QAction("Go to Help Mode", this);
+ QAction *switchToHelpMode = new QAction(tr("Go to Help Mode"), this);
m_rightPaneBackwardAction =
new QAction(QIcon(QLatin1String(":/help/images/previous.png")),
tr("Previous"), this);
diff --git a/src/plugins/projectexplorer/applicationlauncher_x11.cpp b/src/plugins/projectexplorer/applicationlauncher_x11.cpp
index f4a0bb018a4da0910ac8ecca9ec834426b988ad8..d5e18092225c506eab5bc07b2806d9e9dba10fcd 100644
--- a/src/plugins/projectexplorer/applicationlauncher_x11.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_x11.cpp
@@ -87,7 +87,10 @@ void ApplicationLauncher::stop()
{
if (m_currentMode == Gui) {
m_guiProcess->terminate();
- m_guiProcess->waitForFinished();
+ if (!m_guiProcess->waitForFinished(1000)) { // This is blocking, so be fast.
+ m_guiProcess->kill();
+ m_guiProcess->waitForFinished();
+ }
} else {
m_consoleProcess->stop();
}
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 3b67ab18856b4df52fc57fe6c3a724132e090d4b..e319388f8bfb795fcc43323093b6420725a7e633 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -35,6 +35,7 @@
#include <coreplugin/coreconstants.h>
#include <extensionsystem/pluginmanager.h>
+#include <utils/qtcassert.h>
#include <QtCore/QDebug>
#include <QtCore/QPair>
@@ -151,23 +152,30 @@ BuildSettingsWidget::BuildSettingsWidget(Project *project)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setContentsMargins(0, -1, 0, -1);
- QHBoxLayout *hbox = new QHBoxLayout();
- hbox->addWidget(new QLabel(tr("Edit Build Configuration:"), this));
- m_buildConfigurationComboBox = new QComboBox(this);
- m_buildConfigurationComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
- hbox->addWidget(m_buildConfigurationComboBox);
-
- m_addButton = new QPushButton(this);
- m_addButton->setText(tr("Add"));
- m_addButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- hbox->addWidget(m_addButton);
-
- m_removeButton = new QPushButton(this);
- m_removeButton->setText(tr("Remove"));
- m_removeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- hbox->addWidget(m_removeButton);
- hbox->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed));
- vbox->addLayout(hbox);
+
+ { // Edit Build Configuration row
+ QHBoxLayout *hbox = new QHBoxLayout();
+ hbox->addWidget(new QLabel(tr("Edit Build Configuration:"), this));
+ m_buildConfigurationComboBox = new QComboBox(this);
+ m_buildConfigurationComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+ hbox->addWidget(m_buildConfigurationComboBox);
+
+ m_addButton = new QPushButton(this);
+ m_addButton->setText(tr("Add"));
+ m_addButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ hbox->addWidget(m_addButton);
+
+ m_removeButton = new QPushButton(this);
+ m_removeButton->setText(tr("Remove"));
+ m_removeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ hbox->addWidget(m_removeButton);
+ hbox->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed));
+ vbox->addLayout(hbox);
+ }
+
+ m_makeActiveLabel = new QLabel(this);
+ m_makeActiveLabel->setVisible(false);
+ vbox->addWidget(m_makeActiveLabel);
m_subWidgets = new BuildSettingsSubWidgets(this);
vbox->addWidget(m_subWidgets);
@@ -178,6 +186,9 @@ BuildSettingsWidget::BuildSettingsWidget(Project *project)
m_buildConfiguration = m_project->activeBuildConfiguration()->name();
+ connect(m_makeActiveLabel, SIGNAL(linkActivated(QString)),
+ this, SLOT(makeActive()));
+
connect(m_buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(currentIndexChanged(int)));
@@ -186,12 +197,21 @@ BuildSettingsWidget::BuildSettingsWidget(Project *project)
connect(m_project, SIGNAL(buildConfigurationDisplayNameChanged(const QString &)),
this, SLOT(buildConfigurationDisplayNameChanged(const QString &)));
+
+ connect(m_project, SIGNAL(activeBuildConfigurationChanged()),
+ this, SLOT(checkMakeActiveLabel()));
+
if (m_project->buildConfigurationFactory())
connect(m_project->buildConfigurationFactory(), SIGNAL(availableCreationTypesChanged()), SLOT(updateAddButtonMenu()));
updateBuildSettings();
}
+void BuildSettingsWidget::makeActive()
+{
+ m_project->setActiveBuildConfiguration(m_project->buildConfiguration(m_buildConfiguration));
+}
+
void BuildSettingsWidget::updateAddButtonMenu()
{
m_addButtonMenu->clear();
@@ -273,6 +293,18 @@ void BuildSettingsWidget::activeBuildConfigurationChanged()
buildStepWidget->init(m_buildConfiguration);
}
}
+ checkMakeActiveLabel();
+}
+
+void BuildSettingsWidget::checkMakeActiveLabel()
+{
+ m_makeActiveLabel->setVisible(false);
+ if (!m_project->activeBuildConfiguration() || m_project->activeBuildConfiguration()->name() != m_buildConfiguration) {
+ BuildConfiguration *bc = m_project->buildConfiguration(m_buildConfiguration);
+ QTC_ASSERT(bc, return);
+ m_makeActiveLabel->setText(tr("<a href=\"#\">Make %1 active.</a>").arg(bc->displayName()));
+ m_makeActiveLabel->setVisible(true);
+ }
}
void BuildSettingsWidget::createConfiguration()
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h
index f80b6b73265db283dd2eb4da507769e8914d7674..583835ecfc8b7e71eb5e5c5f346e5a78561be545 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h
@@ -101,6 +101,8 @@ private slots:
void cloneConfiguration();
void deleteConfiguration();
void updateAddButtonMenu();
+ void checkMakeActiveLabel();
+ void makeActive();
private:
void cloneConfiguration(const QString &toClone);
@@ -113,6 +115,7 @@ private:
BuildSettingsSubWidgets *m_subWidgets;
QString m_buildConfiguration;
QMenu *m_addButtonMenu;
+ QLabel *m_makeActiveLabel;
};
} // namespace Internal
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 2740b17e49880ab6c34969ed2b6407d991f0fc0e..cd286ae78c08d0720e75b94e561a1a72de38555f 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -144,6 +144,7 @@ public:
static QString makeUnique(const QString &preferedName, const QStringList &usedNames);
signals:
void fileListChanged();
+ void buildDirectoryChanged();
// TODO clean up signal names
// might be better to also have
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 887a77e764bc97eca771275011a3e036e895d120..b29a76a7d3e1ae7b7e9ad560e3cadc1b1f4cbecd 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -98,6 +98,7 @@
#include <QtGui/QFileDialog>
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
+#include <QtGui/QVBoxLayout>
Q_DECLARE_METATYPE(QSharedPointer<ProjectExplorer::RunConfiguration>);
Q_DECLARE_METATYPE(Core::IEditorFactory*);
@@ -1546,6 +1547,10 @@ void ProjectExplorerPlugin::runProjectImpl(Project *pro)
return;
if (d->m_projectExplorerSettings.buildBeforeRun && pro->hasBuildSettings()) {
+ if (!pro->activeRunConfiguration()->isEnabled()) {
+ if (!showBuildConfigDialog())
+ return;
+ }
if (saveModifiedFiles()) {
d->m_runMode = ProjectExplorer::Constants::RUNMODE;
d->m_delayedRunConfiguration = pro->activeRunConfiguration();
@@ -1565,6 +1570,10 @@ void ProjectExplorerPlugin::debugProject()
return;
if (d->m_projectExplorerSettings.buildBeforeRun && pro->hasBuildSettings()) {
+ if (!pro->activeRunConfiguration()->isEnabled()) {
+ if (!showBuildConfigDialog())
+ return;
+ }
if (saveModifiedFiles()) {
d->m_runMode = ProjectExplorer::Constants::DEBUGMODE;
d->m_delayedRunConfiguration = pro->activeRunConfiguration();
@@ -1579,6 +1588,31 @@ void ProjectExplorerPlugin::debugProject()
}
}
+bool ProjectExplorerPlugin::showBuildConfigDialog()
+{
+ Project *pro = startupProject();
+ BuildConfigDialog *dialog = new BuildConfigDialog(pro,
+ Core::ICore::instance()->mainWindow());
+ dialog->exec();
+ BuildConfiguration *otherConfig = dialog->selectedBuildConfiguration();
+ int result = dialog->result();
+ dialog->deleteLater();
+ switch (result) {
+ case BuildConfigDialog::ChangeBuild:
+ if (otherConfig) {
+ pro->setActiveBuildConfiguration(otherConfig);
+ return true;
+ }
+ return false;
+ case BuildConfigDialog::Cancel:
+ return false;
+ case BuildConfigDialog::Continue:
+ return true;
+ default:
+ return false;
+ }
+}
+
void ProjectExplorerPlugin::addToApplicationOutputWindow(RunControl *rc, const QString &line)
{
d->m_outputPane->appendOutput(rc, line);
@@ -2100,4 +2134,79 @@ Internal::ProjectExplorerSettings ProjectExplorerPlugin::projectExplorerSettings
return d->m_projectExplorerSettings;
}
+// ---------- BuildConfigDialog -----------
+Q_DECLARE_METATYPE(BuildConfiguration*);
+
+BuildConfigDialog::BuildConfigDialog(Project *project, QWidget *parent)
+ : QDialog(parent),
+ m_project(project)
+{
+ QVBoxLayout *vlayout = new QVBoxLayout;
+ setLayout(vlayout);
+ QDialogButtonBox *buttonBox = new QDialogButtonBox;
+ m_changeBuildConfiguration = buttonBox->addButton(tr("Change build configuration && continue"),
+ QDialogButtonBox::ActionRole);
+ m_cancel = buttonBox->addButton(tr("Cancel"),
+ QDialogButtonBox::RejectRole);
+ m_justContinue = buttonBox->addButton(tr("Continue anyway"),
+ QDialogButtonBox::AcceptRole);
+ connect(m_changeBuildConfiguration, SIGNAL(clicked()), this, SLOT(buttonClicked()));
+ connect(m_cancel, SIGNAL(clicked()), this, SLOT(buttonClicked()));
+ connect(m_justContinue, SIGNAL(clicked()), this, SLOT(buttonClicked()));
+ setWindowTitle(tr("Run configuration doesn't match build configuration"));
+ QLabel *shortText = new QLabel(tr(
+ "The active build configuration builds a target "
+ "that cannot be used by the active run configuration."
+ ));
+ vlayout->addWidget(shortText);
+ QLabel *descriptiveText = new QLabel(tr(
+ "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)."
+ ));
+ descriptiveText->setWordWrap(true);
+ vlayout->addWidget(descriptiveText);
+ QHBoxLayout *hlayout = new QHBoxLayout;
+ hlayout->addWidget(new QLabel(tr("Choose build configuration:")));
+ m_configCombo = new QComboBox;
+ QSharedPointer<RunConfiguration> activeRun = m_project->activeRunConfiguration();
+ foreach (BuildConfiguration *config, m_project->buildConfigurations()) {
+ if (activeRun->isEnabled(config)) {
+ m_configCombo->addItem(config->name(), qVariantFromValue(config));
+ }
+ }
+ if (m_configCombo->count() == 0) {
+ m_configCombo->addItem(tr("No valid build configuration found."));
+ m_configCombo->setEnabled(false);
+ m_changeBuildConfiguration->setEnabled(false);
+ }
+
+
+ hlayout->addWidget(m_configCombo);
+ hlayout->addStretch(10);
+ vlayout->addLayout(hlayout);
+ vlayout->addWidget(buttonBox);
+ m_cancel->setDefault(true);
+}
+
+BuildConfiguration *BuildConfigDialog::selectedBuildConfiguration() const
+{
+ int index = m_configCombo->currentIndex();
+ if (index < 0)
+ return 0;
+ return m_configCombo->itemData(index, Qt::UserRole).value<BuildConfiguration*>();
+}
+
+void BuildConfigDialog::buttonClicked()
+{
+ QPushButton *button = qobject_cast<QPushButton *>(sender());
+ if (button == m_changeBuildConfiguration) {
+ done(ChangeBuild);
+ } else if (button == m_cancel) {
+ done(Cancel);
+ } else if (button == m_justContinue) {
+ done(Continue);
+ }
+}
+
Q_EXPORT_PLUGIN(ProjectExplorerPlugin)
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index d4fe9dd13e761bda46c0621a84a08a80ca174244..1077ad2d36c2722561e495438bd135e690f096ee 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -35,10 +35,12 @@
#include <extensionsystem/iplugin.h>
#include <QtCore/QSharedPointer>
+#include <QtGui/QDialog>
QT_BEGIN_NAMESPACE
class QPoint;
class QAction;
+class QComboBox;
QT_END_NAMESPACE
namespace Core {
@@ -59,10 +61,36 @@ class RunConfiguration;
class IRunControlFactory;
class Project;
class Node;
+class BuildConfiguration;
namespace Internal {
class ProjectFileFactory;
struct ProjectExplorerSettings;
+
+class BuildConfigDialog : public QDialog
+{
+ Q_OBJECT
+public:
+ enum DialogResult {
+ ChangeBuild = 10,
+ Cancel = 11,
+ Continue = 12
+ };
+ BuildConfigDialog(Project *project, QWidget *parent = 0);
+
+ BuildConfiguration *selectedBuildConfiguration() const;
+
+private slots:
+ void buttonClicked();
+
+private:
+ Project *m_project;
+ QPushButton *m_changeBuildConfiguration;
+ QPushButton *m_cancel;
+ QPushButton *m_justContinue;
+ QComboBox *m_configCombo;
+};
+
} // namespace Internal
struct ProjectExplorerPluginPrivate;
@@ -189,7 +217,7 @@ private slots:
private:
void runProjectImpl(Project *pro);
void executeRunConfiguration(const QSharedPointer<RunConfiguration> &, const QString &mode);
-
+ bool showBuildConfigDialog();
void setCurrent(Project *project, QString filePath, Node *node);
QStringList allFilesWithDependencies(Project *pro);
diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h
index f769c87c8b342ef16988697f311c725dbfc3f88b..a3dc97942b34e4abc882e0fbdbe961edde47c4be 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.h
+++ b/src/plugins/projectexplorer/projectwelcomepage.h
@@ -30,14 +30,14 @@
#ifndef PROJECTWELCOMEPAGE_H
#define PROJECTWELCOMEPAGE_H
-#include <extensionsystem/iwelcomepage.h>
+#include <utils/iwelcomepage.h>
namespace ProjectExplorer {
namespace Internal {
class ProjectWelcomePageWidget;
-class ProjectWelcomePage : public ExtensionSystem::IWelcomePage
+class ProjectWelcomePage : public Utils::IWelcomePage
{
Q_OBJECT
public:
diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
index 4df5f9c9a57c9eb0b1fe4f65b46d248ee725c799..168d852443d7064d4d9b8383d4c26bc4484790e1 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
@@ -106,8 +106,13 @@ void ProjectWelcomePageWidget::updateWelcomePage(const WelcomePageData &welcomeP
if (welcomePageData.sessionList.count() > 0) {
foreach (const QString &s, welcomePageData.sessionList) {
QString str = s;
- if (s == welcomePageData.previousSession)
- str = tr("%1 (last session)").arg(s);
+ if (welcomePageData.activeSession.isEmpty()) {
+ if (s == welcomePageData.previousSession)
+ str = tr("%1 (last session)").arg(s);
+ } else {
+ if (s == welcomePageData.activeSession)
+ str = tr("%1 (current session)").arg(s);
+ }
ui->sessTreeWidget->addItem(str, s);
}
ui->sessTreeWidget->updateGeometry();
@@ -120,7 +125,8 @@ void ProjectWelcomePageWidget::updateWelcomePage(const WelcomePageData &welcomeP
if (welcomePageData.projectList.count() > 0) {
foreach (const QStringPair &it, welcomePageData.projectList) {
const QFileInfo fi(it.first);
- QTreeWidgetItem *item = ui->projTreeWidget->addItem(it.second, it.first, fi.absolutePath());
+ ui->projTreeWidget->addItem(it.second, it.first,
+ QDir::toNativeSeparators(fi.absolutePath()));
}
} else {
ui->projTreeWidget->hide();
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index c9765ad5cd53058cefc81c471f184104eee066fc..6aa8ea34de89d6927eebe82f4e51ab648aa00a0c 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -30,6 +30,7 @@
#include "runconfiguration.h"
#include "project.h"
#include "persistentsettings.h"
+#include "buildconfiguration.h"
#include <QtCore/QTimer>
@@ -56,6 +57,15 @@ Project *RunConfiguration::project() const
return m_project.data();
}
+bool RunConfiguration::isEnabled() const
+{
+ if (!m_project)
+ return false;
+ if (!m_project->activeBuildConfiguration())
+ return false;
+ return isEnabled(m_project->activeBuildConfiguration());
+}
+
QString RunConfiguration::name() const
{
return m_name;
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 07f1ad795614f7da69763d1edc0f20c21da8ee33..d775856cd77a2555c5cd0450d90a110dcecd7bf5 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -49,6 +49,7 @@ class PersistentSettingsReader;
class PersistentSettingsWriter;
class RunControl;
+class BuildConfiguration;
/* Base class for a run configuration. A run configuration specifies how a
* project should be run, while the runner (see below) does the actual running.
@@ -75,7 +76,8 @@ public:
QString name() const;
void setName(const QString &name);
- virtual bool isEnabled() const { return true; }
+ virtual bool isEnabled(BuildConfiguration *) const { return true; }
+ bool isEnabled() const;
// Returns the widget used to configure this run configuration. Ownership is transferred to the caller
// rename to createConfigurationWidget
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index 29de584b1628f963f9e25571ad15cccf4d523022..03b380826144d82db4d879622f71b8ed0a3101e0 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -185,6 +185,10 @@ RunSettingsWidget::RunSettingsWidget(Project *project)
m_ui->removeToolButton->setText(tr("Remove"));
m_ui->runConfigurationCombo->setModel(m_runConfigurationsModel);
+ m_makeActiveLabel = new QLabel(this);
+ m_makeActiveLabel->setVisible(false);
+ layout()->addWidget(m_makeActiveLabel);
+
connect(m_addMenu, SIGNAL(aboutToShow()),
this, SLOT(aboutToShowAddMenu()));
connect(m_ui->runConfigurationCombo, SIGNAL(currentIndexChanged(int)),
@@ -197,6 +201,12 @@ RunSettingsWidget::RunSettingsWidget(Project *project)
connect(m_project, SIGNAL(addedRunConfiguration(ProjectExplorer::Project *, QString)),
this, SLOT(initRunConfigurationComboBox()));
+ connect(m_project, SIGNAL(activeRunConfigurationChanged()),
+ this, SLOT(updateMakeActiveLabel()));
+
+ connect(m_makeActiveLabel, SIGNAL(linkActivated(QString)),
+ this, SLOT(makeActive()));
+
initRunConfigurationComboBox();
const QList<QSharedPointer<RunConfiguration> > runConfigurations = m_project->runConfigurations();
for (int i=0; i<runConfigurations.size(); ++i) {
@@ -278,12 +288,8 @@ void RunSettingsWidget::initRunConfigurationComboBox()
m_ui->runConfigurationCombo->setCurrentIndex(runConfigurations.indexOf(currentSelection));
else
m_ui->runConfigurationCombo->setCurrentIndex(runConfigurations.indexOf(activeRunConfiguration));
- QList<QSharedPointer<RunConfiguration> > enabledRunConfigurations;
- for (int i = 0; i < runConfigurations.size(); ++i) {
- if (runConfigurations.at(i)->isEnabled())
- enabledRunConfigurations.append(runConfigurations.at(i));
- }
m_ui->removeToolButton->setEnabled(runConfigurations.size() > 1);
+ updateMakeActiveLabel();
}
void RunSettingsWidget::showRunConfigurationWidget(int index)
@@ -296,10 +302,39 @@ void RunSettingsWidget::showRunConfigurationWidget(int index)
delete m_runConfigurationWidget;
m_runConfigurationWidget = selectedRunConfiguration->configurationWidget();
layout()->addWidget(m_runConfigurationWidget);
+ updateMakeActiveLabel();
+}
+
+void RunSettingsWidget::updateMakeActiveLabel()
+{
+ m_makeActiveLabel->setVisible(false);
+ QSharedPointer<RunConfiguration> rc = QSharedPointer<RunConfiguration>(0);
+ int index = m_ui->runConfigurationCombo->currentIndex();
+ if (index != -1) {
+ rc = m_runConfigurationsModel->runConfigurations().at(index);
+ }
+ if (rc) {
+ if (m_project->activeRunConfiguration() != rc) {
+ m_makeActiveLabel->setText(tr("<a href=\"#\">Make %1 active.</a>").arg(rc->name()));
+ m_makeActiveLabel->setVisible(true);
+ }
+ }
+}
+
+void RunSettingsWidget::makeActive()
+{
+ QSharedPointer<RunConfiguration> rc = QSharedPointer<RunConfiguration>(0);
+ int index = m_ui->runConfigurationCombo->currentIndex();
+ if (index != -1) {
+ rc = m_runConfigurationsModel->runConfigurations().at(index);
+ }
+ if (rc)
+ m_project->setActiveRunConfiguration(rc);
}
void RunSettingsWidget::nameChanged()
{
RunConfiguration *rc = qobject_cast<RunConfiguration *>(sender());
m_runConfigurationsModel->nameChanged(rc);
+ updateMakeActiveLabel();
}
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h
index 17f2d0cd50340bc7e5be4e047ebfe0d3dd5c1ebf..ed497f776deb9697b50fedacfe856858998790df 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.h
@@ -36,6 +36,7 @@
QT_BEGIN_NAMESPACE
class QMenu;
+class QLabel;
QT_END_NAMESPACE
namespace ProjectExplorer {
@@ -82,10 +83,13 @@ private slots:
void removeRunConfiguration();
void nameChanged();
void initRunConfigurationComboBox();
+ void updateMakeActiveLabel();
+ void makeActive();
private:
Project *m_project;
RunConfigurationsModel *m_runConfigurationsModel;
Ui::RunSettingsPropertiesPage *m_ui;
+ QLabel *m_makeActiveLabel;
QWidget *m_runConfigurationWidget;
QMenu *m_addMenu;
};
diff --git a/src/plugins/qmleditor/parser/qmljs.g b/src/plugins/qmleditor/parser/qmljs.g
index eb9a8abcfdcbb086a9fb964cec47c3eb32a36fe7..c5b2764cda5417c0bf6a418780ba4e1b97122996 100644
--- a/src/plugins/qmleditor/parser/qmljs.g
+++ b/src/plugins/qmleditor/parser/qmljs.g
@@ -2949,7 +2949,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ;
const int errorState = state_stack[tos];
// automatic insertion of `;'
- if (t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
+ if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
SavedToken &tk = token_buffer[0];
tk.token = yytoken;
tk.dval = yylval;
diff --git a/src/plugins/qmleditor/parser/qmljsgrammar.cpp b/src/plugins/qmleditor/parser/qmljsgrammar.cpp
index da3ce2a0770ca7c3d4803653bed1224ab58e0561..2b92b8225bc70a9f12baf80c050c8941681156c3 100644
--- a/src/plugins/qmleditor/parser/qmljsgrammar.cpp
+++ b/src/plugins/qmleditor/parser/qmljsgrammar.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
**
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
diff --git a/src/plugins/qmleditor/parser/qmljsgrammar_p.h b/src/plugins/qmleditor/parser/qmljsgrammar_p.h
index b297f81cff533b44359969ec97a7e2d03a97b185..20d7188f4518ee7b59721288b82019fb3cc16460 100644
--- a/src/plugins/qmleditor/parser/qmljsgrammar_p.h
+++ b/src/plugins/qmleditor/parser/qmljsgrammar_p.h
@@ -4,7 +4,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
**
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
diff --git a/src/plugins/qmleditor/parser/qmljsparser.cpp b/src/plugins/qmleditor/parser/qmljsparser.cpp
index 402aaeb3959a8d9c7ccbd19800aee8e35b0a8fe6..fb0080a08f04ca19d5e8024777a7ed50beda2025 100644
--- a/src/plugins/qmleditor/parser/qmljsparser.cpp
+++ b/src/plugins/qmleditor/parser/qmljsparser.cpp
@@ -1713,7 +1713,7 @@ case 337: {
const int errorState = state_stack[tos];
// automatic insertion of `;'
- if (t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
+ if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
SavedToken &tk = token_buffer[0];
tk.token = yytoken;
tk.dval = yylval;
@@ -1749,7 +1749,7 @@ case 337: {
token_buffer[1].loc = yylloc = location(lexer);
if (t_action(errorState, yytoken)) {
- const QString msg = qApp->translate("QmlParser", "Unexpected token `%1'").arg(QLatin1String(spell[token_buffer[0].token]));
+ const QString msg = qApp->translate("QmlParser", "Unexpected token '%1'").arg(QLatin1String(spell[token_buffer[0].token]));
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
action = errorState;
@@ -1777,7 +1777,7 @@ case 337: {
for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) {
int a = t_action(errorState, *tk);
if (a > 0 && t_action(a, yytoken)) {
- const QString msg = qApp->translate("QmlParser", "Expected token `%1'").arg(QLatin1String(spell[*tk]));
+ const QString msg = qApp->translate("QmlParser", "Expected token '%1'").arg(QLatin1String(spell[*tk]));
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
yytoken = *tk;
@@ -1800,7 +1800,7 @@ case 337: {
int a = t_action(errorState, tk);
if (a > 0 && t_action(a, yytoken)) {
- const QString msg = qApp->translate("QmlParser", "Expected token `%1'").arg(QLatin1String(spell[tk]));
+ const QString msg = qApp->translate("QmlParser", "Expected token '%1'").arg(QLatin1String(spell[tk]));
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
yytoken = tk;
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
index b5f25701e3a5bbcf7c8320dbc7cd8df4ab8294c9..59203641a9c29b6b5ac6217efecaf9e3e944c66b 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
@@ -30,14 +30,14 @@
#ifndef GETTINGSTARTEDWELCOMEPLUGIN_H
#define GETTINGSTARTEDWELCOMEPLUGIN_H
-#include <extensionsystem/iwelcomepage.h>
+#include <utils/iwelcomepage.h>
namespace Qt4ProjectManager {
namespace Internal {
class GettingStartedWelcomePageWidget;
-class GettingStartedWelcomePage : public ExtensionSystem::IWelcomePage
+class GettingStartedWelcomePage : public Utils::IWelcomePage
{
Q_OBJECT
public:
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index a85023a2404055eabe36b96f161e81362077183e..0a843c874c415587caea0475bd4123c1765f5aa2 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -337,7 +337,8 @@ QStringList GettingStartedWelcomePageWidget::tipsOfTheDay()
"target in the combo box."));
tips.append(tr("You can use Qt Creator with a number of <a href=\"qthelp://com.nokia.qtcreator/doc/creator-version-control.html\">"
"revision control systems</a> such as Subversion, Perforce, CVS and Git."));
- tips.append(tr("In the editor, <tt>F2</tt> toggles declaration and definition while <tt>F4</tt> toggles header file and source file."));
+ tips.append(tr("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."));
}
return tips;
}
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index ad4882af48a2d7046ae478d9d9af59dfa6bbc603..fdfdf64057ed15c2165db993ddf894f03fccf3ee 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -62,14 +62,10 @@ bool MakeStep::init(const QString &name)
Environment environment = project()->environment(bc);
setEnvironment(name, environment);
- QString workingDirectory;
- if (bc->value("useShadowBuild").toBool())
- workingDirectory = bc->value("buildDirectory").toString();
- if (workingDirectory.isEmpty())
- workingDirectory = QFileInfo(project()->file()->fileName()).absolutePath();
+ Qt4Project *qt4project = qobject_cast<Qt4Project *>(project());
+ QString workingDirectory = qt4project->buildDirectory(bc);
setWorkingDirectory(name, workingDirectory);
- Qt4Project *qt4project = qobject_cast<Qt4Project *>(project());
QString makeCmd = qt4project->makeCommand(bc);
if (!value(name, "makeCmd").toString().isEmpty())
makeCmd = value(name, "makeCmd").toString();
@@ -106,10 +102,10 @@ bool MakeStep::init(const QString &name)
// but for now this is the least invasive change
ProjectExplorer::ToolChain *toolchain = qt4project->toolChain(bc);
- ProjectExplorer::ToolChain::ToolChainType t = ProjectExplorer::ToolChain::UNKNOWN;
+ ProjectExplorer::ToolChain::ToolChainType type = ProjectExplorer::ToolChain::UNKNOWN;
if (toolchain)
- t = toolchain->type();
- if (t != ProjectExplorer::ToolChain::MSVC && t != ProjectExplorer::ToolChain::WINCE) {
+ type = toolchain->type();
+ if (type != ProjectExplorer::ToolChain::MSVC && type != ProjectExplorer::ToolChain::WINCE) {
if (value(name, "makeCmd").toString().isEmpty())
args << "-w";
}
@@ -117,8 +113,7 @@ bool MakeStep::init(const QString &name)
setEnabled(name, true);
setArguments(name, args);
- ProjectExplorer::ToolChain::ToolChainType type = qt4project->toolChain(bc)->type();
- if ( type == ProjectExplorer::ToolChain::MSVC || type == ProjectExplorer::ToolChain::WINCE)
+ if (type == ProjectExplorer::ToolChain::MSVC || type == ProjectExplorer::ToolChain::WINCE)
setBuildParser(ProjectExplorer::Constants::BUILD_PARSER_MSVC);
else
setBuildParser(ProjectExplorer::Constants::BUILD_PARSER_GCC);
@@ -179,6 +174,9 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
connect(makeStep, SIGNAL(changed()),
this, SLOT(update()));
+ connect(makeStep->project(), SIGNAL(buildDirectoryChanged()),
+ this, SLOT(updateDetails()));
+
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
this, SLOT(updateMakeOverrideLabel()));
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
@@ -194,14 +192,9 @@ void MakeStepConfigWidget::updateMakeOverrideLabel()
void MakeStepConfigWidget::updateDetails()
{
- // TODO reduce heavy code duplication
- QString workingDirectory;
Qt4Project *pro = static_cast<Qt4Project *>(m_makeStep->project());
ProjectExplorer::BuildConfiguration *bc = pro->buildConfiguration(m_buildConfiguration);
- if (bc->value("useShadowBuild").toBool())
- workingDirectory = bc->value("buildDirectory").toString();
- if (workingDirectory.isEmpty())
- workingDirectory = QFileInfo(pro->file()->fileName()).absolutePath();
+ QString workingDirectory = pro->buildDirectory(bc);
QString makeCmd = pro->makeCommand(bc);
if (!m_makeStep->value(m_buildConfiguration, "makeCmd").toString().isEmpty())
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index bebf7bc27a8e1bfa52e9583fd83aa3b435ff1b5c..8c29cdbd7cae93828de3663b3105ec29a4a0739c 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -48,6 +48,7 @@ using namespace Qt4ProjectManager::Internal;
ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::WindowFlags flags)
: QWizard(parent, flags), m_project(project), m_importVersion(0), m_temporaryVersion(false)
{
+ setWindowTitle(tr("Import existing build settings"));
QtVersionManager * vm = QtVersionManager::instance();
QString directory = QFileInfo(project->file()->fileName()).absolutePath();
QString importVersion = QtVersionManager::findQMakeBinaryFromMakefile(directory);
@@ -155,7 +156,7 @@ void ProjectLoadWizard::setupImportPage(QtVersion *version, QtVersion::QmakeBuil
resize(605, 490);
// Import Page
importPage = new QWizardPage(this);
- importPage->setTitle(tr("Import existing settings"));
+ importPage->setTitle(tr("Import existing build settings"));
QVBoxLayout *importLayout = new QVBoxLayout(importPage);
importLabel = new QLabel(importPage);
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
index 3790d311d2d64f9ea10171489a61f87f5a907855..e1c009498be9d3456328fdd0a47ece61d7e19b8d 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
@@ -36,15 +36,12 @@
using namespace ProjectExplorer;
using namespace Qt4ProjectManager::Internal;
-namespace {
- const char *GCCE_COMMAND = "arm-none-symbianelf-gcc.exe";
-}
-
-GCCEToolChain::GCCEToolChain(S60Devices::Device device)
- : GccToolChain(QLatin1String(GCCE_COMMAND)),
+GCCEToolChain::GCCEToolChain(S60Devices::Device device, const QString &gcceCommand)
+ : GccToolChain(gcceCommand),
m_deviceId(device.id),
m_deviceName(device.name),
- m_deviceRoot(device.epocRoot)
+ m_deviceRoot(device.epocRoot),
+ m_gcceCommand(gcceCommand)
{
}
@@ -68,9 +65,9 @@ QList<HeaderPath> GCCEToolChain::systemHeaderPaths()
void GCCEToolChain::addToEnvironment(ProjectExplorer::Environment &env)
{
- // TODO: do we need to set path to gcce?
env.prependOrSetPath(QString("%1\\epoc32\\tools").arg(m_deviceRoot)); // e.g. make.exe
env.prependOrSetPath(QString("%1\\epoc32\\gcc\\bin").arg(m_deviceRoot)); // e.g. gcc.exe
+ env.prependOrSetPath(QFileInfo(m_gcceCommand).absolutePath());
env.set("EPOCDEVICE", QString("%1:%2").arg(m_deviceId, m_deviceName));
env.set("EPOCROOT", S60Devices::cleanedRootPath(m_deviceRoot));
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
index 8b6bdc8dec5cbdff0a48f6efeb3eb2afc8fc9c3b..53cd0515c59db6045d8f97d55ba0f2756807641f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
@@ -40,7 +40,7 @@ namespace Internal {
class GCCEToolChain : public ProjectExplorer::GccToolChain
{
public:
- GCCEToolChain(S60Devices::Device device);
+ GCCEToolChain(S60Devices::Device device, const QString &gcceCommand);
QList<ProjectExplorer::HeaderPath> systemHeaderPaths();
void addToEnvironment(ProjectExplorer::Environment &env);
ProjectExplorer::ToolChain::ToolChainType type() const;
@@ -52,6 +52,7 @@ private:
QString m_deviceId;
QString m_deviceName;
QString m_deviceRoot;
+ QString m_gcceCommand;
};
} // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 0804a9fe258c781192fad92b8158d293befc92f0..94dfb99aec6c85530336162c0a7df0bd8924e4ef 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -50,6 +50,9 @@
#include <debugger/debuggermanager.h>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMainWindow>
+
using namespace ProjectExplorer;
using namespace Qt4ProjectManager::Internal;
@@ -98,6 +101,14 @@ QString S60DeviceRunConfiguration::type() const
return QLatin1String("Qt4ProjectManager.DeviceRunConfiguration");
}
+ProjectExplorer::ToolChain::ToolChainType S60DeviceRunConfiguration::toolChainType(
+ ProjectExplorer::BuildConfiguration *configuration) const
+{
+ if (const Qt4Project *pro = qobject_cast<const Qt4Project*>(project()))
+ return pro->toolChainType(configuration);
+ return ProjectExplorer::ToolChain::INVALID;
+}
+
ProjectExplorer::ToolChain::ToolChainType S60DeviceRunConfiguration::toolChainType() const
{
if (const Qt4Project *pro = qobject_cast<const Qt4Project*>(project()))
@@ -105,9 +116,9 @@ ProjectExplorer::ToolChain::ToolChainType S60DeviceRunConfiguration::toolChainTy
return ProjectExplorer::ToolChain::INVALID;
}
-bool S60DeviceRunConfiguration::isEnabled() const
+bool S60DeviceRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
{
- const ToolChain::ToolChainType type = toolChainType();
+ const ToolChain::ToolChainType type = toolChainType(configuration);
return type == ToolChain::GCCE || type == ToolChain::RVCT_ARMV5 || type == ToolChain::RVCT_ARMV6;
}
@@ -446,6 +457,11 @@ S60DeviceRunControlBase::~S60DeviceRunControlBase()
void S60DeviceRunControlBase::start()
{
emit started();
+ if (m_serialPortName.isEmpty()) {
+ error(this, tr("There is no device plugged in."));
+ emit finished();
+ return;
+ }
emit addToOutputWindow(this, tr("Creating %1.sisx ...").arg(QDir::toNativeSeparators(m_baseFileName)));
emit addToOutputWindow(this, tr("Executable file: %1").arg(m_executableFileName));
@@ -472,10 +488,23 @@ void S60DeviceRunControlBase::start()
m_makesis->start(m_makesisTool, QStringList(m_packageFile), QIODevice::ReadOnly);
}
+static inline void stopProcess(QProcess *p)
+{
+ const int timeOutMS = 200;
+ if (p->state() != QProcess::Running)
+ return;
+ p->terminate();
+ if (p->waitForFinished(timeOutMS))
+ return;
+ p->kill();
+}
+
void S60DeviceRunControlBase::stop()
{
- m_makesis->kill();
- m_signsis->kill();
+ if (m_makesis)
+ stopProcess(m_makesis);
+ if (m_signsis)
+ stopProcess(m_signsis);
if (m_launcher)
m_launcher->terminate();
}
@@ -529,6 +558,7 @@ void S60DeviceRunControlBase::makesisProcessFinished()
{
if (m_makesis->exitCode() != 0) {
error(this, tr("An error occurred while creating the package."));
+ stop();
emit finished();
return;
}
@@ -557,6 +587,7 @@ void S60DeviceRunControlBase::signsisProcessFinished()
{
if (m_signsis->exitCode() != 0) {
error(this, tr("An error occurred while creating the package."));
+ stop();
emit finished();
return;
}
@@ -570,6 +601,7 @@ void S60DeviceRunControlBase::signsisProcessFinished()
connect(m_launcher, SIGNAL(installingStarted()), this, SLOT(printInstallingNotice()));
connect(m_launcher, SIGNAL(canNotInstall(QString,QString)), this, SLOT(printInstallFailed(QString,QString)));
connect(m_launcher, SIGNAL(copyProgress(int)), this, SLOT(printCopyProgress(int)));
+ connect(m_launcher, SIGNAL(stateChanged(int)), this, SLOT(slotLauncherStateChanged(int)));
//TODO sisx destination and file path user definable
m_launcher->setTrkServerName(m_serialPortName);
@@ -593,18 +625,17 @@ void S60DeviceRunControlBase::signsisProcessFinished()
break;
case trk::PromptStartCommunicationCanceled:
case trk::PromptStartCommunicationError:
- delete m_launcher;
- m_launcher = 0;
error(this, errorMessage);
+ stop();
emit finished();
return;
};
if (!m_launcher->startServer(&errorMessage)) {
- delete m_launcher;
- m_launcher = 0;
+
error(this, tr("Could not connect to phone on port '%1': %2\n"
- "Check if the phone is connected and the TRK application is running.").arg(m_serialPortName, errorMessage));
+ "Check if the phone is connected and App TRK is running.").arg(m_serialPortName, errorMessage));
+ stop();
emit finished();
}
}
@@ -657,6 +688,37 @@ void S60DeviceRunControlBase::launcherFinished()
handleLauncherFinished();
}
+QMessageBox *S60DeviceRunControlBase::createTrkWaitingMessageBox(const QString &port, QWidget *parent)
+{
+ const QString title = QCoreApplication::translate("Qt4ProjectManager::Internal::S60DeviceRunControlBase",
+ "Waiting for App TRK");
+ const QString text = QCoreApplication::translate("Qt4ProjectManager::Internal::S60DeviceRunControlBase",
+ "Please start App TRK on %1.").arg(port);
+ QMessageBox *rc = new QMessageBox(QMessageBox::Information, title, text,
+ QMessageBox::Cancel, parent);
+ return rc;
+}
+
+void S60DeviceRunControlBase::slotLauncherStateChanged(int s)
+{
+ if (s == trk::Launcher::WaitingForTrk) {
+ QMessageBox *mb = S60DeviceRunControlBase::createTrkWaitingMessageBox(m_launcher->trkServerName(),
+ Core::ICore::instance()->mainWindow());
+ connect(m_launcher, SIGNAL(stateChanged(int)), mb, SLOT(close()));
+ connect(mb, SIGNAL(finished(int)), this, SLOT(slotWaitingForTrkClosed()));
+ mb->open();
+ }
+}
+
+void S60DeviceRunControlBase::slotWaitingForTrkClosed()
+{
+ if (m_launcher && m_launcher->state() == trk::Launcher::WaitingForTrk) {
+ stop();
+ error(this, tr("Canceled."));
+ emit finished();
+ }
+}
+
void S60DeviceRunControlBase::processFailed(const QString &program, QProcess::ProcessError errorCode)
{
QString errorString;
@@ -671,6 +733,7 @@ void S60DeviceRunControlBase::processFailed(const QString &program, QProcess::Pr
errorString = tr("An error has occurred while running %1.");
}
error(this, errorString.arg(program));
+ stop();
emit finished();
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 444e8855f65e62ccc56dc606622a834e57ba410f..04616bf109a8a499a5ab5be574266a5bbba4048e 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -37,6 +37,11 @@
#include <QtCore/QProcess>
+QT_BEGIN_NAMESPACE
+class QMessageBox;
+class QWidget;
+QT_END_NAMESPACE
+
namespace Debugger {
class DebuggerStartParameters;
}
@@ -57,7 +62,7 @@ public:
~S60DeviceRunConfiguration();
QString type() const;
- bool isEnabled() const;
+ bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
QWidget *configurationWidget();
void save(ProjectExplorer::PersistentSettingsWriter &writer) const;
void restore(const ProjectExplorer::PersistentSettingsReader &reader);
@@ -92,6 +97,7 @@ private slots:
void invalidateCachedTargetInformation();
private:
+ ProjectExplorer::ToolChain::ToolChainType toolChainType(ProjectExplorer::BuildConfiguration *configuration) const;
void updateTarget();
QString m_proFilePath;
@@ -134,6 +140,8 @@ public:
virtual void stop();
virtual bool isRunning() const;
+ static QMessageBox *createTrkWaitingMessageBox(const QString &port, QWidget *parent = 0);
+
protected:
virtual void initLauncher(const QString &executable, trk::Launcher *) = 0;
virtual void handleLauncherFinished() = 0;
@@ -162,8 +170,10 @@ private slots:
void printInstallingNotice();
void printInstallFailed(const QString &filename, const QString &errorMessage);
void launcherFinished();
+ void slotLauncherStateChanged(int);
+ void slotWaitingForTrkClosed();
-private:
+private:
bool createPackageFileFromTemplate(QString *errorMessage);
QString m_serialPortName;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
index a80c4200c98ad52c63353062983a2801fb562013..7fbbf9f7fc615ea95f23b8e6109ff39e446980e0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
@@ -54,6 +54,8 @@
#include <QtGui/QStyle>
#include <QtGui/QApplication>
#include <QtGui/QSpacerItem>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMessageBox>
Q_DECLARE_METATYPE(Qt4ProjectManager::Internal::CommunicationDevice)
@@ -196,6 +198,7 @@ void S60DeviceRunConfigurationWidget::updateSerialDevices()
if (newPortName != previousRunConfigurationPortName)
m_runConfiguration->setSerialPortName(newPortName);
}
+ updateSummary();
}
CommunicationDevice S60DeviceRunConfigurationWidget::device(int i) const
@@ -288,66 +291,72 @@ void S60DeviceRunConfigurationWidget::setDeviceInfoLabel(const QString &message,
m_deviceInfoLabel->adjustSize();
}
-void S60DeviceRunConfigurationWidget::updateDeviceInfo()
+void S60DeviceRunConfigurationWidget::slotLauncherStateChanged(int s)
{
- QString message;
- setDeviceInfoLabel(tr("Connecting..."));
- const bool ok = getDeviceInfo(&message);
- setDeviceInfoLabel(message, !ok);
+ switch (s) {
+ case trk::Launcher::WaitingForTrk: {
+ // Entered trk wait state..open message box
+ QMessageBox *mb = S60DeviceRunControlBase::createTrkWaitingMessageBox(m_infoLauncher->trkServerName(), this);
+ connect(m_infoLauncher, SIGNAL(stateChanged(int)), mb, SLOT(close()));
+ connect(mb, SIGNAL(finished(int)), this, SLOT(slotWaitingForTrkClosed()));
+ mb->open();
+ }
+ break;
+ case trk::Launcher::DeviceDescriptionReceived: // All ok, done
+ setDeviceInfoLabel(m_infoLauncher->deviceDescription());
+ m_deviceInfoButton->setEnabled(true);
+ m_infoLauncher->deleteLater();
+ break;
+ }
}
-bool S60DeviceRunConfigurationWidget::getDeviceInfo(QString *message)
+void S60DeviceRunConfigurationWidget::slotWaitingForTrkClosed()
{
- message->clear();
- // Do a launcher run with the ping protocol. Instantiate launcher on heap
- // as not to introduce delays when destructing a device with timeout
- trk::Launcher *launcher = new trk::Launcher(trk::Launcher::ActionPingOnly, QSharedPointer<trk::TrkDevice>(), this);
+ if (m_infoLauncher && m_infoLauncher->state() == trk::Launcher::WaitingForTrk) {
+ m_infoLauncher->deleteLater();
+ clearDeviceInfo();
+ m_deviceInfoButton->setEnabled(true);
+ }
+}
+
+void S60DeviceRunConfigurationWidget::updateDeviceInfo()
+{
+ QTC_ASSERT(!m_infoLauncher, return)
+ setDeviceInfoLabel(tr("Connecting..."));
+ // Do a launcher run with the ping protocol. Prompt to connect and
+ // go asynchronous afterwards to pop up launch trk box if a timeout occurs.
+ m_infoLauncher = new trk::Launcher(trk::Launcher::ActionPingOnly, QSharedPointer<trk::TrkDevice>(), this);
+ connect(m_infoLauncher, SIGNAL(stateChanged(int)), this, SLOT(slotLauncherStateChanged(int)));
const CommunicationDevice commDev = currentDevice();
- launcher->setSerialFrame(commDev.type == SerialPortCommunication);
- launcher->setTrkServerName(commDev.portName);
+ m_infoLauncher->setSerialFrame(commDev.type == SerialPortCommunication);
+ m_infoLauncher->setTrkServerName(commDev.portName);
// Prompt user
+ QString message;
const trk::PromptStartCommunicationResult src =
- S60RunConfigBluetoothStarter::startCommunication(launcher->trkDevice(),
+ S60RunConfigBluetoothStarter::startCommunication(m_infoLauncher->trkDevice(),
commDev.portName,
commDev.type, this,
- message);
+ &message);
switch (src) {
case trk::PromptStartCommunicationConnected:
break;
case trk::PromptStartCommunicationCanceled:
- launcher->deleteLater();
- return true;
+ clearDeviceInfo();
+ m_infoLauncher->deleteLater();
+ return;
case trk::PromptStartCommunicationError:
- launcher->deleteLater();
- return false;
+ setDeviceInfoLabel(message, true);
+ m_infoLauncher->deleteLater();
+ return;
};
- if (!launcher->startServer(message)) {
- launcher->deleteLater();
- return false;
- }
- // Set up event loop in the foreground with a timer to quit in case of timeout.
- QEventLoop eventLoop;
- if (!m_infoTimeOutTimer) {
- m_infoTimeOutTimer = new QTimer(this);
- m_infoTimeOutTimer->setInterval(3000);
- m_infoTimeOutTimer->setSingleShot(true);
- }
- connect(m_infoTimeOutTimer, SIGNAL(timeout()), &eventLoop, SLOT(quit()));
- connect(launcher, SIGNAL(finished()), &eventLoop, SLOT(quit()));
- // Go!
- QApplication::setOverrideCursor(Qt::BusyCursor);
- m_infoTimeOutTimer->start();
- eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
- m_infoTimeOutTimer->disconnect();
- QApplication::restoreOverrideCursor();
- // Anything received?
- *message = launcher->deviceDescription();
- launcher->deleteLater();
- if (message->isEmpty()) {
- *message = tr("A timeout occurred while querying the device. Check whether Trk is running");
- return false;
+ if (!m_infoLauncher->startServer(&message)) {
+ setDeviceInfoLabel(message, true);
+ m_infoLauncher->deleteLater();
+ return;
}
- return true;
+ // Wait for either timeout or results
+ m_deviceInfoButton->setEnabled(false);
+ return;
}
} // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
index 1863f5d5e5e0684f64a68f2e2c64c64e991be46a..18f736da736b60ae3ca7cfae46401aeeae4d6814 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
@@ -31,6 +31,7 @@
#define S60DEVICERUNCONFIGURATIONWIDGET_H
#include <QtGui/QWidget>
+#include <QtCore/QPointer>
QT_BEGIN_NAMESPACE
class QLabel;
@@ -44,6 +45,10 @@ namespace Utils {
class DetailsWidget;
}
+namespace trk {
+ class Launcher;
+}
+
namespace Qt4ProjectManager {
namespace Internal {
@@ -72,12 +77,13 @@ private slots:
void updateSummary();
void updateDeviceInfo();
void clearDeviceInfo();
+ void slotLauncherStateChanged(int);
+ void slotWaitingForTrkClosed();
private:
inline CommunicationDevice device(int i) const;
inline CommunicationDevice currentDevice() const;
- bool getDeviceInfo(QString *message);
void setDeviceInfoLabel(const QString &message, bool isError = false);
S60DeviceRunConfiguration *m_runConfiguration;
@@ -89,6 +95,7 @@ private:
QLabel *m_deviceInfoDescriptionLabel;
QLabel *m_deviceInfoLabel;
QTimer *m_infoTimeOutTimer;
+ QPointer<trk::Launcher> m_infoLauncher;
};
} // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index b1c65fa0e926273cce012300e9c7f20dce4580ea..6b734e631498ce32f59ee6935c6f470177d4a989 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -76,11 +76,11 @@ QString S60EmulatorRunConfiguration::type() const
return "Qt4ProjectManager.EmulatorRunConfiguration";
}
-bool S60EmulatorRunConfiguration::isEnabled() const
+bool S60EmulatorRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
{
Qt4Project *pro = qobject_cast<Qt4Project*>(project());
QTC_ASSERT(pro, return false);
- ToolChain::ToolChainType type = pro->toolChainType(pro->activeBuildConfiguration());
+ ToolChain::ToolChainType type = pro->toolChainType(configuration);
return type == ToolChain::WINSCW;
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
index 8ba0aeded4d6a9a5ee533cfa9f74a0ff514c17a2..ec84e7900d3b9440fe99db924b04bb95980e0e59 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
@@ -55,7 +55,7 @@ public:
~S60EmulatorRunConfiguration();
QString type() const;
- bool isEnabled() const;
+ bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
QWidget *configurationWidget();
void save(ProjectExplorer::PersistentSettingsWriter &writer) const;
void restore(const ProjectExplorer::PersistentSettingsReader &reader);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
index 0c9084c88ddd84c75e6b07448627111eab5c006f..a45ebe44e27852f00e49f8bf62aab22773ad9c4c 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
@@ -29,8 +29,8 @@
#include "s60manager.h"
-#include "s60devices.h"
#include "s60devicespreferencepane.h"
+#include "serialdevicelister.h"
#include "winscwtoolchain.h"
#include "gccetoolchain.h"
#include "rvcttoolchain.h"
@@ -40,20 +40,22 @@
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/toolchain.h>
#include <debugger/debuggermanager.h>
#include <utils/qtcassert.h>
#include <QtGui/QMainWindow>
+namespace {
+ const char *GCCE_COMMAND = "arm-none-symbianelf-gcc.exe";
+ const char *S60_AUTODETECTION_SOURCE = "QTS60";
+}
+
namespace Qt4ProjectManager {
namespace Internal {
S60Manager *S60Manager::m_instance = 0;
-namespace {
-static const char *S60_AUTODETECTION_SOURCE = "QTS60";
-}
-
// ======== Parametrizable Factory for RunControls, depending on the configuration
// class and mode.
@@ -200,7 +202,10 @@ ProjectExplorer::ToolChain *S60Manager::createWINSCWToolChain(const Qt4ProjectMa
ProjectExplorer::ToolChain *S60Manager::createGCCEToolChain(const Qt4ProjectManager::QtVersion *version) const
{
- return new GCCEToolChain(deviceForQtVersion(version));
+ ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
+ env.prependOrSetPath(version->gcceDirectory()+"/bin");
+ QString gcceCommandPath= env.searchInPath(GCCE_COMMAND);
+ return new GCCEToolChain(deviceForQtVersion(version), gcceCommandPath);
}
ProjectExplorer::ToolChain *S60Manager::createRVCTToolChain(
@@ -237,5 +242,5 @@ S60Devices::Device S60Manager::deviceForQtVersion(const Qt4ProjectManager::QtVer
return device;
}
-}
-}
+} // namespace internal
+} // namespace qt4projectmanager
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.h b/src/plugins/qt4projectmanager/qt-s60/s60manager.h
index fe4078583d86a389a897cd2b262f0a1da3da806d..77e93be3a93dbffce8ef41a51fdff3664912f173 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.h
@@ -31,17 +31,19 @@
#define S60MANAGER_H
#include "qtversionmanager.h"
-#include "serialdevicelister.h"
#include "s60devices.h"
-#include <extensionsystem/iplugin.h>
-#include <projectexplorer/toolchain.h>
-
#include <QtCore/QObject>
+namespace ProjectExplorer {
+class ToolChain;
+}
+
namespace Qt4ProjectManager {
namespace Internal {
+class SerialDeviceLister;
+
class S60Manager : public QObject
{
Q_OBJECT
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 7e5dec188c5763c0846e72a03ff44eec84e25441..dd7a37a48224fc9b8602efa8b6258f84bf4206fd 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -274,18 +274,19 @@ bool Qt4BuildConfigurationFactory::create(const QString &type) const
{
QTC_ASSERT(m_versions.contains(type), return false);
const VersionInfo &info = m_versions.value(type);
+ QtVersion *version = QtVersionManager::instance()->version(info.versionId);
+ if (!version)
+ return false;
bool ok;
QString buildConfigurationName = QInputDialog::getText(0,
tr("New configuration"),
tr("New Configuration Name:"),
QLineEdit::Normal,
- QString(),
+ version->name(),
&ok);
if (!ok || buildConfigurationName.isEmpty())
return false;
- QtVersion *version = QtVersionManager::instance()->version(info.versionId);
-
m_project->addQt4BuildConfiguration(tr("%1 Debug").arg(buildConfigurationName),
version,
(QtVersion::QmakeBuildConfig)(version->defaultBuildConfig() | QtVersion::DebugBuild));
@@ -983,17 +984,8 @@ void Qt4Project::setToolChainType(BuildConfiguration *configuration, ProjectExpl
void Qt4Project::updateActiveRunConfiguration()
{
- const QSharedPointer<RunConfiguration> activeRunConfig = activeRunConfiguration();
- if (!activeRunConfig.isNull() && !activeRunConfig->isEnabled()) {
- foreach (const QSharedPointer<RunConfiguration> &runConfiguration, runConfigurations()) {
- if (runConfiguration->isEnabled()) {
- setActiveRunConfiguration(runConfiguration);
- break;
- }
- }
- }
emit runConfigurationsEnabledStateChanged();
- emit invalidateCachedTargetInformation();
+ emit targetInformationChanged();
}
ProjectExplorer::ToolChain::ToolChainType Qt4Project::toolChainType(BuildConfiguration *configuration) const
@@ -1195,6 +1187,11 @@ void Qt4Project::invalidateCachedTargetInformation()
emit targetInformationChanged();
}
+void Qt4Project::emitBuildDirectoryChanged()
+{
+ emit buildDirectoryChanged();
+}
+
// We match -spec and -platfrom separetly
// We ignore -cache, because qmake contained a bug that it didn't
// mention the -cache in the Makefile
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 13c7f52fdaae176a14d9ec084a42483402e22f6c..89083369b07b25295ed905f4ec5b525e58ab3a3b 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -72,6 +72,7 @@ namespace Internal {
class Qt4RunConfiguration;
class GCCPreprocessor;
struct Qt4ProjectFiles;
+ class Qt4ProjectConfigWidget;
class CodeModelInfo
{
@@ -266,6 +267,10 @@ private:
static void findProFile(const QString& fileName, Internal::Qt4ProFileNode *root, QList<Internal::Qt4ProFileNode *> &list);
static bool hasSubNode(Internal::Qt4PriFileNode *root, const QString &path);
+ // called by Qt4ProjectConfigWidget
+ // TODO remove once there's a setBuildDirectory call
+ void emitBuildDirectoryChanged();
+
QList<Internal::Qt4ProFileNode *> m_applicationProFileChange;
ProjectExplorer::ProjectExplorerPlugin *projectExplorer() const;
@@ -294,6 +299,7 @@ private:
QMap<QString, Internal::CodeModelInfo> m_codeModelInfo;
friend class Qt4ProjectFile;
+ friend class Internal::Qt4ProjectConfigWidget;
};
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index a17b7e7092e37ac0f62a82c1d9b9201ca5294e5e..ff9f17efaef767c14638dca853cdd54622acbdf1 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -93,12 +93,12 @@ QString Qt4RunConfiguration::type() const
return "Qt4ProjectManager.Qt4RunConfiguration";
}
-bool Qt4RunConfiguration::isEnabled() const
+bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
{
#if defined(QTCREATOR_WITH_S60) || defined(QTCREATOR_WITH_MAEMO)
Qt4Project *pro = qobject_cast<Qt4Project*>(project());
QTC_ASSERT(pro, return false);
- ProjectExplorer::ToolChain::ToolChainType type = pro->toolChainType(pro->activeBuildConfiguration());
+ ProjectExplorer::ToolChain::ToolChainType type = pro->toolChainType(configuration);
#ifdef QTCREATOR_WITH_S60
if (type == ProjectExplorer::ToolChain::WINSCW
|| type == ProjectExplorer::ToolChain::GCCE
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 69fa0d6575fd35ff61041215e8995bcb698b1328..f4d953cad871cf7092275c5fe205a5b1c9838fc8 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -66,7 +66,7 @@ public:
virtual ~Qt4RunConfiguration();
virtual QString type() const;
- virtual bool isEnabled() const;
+ virtual bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
virtual QWidget *configurationWidget();
virtual void save(ProjectExplorer::PersistentSettingsWriter &writer) const;
virtual void restore(const ProjectExplorer::PersistentSettingsReader &reader);
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 0796dc44b9226f5be98c835265b11ef534264b6d..297ee8596275330ed04f5648141f8db7bae46a38 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -126,6 +126,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
m_ui->mwcPath->setPromptDialogTitle(tr("Select Carbide Install Directory"));
m_ui->s60SDKPath->setExpectedKind(Utils::PathChooser::Directory);
m_ui->s60SDKPath->setPromptDialogTitle(tr("Select S60 SDK Root"));
+ m_ui->gccePath->setExpectedKind(Utils::PathChooser::Directory);
+ m_ui->gccePath->setPromptDialogTitle(tr("Select the CSL Arm Toolchain (GCCE) Directory"));
m_ui->addButton->setIcon(QIcon(Core::Constants::ICON_PLUS));
m_ui->delButton->setIcon(QIcon(Core::Constants::ICON_MINUS));
@@ -174,6 +176,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
this, SLOT(updateCurrentMwcDirectory()));
connect(m_ui->s60SDKPath, SIGNAL(changed(QString)),
this, SLOT(updateCurrentS60SDKDirectory()));
+ connect(m_ui->gccePath, SIGNAL(changed(QString)),
+ this, SLOT(updateCurrentGcceDirectory()));
#endif
connect(m_ui->addButton, SIGNAL(clicked()),
@@ -396,6 +400,7 @@ void QtOptionsPageWidget::updateState()
m_ui->mingwPath->setEnabled(enabled);
m_ui->mwcPath->setEnabled(enabled);
m_ui->s60SDKPath->setEnabled(enabled && !isAutodetected);
+ m_ui->gccePath->setEnabled(enabled);
const bool hasLog = enabled && !m_ui->qtdirList->currentItem()->data(2, Qt::UserRole).toString().isEmpty();
m_ui->showLogButton->setEnabled(hasLog);
@@ -423,6 +428,8 @@ void QtOptionsPageWidget::makeS60Visible(bool visible)
m_ui->mwcPath->setVisible(visible);
m_ui->s60SDKLabel->setVisible(visible);
m_ui->s60SDKPath->setVisible(visible);
+ m_ui->gcceLabel->setVisible(visible);
+ m_ui->gccePath->setVisible(visible);
}
void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
@@ -472,6 +479,7 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
makeS60Visible(true);
m_ui->mwcPath->setPath(m_versions.at(index)->mwcDirectory());
m_ui->s60SDKPath->setPath(m_versions.at(index)->s60SDKDirectory());
+ m_ui->gccePath->setPath(m_versions.at(index)->gcceDirectory());
#endif
} else if (types.contains(ProjectExplorer::ToolChain::INVALID)) {
makeMSVCVisible(false);
@@ -698,6 +706,15 @@ void QtOptionsPageWidget::updateCurrentS60SDKDirectory()
return;
m_versions[currentItemIndex]->setS60SDKDirectory(m_ui->s60SDKPath->path());
}
+void QtOptionsPageWidget::updateCurrentGcceDirectory()
+{
+ QTreeWidgetItem *currentItem = m_ui->qtdirList->currentItem();
+ Q_ASSERT(currentItem);
+ int currentItemIndex = indexForTreeItem(currentItem);
+ if (currentItemIndex < 0)
+ return;
+ m_versions[currentItemIndex]->setGcceDirectory(m_ui->gccePath->path());
+}
#endif
QList<QSharedPointerQtVersion> QtOptionsPageWidget::versions() const
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h
index 4e1f2b49fe82f446ea9ec0385f2d24b46627a48e..834dff9b36f7443a8a5312b1096974ffd36d0b8f 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.h
+++ b/src/plugins/qt4projectmanager/qtoptionspage.h
@@ -121,6 +121,7 @@ private slots:
#ifdef QTCREATOR_WITH_S60
void updateCurrentMwcDirectory();
void updateCurrentS60SDKDirectory();
+ void updateCurrentGcceDirectory();
#endif
void msvcVersionChanged();
void buildDebuggingHelper();
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 15fbc053a4a2421903bbe8a318aca79d66f4091e..ee1b0c36f6f3c05a11c7f6596d8f62d8a74ea1d7 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -131,6 +131,7 @@ QtVersionManager::QtVersionManager()
#ifdef QTCREATOR_WITH_S60
version->setMwcDirectory(s->value("MwcDirectory").toString());
version->setS60SDKDirectory(s->value("S60SDKDirectory").toString());
+ version->setGcceDirectory(s->value("GcceDirectory").toString());
#endif
m_versions.append(version);
}
@@ -144,6 +145,23 @@ QtVersionManager::QtVersionManager()
writeVersionsIntoSettings();
updateDocumentation();
+
+ if (m_defaultVersion > m_versions.size() || m_defaultVersion < 0) {
+ // Invalid default version, correct that...
+ for(int i = 0; i < m_versions.size(); ++i) {
+ QtVersion *version = m_versions.at(i);
+ if (version->isAutodetected() && version->autodetectionSource() == PATH_AUTODETECTION_SOURCE && version->isValid()) {
+ m_defaultVersion = i;
+ break;
+ }
+ }
+ }
+
+ if (m_defaultVersion > m_versions.size() || m_defaultVersion < 0) {
+ // Still invalid? Use the first one
+ m_defaultVersion = 0;
+ }
+
// cannot call from ctor, needs to get connected extenernally first
QTimer::singleShot(0, this, SLOT(updateExamples()));
}
@@ -251,6 +269,7 @@ void QtVersionManager::writeVersionsIntoSettings()
#ifdef QTCREATOR_WITH_S60
s->setValue("MwcDirectory", version->mwcDirectory());
s->setValue("S60SDKDirectory", version->s60SDKDirectory());
+ s->setValue("GcceDirectory", version->gcceDirectory());
#endif
}
s->endArray();
@@ -1228,6 +1247,16 @@ void QtVersion::setS60SDKDirectory(const QString &directory)
{
m_s60SDKDirectory = directory;
}
+
+QString QtVersion::gcceDirectory() const
+{
+ return m_gcceDirectory;
+}
+
+void QtVersion::setGcceDirectory(const QString &directory)
+{
+ m_gcceDirectory = directory;
+}
#endif
QString QtVersion::mingwDirectory() const
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index 758a7aa63db1b773a824edf151c1bbea2d717212..d0dde249231a9c8fc216fff248dc1ce68599330a 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -97,6 +97,8 @@ public:
void setMwcDirectory(const QString &directory);
QString s60SDKDirectory() const;
void setS60SDKDirectory(const QString &directory);
+ QString gcceDirectory() const;
+ void setGcceDirectory(const QString &directory);
#endif
QString mingwDirectory() const;
void setMingwDirectory(const QString &directory);
@@ -155,6 +157,7 @@ private:
#ifdef QTCREATOR_WITH_S60
QString m_mwcDirectory;
QString m_s60SDKDirectory;
+ QString m_gcceDirectory;
#endif
mutable bool m_mkspecUpToDate;
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index 2f0a1dc840fd6986353016cf002763e9850b89f2..898125fa11a203d458c058b6b835872aeb5b4a61 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>577</width>
- <height>477</height>
+ <height>507</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -100,7 +100,7 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
- <item row="7" column="1">
+ <item row="8" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="debuggingHelperStateLabel">
@@ -204,23 +204,33 @@ p, li { white-space: pre-wrap; }
<widget class="Utils::PathChooser" name="s60SDKPath" native="true"/>
</item>
<item row="6" column="0">
+ <widget class="QLabel" name="gcceLabel">
+ <property name="text">
+ <string>CLS/GCCE Directory:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="Utils::PathChooser" name="gccePath" native="true"/>
+ </item>
+ <item row="7" column="0">
<widget class="QLabel" name="mwcLabel">
<property name="text">
<string>Carbide Directory:</string>
</property>
</widget>
</item>
- <item row="6" column="1">
+ <item row="7" column="1">
<widget class="Utils::PathChooser" name="mwcPath" native="true"/>
</item>
- <item row="7" column="0">
+ <item row="8" column="0">
<widget class="QLabel" name="debuggingHelperLabel">
<property name="text">
<string>Debugging Helper:</string>
</property>
</widget>
</item>
- <item row="8" column="1">
+ <item row="9" column="1">
<widget class="QLabel" name="errorLabel">
<property name="text">
<string/>
diff --git a/src/plugins/welcome/communitywelcomepage.h b/src/plugins/welcome/communitywelcomepage.h
index 7df85a1d919d11caffb8371b907e0cd49f53a642..d89dac82fbfbc9c2765321f3c78383dbe949478f 100644
--- a/src/plugins/welcome/communitywelcomepage.h
+++ b/src/plugins/welcome/communitywelcomepage.h
@@ -32,14 +32,14 @@
#include "welcome_global.h"
-#include <extensionsystem/iwelcomepage.h>
+#include <utils/iwelcomepage.h>
namespace Welcome {
namespace Internal {
class CommunityWelcomePageWidget;
-class WELCOME_EXPORT CommunityWelcomePage : public ExtensionSystem::IWelcomePage
+class CommunityWelcomePage : public Utils::IWelcomePage
{
Q_OBJECT
public:
diff --git a/src/plugins/welcome/communitywelcomepagewidget.cpp b/src/plugins/welcome/communitywelcomepagewidget.cpp
index a6ffff280c9cbd197128b424dd5c7f97cb1c8372..3385dd39c9f1c4971b7110642b2e365fdc5157d1 100644
--- a/src/plugins/welcome/communitywelcomepagewidget.cpp
+++ b/src/plugins/welcome/communitywelcomepagewidget.cpp
@@ -55,18 +55,18 @@ CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) :
//: Add localized feed here only if one exists
m_rssFetcher->fetch(QUrl(tr("http://labs.trolltech.com/blogs/feed")));
- QMap<QString, QString> sites;
- sites[tr("Qt Home")] = QLatin1String("http://qt.nokia.com");
- sites[tr("Qt Labs")] = QLatin1String("http://labs.qt.nokia.com");
- sites[tr("Qt Git Hosting")] = QLatin1String("http://qt.gitorious.org");
- sites[tr("Qt Centre")] = QLatin1String("http://www.qtcentre.org");
- sites[tr("Qt Apps")] = QLatin1String("http://www.qt-apps.org");
- sites[tr("Qt for Symbian at Forum Nokia")] = QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196");
+ QList<QPair<QString, QString> > sites;
+ sites << qMakePair(tr("Qt Home"), QString(QLatin1String("http://qt.nokia.com")));
+ sites << qMakePair(tr("Qt Labs"), QString(QLatin1String("http://labs.qt.nokia.com")));
+ sites << qMakePair(tr("Qt Git Hosting"), QString(QLatin1String("http://qt.gitorious.org")));
+ sites << qMakePair(tr("Qt Centre"), QString(QLatin1String("http://www.qtcentre.org")));
+ sites << qMakePair(tr("Qt Apps"), QString(QLatin1String("http://www.qt-apps.org")));
+ sites << qMakePair(tr("Qt for Symbian at Forum Nokia"), QString(QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196")));
- QMapIterator<QString, QString> it(sites);
+ QListIterator<QPair<QString, QString> > it(sites);
while (it.hasNext()) {
- it.next();
- ui->sitesTreeWidget->addItem(it.key(), it.value(), it.value());
+ QPair<QString, QString> pair = it.next();
+ ui->sitesTreeWidget->addItem(pair.first, pair.second, pair.second);
}
}
diff --git a/src/plugins/welcome/welcome.pri b/src/plugins/welcome/welcome.pri
index 5e0a99bca8770620ec1b02979fd996bdb1ad87af..2edd8a4dfc62535ca6e5c4224393320146978916 100644
--- a/src/plugins/welcome/welcome.pri
+++ b/src/plugins/welcome/welcome.pri
@@ -1,2 +1,3 @@
-include(coreplugin_dependencies.pri)
+include(welcome_dependencies.pri)
+
LIBS *= -l$$qtLibraryTarget(Welcome)
diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro
index fb5cfc9e748b5c40b043bfc40e17300f802b2a50..d2e6e7c33eaa7770f9377f1cfe67d2c04d758873 100644
--- a/src/plugins/welcome/welcome.pro
+++ b/src/plugins/welcome/welcome.pro
@@ -2,12 +2,13 @@ TEMPLATE = lib
TARGET = Welcome
QT += network
include(../../qtcreatorplugin.pri)
-include(../../plugins/coreplugin/coreplugin.pri)
+include(welcome_dependencies.pri)
HEADERS += welcomeplugin.h \
welcomemode.h \
rssfetcher.h \
communitywelcomepagewidget.h \
- communitywelcomepage.h
+ communitywelcomepage.h \
+ welcome_global.h
SOURCES += welcomeplugin.cpp \
welcomemode.cpp \
rssfetcher.cpp \
diff --git a/src/plugins/welcome/welcome_dependencies.pri b/src/plugins/welcome/welcome_dependencies.pri
new file mode 100644
index 0000000000000000000000000000000000000000..7f369f6326a6ff535481cd53aaa6c99e57e4adc9
--- /dev/null
+++ b/src/plugins/welcome/welcome_dependencies.pri
@@ -0,0 +1,2 @@
+include(../../plugins/coreplugin/coreplugin.pri)
+include(../../libs/utils/utils.pri)
diff --git a/src/plugins/welcome/welcomemode.cpp b/src/plugins/welcome/welcomemode.cpp
index 9da0ad90d4e03cf865df0cd7f914bd163cabb858..6397930cfae550054b8d317a1e3020ae69d8b9ec 100644
--- a/src/plugins/welcome/welcomemode.cpp
+++ b/src/plugins/welcome/welcomemode.cpp
@@ -29,7 +29,6 @@
#include "welcomemode.h"
#include <extensionsystem/pluginmanager.h>
-#include <extensionsystem/iwelcomepage.h>
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
@@ -39,6 +38,7 @@
#include <utils/styledbar.h>
#include <utils/welcomemodetreewidget.h>
+#include <utils/iwelcomepage.h>
#include <QtGui/QMouseEvent>
#include <QtGui/QScrollArea>
@@ -55,6 +55,7 @@
#include "ui_welcomemode.h"
using namespace ExtensionSystem;
+using namespace Utils;
namespace Welcome {
diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp
index 7e7d01d90718b85282653ceebe0a5d54d44da2c1..1e7afdd166d93e00550e5ea0eb2d7e3bb5300ea3 100644
--- a/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/src/shared/cplusplus/CheckDeclaration.cpp
@@ -263,8 +263,29 @@ bool CheckDeclaration::visit(AsmDefinitionAST *)
return false;
}
-bool CheckDeclaration::visit(ExceptionDeclarationAST *)
+bool CheckDeclaration::visit(ExceptionDeclarationAST *ast)
{
+ FullySpecifiedType ty = semantic()->check(ast->type_specifier, _scope);
+ FullySpecifiedType qualTy = ty.qualifiedType();
+
+ Name *name = 0;
+ FullySpecifiedType declTy = semantic()->check(ast->declarator, qualTy,
+ _scope, &name);
+
+ unsigned location = locationOfDeclaratorId(ast->declarator);
+ if (! location) {
+ if (ast->declarator)
+ location = ast->declarator->firstToken();
+ else
+ location = ast->firstToken();
+ }
+
+ Declaration *symbol = control()->newDeclaration(location, name);
+ symbol->setStartOffset(tokenAt(ast->firstToken()).offset);
+ symbol->setEndOffset(tokenAt(ast->lastToken()).offset);
+ symbol->setType(declTy);
+ _scope->enterSymbol(symbol);
+
return false;
}
diff --git a/src/shared/trk/bluetoothlistener_gui.cpp b/src/shared/trk/bluetoothlistener_gui.cpp
index edcb40a9a52564706ab5df041f415a0f83fdda32..9b6dbd3bc6e77f1c202bcade5fb3b3fbc5902e6b 100644
--- a/src/shared/trk/bluetoothlistener_gui.cpp
+++ b/src/shared/trk/bluetoothlistener_gui.cpp
@@ -81,8 +81,8 @@ PromptStartCommunicationResult
QWidget *msgBoxParent,
QString *errorMessage)
{
- const QString title = QCoreApplication::translate("trk::promptStartCommunication", "Waiting for TRK");
- const QString message = QCoreApplication::translate("trk::promptStartCommunication", "Waiting for TRK to start on %1...").arg(starter.device());
+ const QString title = QCoreApplication::translate("trk::promptStartCommunication", "Waiting for App TRK");
+ const QString message = QCoreApplication::translate("trk::promptStartCommunication", "Waiting for App TRK to start on %1...").arg(starter.device());
return promptStartCommunication(starter, title, message, msgBoxParent, errorMessage);
}
diff --git a/src/shared/trk/communicationstarter.h b/src/shared/trk/communicationstarter.h
index 7b89e2472ed0a6c0583e7348362821a822075389..6f9f6d1e434530ad0013687e02827f697e15b030 100644
--- a/src/shared/trk/communicationstarter.h
+++ b/src/shared/trk/communicationstarter.h
@@ -45,8 +45,8 @@ struct BaseCommunicationStarterPrivate;
* connection attempt in start() fails, the
* virtual initializeStartupResources() is called to initialize resources
* required to pull up the communication (namely Bluetooth listeners).
- * The base class can be used as is to prompt the user to launch TRK for a serial
- * communication as this requires no further resource setup. */
+ * The base class can be used as is to prompt the user to launch App TRK for a
+ * serial communication as this requires no further resource setup. */
class BaseCommunicationStarter : public QObject {
Q_OBJECT
diff --git a/src/shared/trk/launcher.cpp b/src/shared/trk/launcher.cpp
index f066ab4864fac3ff5799e4ba9aeb9ec2f0d72f0f..a554269f0ef429fa47a90b8ad2e0ed6a16fd4f2d 100644
--- a/src/shared/trk/launcher.cpp
+++ b/src/shared/trk/launcher.cpp
@@ -56,6 +56,7 @@ struct LauncherPrivate {
TrkDevicePtr m_device;
QString m_trkServerName;
QByteArray m_trkReadBuffer;
+ Launcher::State m_state;
void logMessage(const QString &msg);
// Debuggee state
@@ -66,14 +67,13 @@ struct LauncherPrivate {
QString m_installFileName;
int m_verbose;
Launcher::Actions m_startupActions;
- bool m_connected;
bool m_closeDevice;
};
LauncherPrivate::LauncherPrivate(const TrkDevicePtr &d) :
m_device(d),
+ m_state(Launcher::Disconnected),
m_verbose(0),
- m_connected(false),
m_closeDevice(true)
{
if (m_device.isNull())
@@ -97,6 +97,19 @@ Launcher::~Launcher()
delete d;
}
+Launcher::State Launcher::state() const
+{
+ return d->m_state;
+}
+
+void Launcher::setState(State s)
+{
+ if (s != d->m_state) {
+ d->m_state = s;
+ emit stateChanged(s);
+ }
+}
+
void Launcher::addStartupActions(trk::Launcher::Actions startupActions)
{
d->m_startupActions = Actions(d->m_startupActions | startupActions);
@@ -186,7 +199,9 @@ bool Launcher::startServer(QString *errorMessage)
} else {
disconnect(this, SIGNAL(finished()), d->m_device.data(), 0);
}
-
+ setState(Connecting);
+ // Set up the temporary 'waiting' state if we do not get immediate connection
+ QTimer::singleShot(200, this, SLOT(slotWaitingForTrk()));
d->m_device->sendTrkInitialPing();
d->m_device->sendTrkMessage(TrkDisconnect); // Disconnect, as trk might be still connected
d->m_device->sendTrkMessage(TrkSupported, TrkCallback(this, &Launcher::handleSupportMask));
@@ -197,13 +212,20 @@ bool Launcher::startServer(QString *errorMessage)
return true;
}
+void Launcher::slotWaitingForTrk()
+{
+ // Set temporary state if we are still in connected state
+ if (state() == Connecting)
+ setState(WaitingForTrk);
+}
+
void Launcher::handleConnect(const TrkResult &result)
{
if (result.errorCode()) {
emit canNotConnect(result.errorString());
return;
}
- d->m_connected = true;
+ setState(Connected);
if (d->m_startupActions & ActionCopy)
copyFileToRemote();
else if (d->m_startupActions & ActionInstall)
@@ -226,17 +248,27 @@ void Launcher::logMessage(const QString &msg)
void Launcher::terminate()
{
- if (d->m_session.pid) {
- QByteArray ba;
- appendShort(&ba, 0x0000, TargetByteOrder);
- appendInt(&ba, d->m_session.pid, TargetByteOrder);
- d->m_device->sendTrkMessage(TrkDeleteItem, TrkCallback(this, &Launcher::handleRemoteProcessKilled), ba);
- } else if (d->m_connected) {
+ switch (state()) {
+ case DeviceDescriptionReceived:
+ case Connected:
+ if (d->m_session.pid) {
+ QByteArray ba;
+ appendShort(&ba, 0x0000, TargetByteOrder);
+ appendInt(&ba, d->m_session.pid, TargetByteOrder);
+ d->m_device->sendTrkMessage(TrkDeleteItem, TrkCallback(this, &Launcher::handleRemoteProcessKilled), ba);
+ return;
+ }
if (d->m_copyState.copyFileHandle)
closeRemoteFile(true);
disconnectTrk();
- } else {
+ break;
+ case Disconnected:
+ break;
+ case Connecting:
+ case WaitingForTrk:
+ setState(Disconnected);
emit finished();
+ break;
}
}
@@ -364,17 +396,21 @@ QString Launcher::deviceDescription(unsigned verbose) const
void Launcher::handleTrkVersion(const TrkResult &result)
{
if (result.errorCode() || result.data.size() < 5) {
- if (d->m_startupActions == ActionPingOnly)
+ if (d->m_startupActions == ActionPingOnly) {
+ setState(Disconnected);
emit finished();
+ }
return;
}
d->m_session.trkAppVersion.trkMajor = result.data.at(1);
d->m_session.trkAppVersion.trkMinor = result.data.at(2);
d->m_session.trkAppVersion.protocolMajor = result.data.at(3);
d->m_session.trkAppVersion.protocolMinor = result.data.at(4);
+ setState(DeviceDescriptionReceived);
// Ping mode: Log & Terminate
if (d->m_startupActions == ActionPingOnly) {
qWarning("%s", qPrintable(deviceDescription()));
+ setState(Disconnected);
emit finished();
}
}
@@ -501,6 +537,7 @@ void Launcher::handleCreateProcess(const TrkResult &result)
void Launcher::handleWaitForFinished(const TrkResult &result)
{
logMessage(" FINISHED: " + stringFromArray(result.data));
+ setState(Disconnected);
emit finished();
}
diff --git a/src/shared/trk/launcher.h b/src/shared/trk/launcher.h
index 2c4881de6d19caec8896647a1210d3758697eb25..538d367e742a5d4797b34ead8a442d41cdbd6397 100644
--- a/src/shared/trk/launcher.h
+++ b/src/shared/trk/launcher.h
@@ -61,10 +61,21 @@ public:
ActionCopyInstallRun = ActionCopy | ActionInstall | ActionRun
};
+ enum State { Disconnected, Connecting, Connected,
+ WaitingForTrk, // This occurs only if the initial ping times out after
+ // a reasonable timeout, indicating that Trk is not
+ // running. Note that this will never happen with
+ // Bluetooth as communication immediately starts
+ // after connecting.
+ DeviceDescriptionReceived };
+
explicit Launcher(trk::Launcher::Actions startupActions = trk::Launcher::ActionPingOnly,
const TrkDevicePtr &trkDevice = TrkDevicePtr(),
QObject *parent = 0);
~Launcher();
+
+ State state() const;
+
void addStartupActions(trk::Launcher::Actions startupActions);
void setTrkServerName(const QString &name);
QString trkServerName() const;
@@ -98,12 +109,14 @@ signals:
void finished();
void applicationOutputReceived(const QString &output);
void copyProgress(int percent);
+ void stateChanged(int);
public slots:
void terminate();
private slots:
void handleResult(const trk::TrkResult &data);
+ void slotWaitingForTrk();
private:
// kill process and breakpoints
@@ -130,6 +143,7 @@ private:
void startInferiorIfNeeded();
void logMessage(const QString &msg);
+ void setState(State s);
LauncherPrivate *d;
};
diff --git a/src/shared/trk/trkutils.cpp b/src/shared/trk/trkutils.cpp
index 93df3937994f5fcc32513c57775dfebddeaed8dd..4b63cad0343007ea260a671bb4e917dd0924942e 100644
--- a/src/shared/trk/trkutils.cpp
+++ b/src/shared/trk/trkutils.cpp
@@ -98,8 +98,8 @@ QString Session::deviceDescription(unsigned verbose) const
if (fpTypeSize)
str << ", float size: " << fpTypeSize;
}
- str << ", Trk: v" << trkAppVersion.trkMajor << '.' << trkAppVersion.trkMinor
- << " Protocol: v" << trkAppVersion.protocolMajor << '.' << trkAppVersion.protocolMinor;
+ str << ", App TRK: v" << trkAppVersion.trkMajor << '.' << trkAppVersion.trkMinor
+ << " TRK protocol: v" << trkAppVersion.protocolMajor << '.' << trkAppVersion.protocolMinor;
}
return msg;
}
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index debe1ff8b2ae3449b169207badb6efd674b2c2ff..c92abc004df062a558865c10bdd81fb1444ceac2 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -10,11 +10,10 @@
#include <QtTest/QtTest>
//#include <QtTest/qtest_gui.h>
-#if (QT_POINTER_SIZE==4)
-# define POINTER_PRINTFORMAT "0x%x"
-#else
-# define POINTER_PRINTFORMAT "0x%lx"
-#endif
+static const char *pointerPrintFormat()
+{
+ return sizeof(quintptr) == sizeof(long) ? "0x%lx" : "0x%llx";
+}
#undef NS
#ifdef QT_NAMESPACE
@@ -393,7 +392,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
extraInt0, extraInt1, extraInt2, extraInt3);
QString expected(expected0);
char buf[100];
- sprintf(buf, POINTER_PRINTFORMAT, (uintptr_t)data);
+ sprintf(buf, pointerPrintFormat(), (uintptr_t)data);
if ((!expected.startsWith('t') && !expected.startsWith('f'))
|| expected.startsWith("type"))
expected = "tiname='$I',addr='$A'," + expected;
@@ -423,7 +422,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
QByteArray str(const void *p)
{
char buf[100];
- sprintf(buf, POINTER_PRINTFORMAT, (uintptr_t)p);
+ sprintf(buf, pointerPrintFormat(), (uintptr_t)p);
return buf;
}
@@ -1977,7 +1976,7 @@ void tst_Debugger::dumpQObjectSignalList()
"numchild='0',addr='$A',type='"NS"QObjectSignal'},"
"{name='21',value='columnsMoved(QModelIndex,int,int,QModelIndex,int)',"
"numchild='0',addr='$A',type='"NS"QObjectSignal'}]";
-
+
testDumper(expected << "0" << "0" << "0" << "0" << "0" << "0",
&m, NS"QObjectSignalList", true);
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 034e53221c192487f52370b72e3dde77040f2e55..1dc697467892dd45ba832dd878fe3e92d0da280b 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -17,7 +17,12 @@ bool checkUninitialized = false;
#include "gdb/gdbmi.h"
#include <sys/types.h>
-#include <unistd.h>
+
+#ifdef Q_OS_WIN
+# include <windows.h>
+#else
+# include <unistd.h>
+#endif
#undef NS
@@ -43,9 +48,11 @@ bool checkUninitialized = false;
#define gettid() QString("0x%1").arg((qulonglong)(void *)currentThread(), 0, 16)
-using namespace Debugger;
-using namespace Debugger::Internal;
-
+#ifdef Q_OS_WIN
+QString gdbBinary = "c:\\MinGw\\bin\\gdb.exe";
+#else
+QString gdbBinary = "./gdb";
+#endif
class Foo
{
@@ -89,6 +96,7 @@ private:
/////////////////////////////////////////////////////////////////////////
//
+//
// Helper stuff
//
/////////////////////////////////////////////////////////////////////////
@@ -135,8 +143,11 @@ class Thread : public QThread
public:
Thread(tst_Gdb *test);
+ void startup(QProcess *proc);
void run();
+ QString errorString() const { return m_errorString; }
+
public slots:
void readStandardOutput();
void readStandardError();
@@ -157,6 +168,7 @@ public:
int m_line; // line extracted from last "*stopped" message
QProcess *m_proc; // owned
tst_Gdb *m_test; // not owned
+ QString m_errorString;
};
class tst_Gdb : public QObject
@@ -166,7 +178,6 @@ class tst_Gdb : public QObject
public:
tst_Gdb();
- void initTestCase() {}
void cleanupTestCase();
void prepare(const QByteArray &function);
void run(const QByteArray &label, const QByteArray &expected,
@@ -177,80 +188,85 @@ signals:
void writeToGdb(const QByteArray &ba);
private slots:
- void dumpArray();
- void dumpMisc();
- void dumpFoo();
- void dumpQByteArray();
- void dumpQChar();
- void dumpQList_char_star();
- void dumpQList_char();
- void dumpQList_int();
- void dumpQList_QString();
- void dumpQList_QString3();
- void dumpQList_Int3();
- void dumpQStack();
- void dumpQString();
- void dumpQStringList();
- void dumpQWeakPointer();
- void dumpQVector();
-
- void dumpQHash();
+ void initTestCase();
+ void dump_array();
+ void dump_misc();
+ void dump_Foo();
+ void dump_QByteArray();
+ void dump_QChar();
+ void dump_QList_char();
+ void dump_QList_char_star();
+ void dump_QList_int();
+ void dump_QList_int_star();
+ void dump_QList_QString();
+ void dump_QList_QString3();
+ void dump_QList_Int3();
+ void dump_QStack();
+ void dump_QString();
+ void dump_QStringList();
+ void dump_QWeakPointer_11();
+ void dump_QWeakPointer_12();
+ void dump_QWeakPointer_13();
+ void dump_QWeakPointer_2();
+ void dump_QVector();
+
+ void dump_QHash();
public slots:
void dumperCompatibility();
#if 0
- void dumpQAbstractItemAndModelIndex();
- void dumpQAbstractItemModel();
- void dumpQDateTime();
- void dumpQDir();
- void dumpQFile();
- void dumpQFileInfo();
- void dumpQHashNode();
- void dumpQImage();
- void dumpQImageData();
- void dumpQLinkedList();
- void dumpQLocale();
- void dumpQMap();
- void dumpQMapNode();
- void dumpQObject();
- void dumpQObjectChildList();
- void dumpQObjectMethodList();
- void dumpQObjectPropertyList();
- void dumpQObjectSignal();
- void dumpQObjectSignalList();
- void dumpQObjectSlot();
- void dumpQObjectSlotList();
- void dumpQPixmap();
- void dumpQSharedPointer();
- void dumpQTextCodec();
- void dumpQVariant_invalid();
- void dumpQVariant_QString();
- void dumpQVariant_QStringList();
+ void dump_QAbstractItemAndModelIndex();
+ void dump_QAbstractItemModel();
+ void dump_QDateTime();
+ void dump_QDir();
+ void dump_QFile();
+ void dump_QFileInfo();
+ void dump_QHashNode();
+ void dump_QImage();
+ 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_QSharedPointer();
+ void dump_QTextCodec();
+ void dump_QVariant_invalid();
+ void dump_QVariant_QString();
+ void dump_QVariant_QStringList();
void dumpStdVector();
#endif
private:
#if 0
- void dumpQAbstractItemHelper(QModelIndex &index);
- void dumpQAbstractItemModelHelper(QAbstractItemModel &m);
- void dumpQDateTimeHelper(const QDateTime &d);
- void dumpQFileHelper(const QString &name, bool exists);
- template <typename K, typename V> void dumpQHashNodeHelper(QHash<K, V> &hash);
- void dumpQImageHelper(const QImage &img);
- void dumpQImageDataHelper(QImage &img);
- template <typename T> void dumpQLinkedListHelper(QLinkedList<T> &l);
- void dumpQLocaleHelper(QLocale &loc);
- template <typename K, typename V> void dumpQMapHelper(QMap<K, V> &m);
- template <typename K, typename V> void dumpQMapNodeHelper(QMap<K, V> &m);
- void dumpQObjectChildListHelper(QObject &o);
- void dumpQObjectSignalHelper(QObject &o, int sigNum);
+ void dump_QAbstractItemHelper(QModelIndex &index);
+ void dump_QAbstractItemModelHelper(QAbstractItemModel &m);
+ void dump_QDateTimeHelper(const QDateTime &d);
+ void dump_QFileHelper(const QString &name, bool exists);
+ template <typename K, typename V> void dump_QHashNodeHelper(QHash<K, V> &hash);
+ void dump_QImageHelper(const QImage &img);
+ void dump_QImageDataHelper(QImage &img);
+ template <typename T> void dump_QLinkedListHelper(QLinkedList<T> &l);
+ void dump_QLocaleHelper(QLocale &loc);
+ template <typename K, typename V> void dump_QMapHelper(QMap<K, V> &m);
+ template <typename K, typename V> void dump_QMapNodeHelper(QMap<K, V> &m);
+ void dump_QObjectChildListHelper(QObject &o);
+ void dump_QObjectSignalHelper(QObject &o, int sigNum);
#if QT_VERSION >= 0x040500
template <typename T>
- void dumpQSharedPointerHelper(QSharedPointer<T> &ptr);
+ void dump_QSharedPointerHelper(QSharedPointer<T> &ptr);
template <typename T>
- void dumpQWeakPointerHelper(QWeakPointer<T> &ptr);
+ void dump_QWeakPointerHelper(QWeakPointer<T> &ptr);
#endif
- void dumpQTextCodecHelper(QTextCodec *codec);
+ void dump_QTextCodecHelper(QTextCodec *codec);
#endif
private:
@@ -454,16 +470,22 @@ void getMapNodeParams(size_t &nodeSize, size_t &valOffset)
//
/////////////////////////////////////////////////////////////////////////
-Thread::Thread(tst_Gdb *test)
+Thread::Thread(tst_Gdb *test) : m_proc(0), m_test(test)
{
- moveToThread(this);
- m_test = test;
- m_proc = 0;
- m_proc = new QProcess;
- m_proc->moveToThread(this);
+#ifdef Q_OS_WIN
+ qDebug() << "\nTHREAD CREATED" << GetCurrentProcessId() << GetCurrentThreadId();
+#else
qDebug() << "\nTHREAD CREATED" << getpid() << gettid();
+#endif
+ moveToThread(this);
connect(m_test, SIGNAL(writeToGdb(QByteArray)),
- this, SLOT(writeToGdbRequested(QByteArray)));
+ this, SLOT(writeToGdbRequested(QByteArray)), Qt::QueuedConnection);
+}
+
+void Thread::startup(QProcess *proc)
+{
+ m_proc = proc;
+ m_proc->moveToThread(this);
connect(m_proc, SIGNAL(error(QProcess::ProcessError)),
this, SLOT(handleGdbError(QProcess::ProcessError)));
connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)),
@@ -567,9 +589,6 @@ void Thread::handleGdbStarted()
void Thread::run()
{
- //qDebug() << "\nTHREAD RUN" << getpid() << gettid();
- m_proc->start("./gdb -i mi --args ./tst_gdb run");
- m_proc->waitForStarted();
m_proc->write("break main\n");
m_proc->write("run\n");
m_proc->write("handle SIGSTOP stop pass\n");
@@ -587,11 +606,32 @@ void Thread::run()
tst_Gdb::tst_Gdb()
: m_thread(this)
{
- // FIXME: Wait until gdb proc is running.
- QTest::qWait(600);
- QFile file("tst_gdb.cpp");
- Q_ASSERT(file.open(QIODevice::ReadOnly));
+}
+
+void tst_Gdb::initTestCase()
+{
+ //qDebug() << "\nTHREAD RUN" << getpid() << gettid();
+ QProcess *gdbProc = new QProcess;
+ QStringList args;
+ args << QLatin1String("-i")
+ << QLatin1String("mi") << QLatin1String("--args")
+ << qApp->applicationFilePath();
+ qDebug() << "Starting" << gdbBinary << args;
+ gdbProc->start(gdbBinary, args);
+ if (!gdbProc->waitForStarted()) {
+ const QString msg = QString::fromLatin1("Unable to run %1: %2").arg(gdbBinary, gdbProc->errorString());
+ delete gdbProc;
+ QSKIP(msg.toLatin1().constData(), SkipAll);
+ }
+
+ const QString fileName = "tst_gdb.cpp";
+ QFile file(fileName);
+ if (!file.open(QIODevice::ReadOnly)) {
+ const QString msg = QString::fromLatin1("Unable to open %1: %2").arg(fileName, file.errorString());
+ QSKIP(msg.toLatin1().constData(), SkipAll);
+ }
+
QByteArray funcName;
const QByteArrayList bal = file.readAll().split('\n');
Q_ASSERT(bal.size() > 100);
@@ -605,6 +645,7 @@ tst_Gdb::tst_Gdb()
m_lineForLabel[funcName + ba.mid(7, pos - 8)] = i + 1;
}
}
+ m_thread.startup(gdbProc);
}
void tst_Gdb::prepare(const QByteArray &function)
@@ -712,16 +753,16 @@ void tst_Gdb::cleanupTestCase()
///////////////////////////// Foo structure /////////////////////////////////
-void dumpFoo()
+void dump_Foo()
{
/* A */ Foo f;
/* B */ f.doit();
/* D */ (void) 0;
}
-void tst_Gdb::dumpFoo()
+void tst_Gdb::dump_Foo()
{
- prepare("dumpFoo");
+ prepare("dump_Foo");
next();
run("B","{iname='local.f',addr='-',name='f',type='Foo',"
"value='-',numchild='5'}", "", 0);
@@ -742,19 +783,19 @@ void tst_Gdb::dumpFoo()
///////////////////////////// Array ///////////////////////////////////////
-void dumpArray_char()
+void dump_array_char()
{
/* A */ const char s[] = "XYZ";
/* B */ (void) &s; }
-void dumpArray_int()
+void dump_array_int()
{
/* A */ int s[] = {1, 2, 3};
/* B */ (void) s; }
-void tst_Gdb::dumpArray()
+void tst_Gdb::dump_array()
{
- prepare("dumpArray_char");
+ prepare("dump_array_char");
next();
// FIXME: numchild should be '4', not '1'
run("B","{iname='local.s',addr='-',name='s',type='char [4]',"
@@ -765,7 +806,7 @@ void tst_Gdb::dumpArray()
"{value='0 '\\\\000''}]}",
"local.s");
- prepare("dumpArray_int");
+ prepare("dump_array_int");
next();
// FIXME: numchild should be '3', not '1'
run("B","{iname='local.s',addr='-',name='s',type='int [3]',"
@@ -779,16 +820,16 @@ void tst_Gdb::dumpArray()
///////////////////////////// Misc stuff /////////////////////////////////
-void dumpMisc()
+void dump_misc()
{
/* A */ int *s = new int(1);
/* B */ *s += 1;
/* D */ (void) 0;
}
-void tst_Gdb::dumpMisc()
+void tst_Gdb::dump_misc()
{
- prepare("dumpMisc");
+ prepare("dump_misc");
next();
run("B","{iname='local.s',addr='-',name='s',type='int *',"
"value='-',numchild='1'}", "", 0);
@@ -798,7 +839,7 @@ void tst_Gdb::dumpMisc()
}
#if 0
-void tst_Gdb::dumpQAbstractItemHelper(QModelIndex &index)
+void tst_Gdb::dump_QAbstractItemHelper(QModelIndex &index)
{
const QAbstractItemModel *model = index.model();
const QString &rowStr = N(index.row());
@@ -834,7 +875,7 @@ void tst_Gdb::dumpQAbstractItemHelper(QModelIndex &index)
testDumper(expected, &index, NS"QAbstractItem", true, indexSpecValue);
}
-void tst_Gdb::dumpQAbstractItemAndModelIndex()
+void tst_Gdb::dump_QAbstractItemAndModelIndex()
{
class PseudoTreeItemModel : public QAbstractItemModel
{
@@ -928,7 +969,7 @@ void tst_Gdb::dumpQAbstractItemAndModelIndex()
// Case 2: ModelIndex with one child.
QModelIndex index2 = m2.index(0, 0);
- dumpQAbstractItemHelper(index2);
+ dump_QAbstractItemHelper(index2);
qDebug() << "FIXME: invalid indices should not have children";
testDumper(QByteArray("type='$T',value='(0, 0)',numchild='5',children=["
@@ -946,7 +987,7 @@ void tst_Gdb::dumpQAbstractItemAndModelIndex()
// Case 3: ModelIndex with two children.
QModelIndex index3 = m2.index(1, 0);
- dumpQAbstractItemHelper(index3);
+ dump_QAbstractItemHelper(index3);
testDumper(QByteArray("type='$T',value='(1, 0)',numchild='5',children=["
"{name='row',value='1',type='int',numchild='0'},"
@@ -982,7 +1023,7 @@ void tst_Gdb::dumpQAbstractItemAndModelIndex()
&index4, NS"QModelIndex", true);
}
-void tst_Gdb::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
+void tst_Gdb::dump_QAbstractItemModelHelper(QAbstractItemModel &m)
{
QByteArray address = ptrToBa(&m);
QByteArray expected = QByteArray("tiname='iname',addr='%',"
@@ -1015,55 +1056,55 @@ void tst_Gdb::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
testDumper(expected, &m, NS"QAbstractItemModel", true);
}
-void tst_Gdb::dumpQAbstractItemModel()
+void tst_Gdb::dump_QAbstractItemModel()
{
// Case 1: No rows, one column.
QStringList strList;
QStringListModel model(strList);
- dumpQAbstractItemModelHelper(model);
+ dump_QAbstractItemModelHelper(model);
// Case 2: One row, one column.
strList << "String 1";
model.setStringList(strList);
- dumpQAbstractItemModelHelper(model);
+ dump_QAbstractItemModelHelper(model);
// Case 3: Two rows, one column.
strList << "String 2";
model.setStringList(strList);
- dumpQAbstractItemModelHelper(model);
+ dump_QAbstractItemModelHelper(model);
// Case 4: No rows, two columns.
QStandardItemModel model2(0, 2);
- dumpQAbstractItemModelHelper(model2);
+ dump_QAbstractItemModelHelper(model2);
// Case 5: One row, two columns.
QStandardItem item1("Item (0,0)");
QStandardItem item2("(Item (0,1)");
model2.appendRow(QList<QStandardItem *>() << &item1 << &item2);
- dumpQAbstractItemModelHelper(model2);
+ dump_QAbstractItemModelHelper(model2);
// Case 6: Two rows, two columns
QStandardItem item3("Item (1,0");
QStandardItem item4("Item (1,1)");
model2.appendRow(QList<QStandardItem *>() << &item3 << &item4);
- dumpQAbstractItemModelHelper(model);
+ dump_QAbstractItemModelHelper(model);
}
#endif
-void dumpQByteArrayTest()
+void dump_QByteArray()
{
/* A */ QByteArray ba; // Empty object.
/* B */ ba.append('a'); // One element.
/* C */ ba.append('b'); // Two elements.
/* D */ ba = QByteArray(101, 'a'); // > 100 elements.
- /* E */ ba = QByteArray("abc\a\n\r\e\'\"?"); // Mixed.
+ /* E */ ba = QByteArray("abc\a\n\r\033\'\"?"); // Mixed.
/* F */ (void) 0;
}
-void tst_Gdb::dumpQByteArray()
+void tst_Gdb::dump_QByteArray()
{
- prepare("dumpQByteArrayTest");
- if (1 || checkUninitialized)
+ prepare("dump_QByteArray");
+ if (checkUninitialized)
run("A","{iname='local.ba',addr='-',name='ba',type='"NS"QByteArray',"
"value='<not in scope>',numchild='0'}");
next();
@@ -1095,7 +1136,7 @@ void tst_Gdb::dumpQByteArray()
"local.ba");
}
-void dumpQCharTest()
+void dump_QChar()
{
/* A */ QChar c('X'); // Printable ASCII character.
/* B */ c = QChar(0x600); // Printable non-ASCII character.
@@ -1104,9 +1145,9 @@ void dumpQCharTest()
/* E */ c = QChar::fromAscii('?'); // The replacement character.
/* F */ (void) 0; }
-void tst_Gdb::dumpQChar()
+void tst_Gdb::dump_QChar()
{
- prepare("dumpQCharTest");
+ prepare("dump_QChar");
next();
// Case 1: Printable ASCII character.
@@ -1135,7 +1176,7 @@ void tst_Gdb::dumpQChar()
}
#if 0
-void tst_Gdb::dumpQDateTimeHelper(const QDateTime &d)
+void tst_Gdb::dump_QDateTimeHelper(const QDateTime &d)
{
QByteArray value;
if (d.isNull())
@@ -1161,18 +1202,18 @@ void tst_Gdb::dumpQDateTimeHelper(const QDateTime &d)
testDumper(expected, &d, NS"QDateTime", true);
}
-void tst_Gdb::dumpQDateTime()
+void tst_Gdb::dump_QDateTime()
{
// Case 1: Null object.
QDateTime d;
- dumpQDateTimeHelper(d);
+ dump_QDateTimeHelper(d);
// Case 2: Non-null object.
d = QDateTime::currentDateTime();
- dumpQDateTimeHelper(d);
+ dump_QDateTimeHelper(d);
}
-void tst_Gdb::dumpQDir()
+void tst_Gdb::dump_QDir()
{
// Case 1: Current working directory.
QDir dir = QDir::current();
@@ -1193,7 +1234,7 @@ void tst_Gdb::dumpQDir()
&dir, NS"QDir", true);
}
-void tst_Gdb::dumpQFileHelper(const QString &name, bool exists)
+void tst_Gdb::dump_QFileHelper(const QString &name, bool exists)
{
QFile file(name);
QByteArray filenameAsBase64 = utfToBase64(name);
@@ -1205,21 +1246,21 @@ void tst_Gdb::dumpQFileHelper(const QString &name, bool exists)
&file, NS"QFile", true);
}
-void tst_Gdb::dumpQFile()
+void tst_Gdb::dump_QFile()
{
// Case 1: Empty file name => Does not exist.
- dumpQFileHelper("", false);
+ dump_QFileHelper("", false);
// Case 2: File that is known to exist.
QTemporaryFile file;
file.open();
- dumpQFileHelper(file.fileName(), true);
+ dump_QFileHelper(file.fileName(), true);
// Case 3: File with a name that most likely does not exist.
- dumpQFileHelper("jfjfdskjdflsdfjfdls", false);
+ dump_QFileHelper("jfjfdskjdflsdfjfdls", false);
}
-void tst_Gdb::dumpQFileInfo()
+void tst_Gdb::dump_QFileInfo()
{
QFileInfo fi(".");
QByteArray expected("value='%',valueencoded='2',type='$T',numchild='3',"
@@ -1304,7 +1345,7 @@ void tst_Gdb::dumpQFileInfo()
testDumper(expected, &fi, NS"QFileInfo", true);
}
-void tst_Gdb::dumpQHash()
+void tst_Gdb::dump_QHash()
{
QHash<QString, QList<int> > hash;
hash.insert("Hallo", QList<int>());
@@ -1314,7 +1355,7 @@ void tst_Gdb::dumpQHash()
}
template <typename K, typename V>
-void tst_Gdb::dumpQHashNodeHelper(QHash<K, V> &hash)
+void tst_Gdb::dump_QHashNodeHelper(QHash<K, V> &hash)
{
typename QHash<K, V>::iterator it = hash.begin();
typedef QHashNode<K, V> HashNode;
@@ -1335,30 +1376,30 @@ void tst_Gdb::dumpQHashNodeHelper(QHash<K, V> &hash)
getMapType<K, V>(), "", sizeof(it.key()), sizeof(it.value()));
}
-void tst_Gdb::dumpQHashNode()
+void tst_Gdb::dump_QHashNode()
{
// Case 1: simple type -> simple type.
QHash<int, int> hash1;
hash1[2] = 3;
- dumpQHashNodeHelper(hash1);
+ dump_QHashNodeHelper(hash1);
// Case 2: simple type -> composite type.
QHash<int, QString> hash2;
hash2[5] = "String 7";
- dumpQHashNodeHelper(hash2);
+ dump_QHashNodeHelper(hash2);
// Case 3: composite type -> simple type
QHash<QString, int> hash3;
hash3["String 11"] = 13;
- dumpQHashNodeHelper(hash3);
+ dump_QHashNodeHelper(hash3);
// Case 4: composite type -> composite type
QHash<QString, QString> hash4;
hash4["String 17"] = "String 19";
- dumpQHashNodeHelper(hash4);
+ dump_QHashNodeHelper(hash4);
}
-void tst_Gdb::dumpQImageHelper(const QImage &img)
+void tst_Gdb::dump_QImageHelper(const QImage &img)
{
QByteArray expected = "value='(%x%)',type='"NS"QImage',numchild='1',"
"children=[{name='data',type='"NS"QImageData',addr='%'}]"
@@ -1368,22 +1409,22 @@ void tst_Gdb::dumpQImageHelper(const QImage &img)
testDumper(expected, &img, NS"QImage", true);
}
-void tst_Gdb::dumpQImage()
+void tst_Gdb::dump_QImage()
{
// Case 1: Null image.
QImage img;
- dumpQImageHelper(img);
+ dump_QImageHelper(img);
// Case 2: Normal image.
img = QImage(3, 700, QImage::Format_RGB555);
- dumpQImageHelper(img);
+ dump_QImageHelper(img);
// Case 3: Invalid image.
img = QImage(100, 0, QImage::Format_Invalid);
- dumpQImageHelper(img);
+ dump_QImageHelper(img);
}
-void tst_Gdb::dumpQImageDataHelper(QImage &img)
+void tst_Gdb::dump_QImageDataHelper(QImage &img)
{
const QByteArray ba(QByteArray::fromRawData((const char*) img.bits(), img.numBytes()));
QByteArray expected = QByteArray("tiname='$I',addr='$A',type='"NS"QImageData',").
@@ -1393,23 +1434,23 @@ void tst_Gdb::dumpQImageDataHelper(QImage &img)
testDumper(expected, &img, NS"QImageData", false);
}
-void tst_Gdb::dumpQImageData()
+void tst_Gdb::dump_QImageData()
{
// Case 1: Null image.
QImage img;
- dumpQImageDataHelper(img);
+ dump_QImageDataHelper(img);
// Case 2: Normal image.
img = QImage(3, 700, QImage::Format_RGB555);
- dumpQImageDataHelper(img);
+ dump_QImageDataHelper(img);
// Case 3: Invalid image.
img = QImage(100, 0, QImage::Format_Invalid);
- dumpQImageDataHelper(img);
+ dump_QImageDataHelper(img);
}
template <typename T>
-void tst_Gdb::dumpQLinkedListHelper(QLinkedList<T> &l)
+void tst_Gdb::dump_QLinkedListHelper(QLinkedList<T> &l)
{
const int size = qMin(l.size(), 1000);
const QString &sizeStr = N(size);
@@ -1448,35 +1489,35 @@ void tst_Gdb::dumpQLinkedListHelper(QLinkedList<T> &l)
testDumper(expected, &l, NS"QLinkedList", true, elemTypeStr);
}
-void tst_Gdb::dumpQLinkedList()
+void tst_Gdb::dump_QLinkedList()
{
// Case 1: Simple element type.
QLinkedList<int> l;
// Case 1.1: Empty list.
- dumpQLinkedListHelper(l);
+ dump_QLinkedListHelper(l);
// Case 1.2: One element.
l.append(2);
- dumpQLinkedListHelper(l);
+ dump_QLinkedListHelper(l);
// Case 1.3: Two elements
l.append(3);
- dumpQLinkedListHelper(l);
+ dump_QLinkedListHelper(l);
// Case 2: Composite element type.
QLinkedList<QString> l2;
// Case 2.1: Empty list.
- dumpQLinkedListHelper(l2);
+ dump_QLinkedListHelper(l2);
// Case 2.2: One element.
l2.append("Teststring 1");
- dumpQLinkedListHelper(l2);
+ dump_QLinkedListHelper(l2);
// Case 2.3: Two elements.
l2.append("Teststring 2");
- dumpQLinkedListHelper(l2);
+ dump_QLinkedListHelper(l2);
// Case 2.4: > 1000 elements.
for (int i = 3; i <= 1002; ++i)
@@ -1487,11 +1528,11 @@ void tst_Gdb::dumpQLinkedList()
l3.append(new int(5));
l3.append(new int(7));
l3.append(0);
- dumpQLinkedListHelper(l3);
+ dump_QLinkedListHelper(l3);
}
#if 0
- void tst_Gdb::dumpQLinkedList()
+ void tst_Gdb::dump_QLinkedList()
{
// Case 1: Simple element type.
QLinkedList<int> l;
@@ -1566,12 +1607,12 @@ void tst_Gdb::dumpQLinkedList()
l3.append(new int(5));
l3.append(new int(7));
l3.append(0);
- //dumpQLinkedListHelper(l3);
+ //dump_QLinkedListHelper(l3);
testDumper("", &l, NS"QLinkedList", true, NS"QString");
}
#endif
-void tst_Gdb::dumpQLocaleHelper(QLocale &loc)
+void tst_Gdb::dump_QLocaleHelper(QLocale &loc)
{
QByteArray expected = QByteArray("value='%',type='$T',numchild='8',"
"children=[{name='country',%},"
@@ -1602,23 +1643,23 @@ void tst_Gdb::dumpQLocaleHelper(QLocale &loc)
testDumper(expected, &loc, NS"QLocale", true);
}
-void tst_Gdb::dumpQLocale()
+void tst_Gdb::dump_QLocale()
{
QLocale english(QLocale::English);
- dumpQLocaleHelper(english);
+ dump_QLocaleHelper(english);
QLocale german(QLocale::German);
- dumpQLocaleHelper(german);
+ dump_QLocaleHelper(german);
QLocale chinese(QLocale::Chinese);
- dumpQLocaleHelper(chinese);
+ dump_QLocaleHelper(chinese);
QLocale swahili(QLocale::Swahili);
- dumpQLocaleHelper(swahili);
+ dump_QLocaleHelper(swahili);
}
template <typename K, typename V>
- void tst_Gdb::dumpQMapHelper(QMap<K, V> &map)
+ void tst_Gdb::dump_QMapHelper(QMap<K, V> &map)
{
QByteArray sizeStr(valToString(map.size()));
size_t nodeSize;
@@ -1669,71 +1710,71 @@ template <typename K, typename V>
true, getMapType<K,V>(), "", 0, 0, nodeSize, valOff);
}
-void tst_Gdb::dumpQMap()
+void tst_Gdb::dump_QMap()
{
// Case 1: Simple type -> simple type.
QMap<int, int> map1;
// Case 1.1: Empty map.
- dumpQMapHelper(map1);
+ dump_QMapHelper(map1);
// Case 1.2: One element.
map1[2] = 3;
- dumpQMapHelper(map1);
+ dump_QMapHelper(map1);
// Case 1.3: Two elements.
map1[3] = 5;
- dumpQMapHelper(map1);
+ dump_QMapHelper(map1);
// Case 2: Simple type -> composite type.
QMap<int, QString> map2;
// Case 2.1: Empty Map.
- dumpQMapHelper(map2);
+ dump_QMapHelper(map2);
// Case 2.2: One element.
map2[5] = "String 7";
- dumpQMapHelper(map2);
+ dump_QMapHelper(map2);
// Case 2.3: Two elements.
map2[7] = "String 11";
- dumpQMapHelper(map2);
+ dump_QMapHelper(map2);
// Case 3: Composite type -> simple type.
QMap<QString, int> map3;
// Case 3.1: Empty map.
- dumpQMapHelper(map3);
+ dump_QMapHelper(map3);
// Case 3.2: One element.
map3["String 13"] = 11;
- dumpQMapHelper(map3);
+ dump_QMapHelper(map3);
// Case 3.3: Two elements.
map3["String 17"] = 13;
- dumpQMapHelper(map3);
+ dump_QMapHelper(map3);
// Case 4: Composite type -> composite type.
QMap<QString, QString> map4;
// Case 4.1: Empty map.
- dumpQMapHelper(map4);
+ dump_QMapHelper(map4);
// Case 4.2: One element.
map4["String 19"] = "String 23";
- dumpQMapHelper(map4);
+ dump_QMapHelper(map4);
// Case 4.3: Two elements.
map4["String 29"] = "String 31";
- dumpQMapHelper(map4);
+ dump_QMapHelper(map4);
// Case 4.4: Different value, same key (multimap functionality).
map4["String 29"] = "String 37";
- dumpQMapHelper(map4);
+ dump_QMapHelper(map4);
}
template <typename K, typename V>
- void tst_Gdb::dumpQMapNodeHelper(QMap<K, V> &m)
+ void tst_Gdb::dump_QMapNodeHelper(QMap<K, V> &m)
{
typename QMap<K, V>::iterator it = m.begin();
const K &key = it.key();
@@ -1753,30 +1794,30 @@ template <typename K, typename V>
true, getMapType<K,V>(), "", 0, 0, nodeSize, valOffset);
}
-void tst_Gdb::dumpQMapNode()
+void tst_Gdb::dump_QMapNode()
{
// Case 1: simple type -> simple type.
QMap<int, int> map;
map[2] = 3;
- dumpQMapNodeHelper(map);
+ dump_QMapNodeHelper(map);
// Case 2: simple type -> composite type.
QMap<int, QString> map2;
map2[3] = "String 5";
- dumpQMapNodeHelper(map2);
+ dump_QMapNodeHelper(map2);
// Case 3: composite type -> simple type.
QMap<QString, int> map3;
map3["String 7"] = 11;
- dumpQMapNodeHelper(map3);
+ dump_QMapNodeHelper(map3);
// Case 4: composite type -> composite type.
QMap<QString, QString> map4;
map4["String 13"] = "String 17";
- dumpQMapNodeHelper(map4);
+ dump_QMapNodeHelper(map4);
}
-void tst_Gdb::dumpQObject()
+void tst_Gdb::dump_QObject()
{
QObject parent;
testDumper("value='',valueencoded='2',type='$T',displayedtype='QObject',"
@@ -1835,7 +1876,7 @@ void tst_Gdb::dumpQObject()
&child, NS"QObject", false);
}
-void tst_Gdb::dumpQObjectChildListHelper(QObject &o)
+void tst_Gdb::dump_QObjectChildListHelper(QObject &o)
{
const QObjectList children = o.children();
const int size = children.size();
@@ -1855,22 +1896,22 @@ void tst_Gdb::dumpQObjectChildListHelper(QObject &o)
testDumper(expected, &o, NS"QObjectChildList", true);
}
-void tst_Gdb::dumpQObjectChildList()
+void tst_Gdb::dump_QObjectChildList()
{
// Case 1: Object with no children.
QObject o;
- dumpQObjectChildListHelper(o);
+ dump_QObjectChildListHelper(o);
// Case 2: Object with one child.
QObject o2(&o);
- dumpQObjectChildListHelper(o);
+ dump_QObjectChildListHelper(o);
// Case 3: Object with two children.
QObject o3(&o);
- dumpQObjectChildListHelper(o);
+ dump_QObjectChildListHelper(o);
}
-void tst_Gdb::dumpQObjectMethodList()
+void tst_Gdb::dump_QObjectMethodList()
{
QStringListModel m;
testDumper("addr='<synthetic>',type='$T',numchild='20',"
@@ -1898,7 +1939,7 @@ void tst_Gdb::dumpQObjectMethodList()
&m, NS"QObjectMethodList", true);
}
-void tst_Gdb::dumpQObjectPropertyList()
+void tst_Gdb::dump_QObjectPropertyList()
{
// Case 1: Model without a parent.
QStringListModel m(QStringList() << "Test1" << "Test2");
@@ -1951,7 +1992,7 @@ public:
typedef QVector<QObjectPrivate::ConnectionList> ConnLists;
-void tst_Gdb::dumpQObjectSignalHelper(QObject &o, int sigNum)
+void tst_Gdb::dump_QObjectSignalHelper(QObject &o, int sigNum)
{
//qDebug() << o.objectName() << sigNum;
QByteArray expected("addr='<synthetic>',numchild='1',type='"NS"QObjectSignal'");
@@ -1995,7 +2036,7 @@ void tst_Gdb::dumpQObjectSignalHelper(QObject &o, int sigNum)
testDumper(expected, &o, NS"QObjectSignal", true, "", "", sigNum);
}
-void tst_Gdb::dumpQObjectSignal()
+void tst_Gdb::dump_QObjectSignal()
{
// Case 1: Simple QObject.
QObject o;
@@ -2007,7 +2048,7 @@ void tst_Gdb::dumpQObjectSignal()
// Case 2: QAbstractItemModel with no connections.
QStringListModel m(QStringList() << "Test1" << "Test2");
for (int signalIndex = 0; signalIndex < 17; ++signalIndex)
- dumpQObjectSignalHelper(m, signalIndex);
+ dump_QObjectSignalHelper(m, signalIndex);
// Case 3: QAbstractItemModel with connections to itself and to another
// object, using different connection types.
@@ -2027,10 +2068,10 @@ void tst_Gdb::dumpQObjectSignal()
&m, SLOT(revert()), Qt::UniqueConnection);
#endif
for (int signalIndex = 0; signalIndex < 17; ++signalIndex)
- dumpQObjectSignalHelper(m, signalIndex);
+ dump_QObjectSignalHelper(m, signalIndex);
}
-void tst_Gdb::dumpQObjectSignalList()
+void tst_Gdb::dump_QObjectSignalList()
{
// Case 1: Simple QObject.
QObject o;
@@ -2120,7 +2161,7 @@ QByteArray slotIndexList(const QObject *ob)
return slotIndices;
}
-void tst_Gdb::dumpQObjectSlot()
+void tst_Gdb::dump_QObjectSlot()
{
// Case 1: Simple QObject.
QObject o;
@@ -2176,7 +2217,7 @@ void tst_Gdb::dumpQObjectSlot()
}
-void tst_Gdb::dumpQObjectSlotList()
+void tst_Gdb::dump_QObjectSlotList()
{
// Case 1: Simple QObject.
QObject o;
@@ -2227,7 +2268,7 @@ void tst_Gdb::dumpQObjectSlotList()
&m, NS"QObjectSlotList", true);
}
-void tst_Gdb::dumpQPixmap()
+void tst_Gdb::dump_QPixmap()
{
// Case 1: Null Pixmap.
QPixmap p;
@@ -2255,7 +2296,7 @@ void tst_Gdb::dumpQPixmap()
#if QT_VERSION >= 0x040500
template<typename T>
-void tst_Gdb::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
+void tst_Gdb::dump_QSharedPointerHelper(QSharedPointer<T> &ptr)
{
struct Cheater : public QSharedPointer<T>
{
@@ -2294,54 +2335,54 @@ void tst_Gdb::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
}
#endif
-void tst_Gdb::dumpQSharedPointer()
+void tst_Gdb::dump_QSharedPointer()
{
#if QT_VERSION >= 0x040500
// Case 1: Simple type.
// Case 1.1: Null pointer.
QSharedPointer<int> simplePtr;
- dumpQSharedPointerHelper(simplePtr);
+ dump_QSharedPointerHelper(simplePtr);
// Case 1.2: Non-null pointer,
QSharedPointer<int> simplePtr2(new int(99));
- dumpQSharedPointerHelper(simplePtr2);
+ dump_QSharedPointerHelper(simplePtr2);
// Case 1.3: Shared pointer.
QSharedPointer<int> simplePtr3 = simplePtr2;
- dumpQSharedPointerHelper(simplePtr2);
+ dump_QSharedPointerHelper(simplePtr2);
// Case 1.4: Weak pointer.
QWeakPointer<int> simplePtr4(simplePtr2);
- dumpQSharedPointerHelper(simplePtr2);
+ dump_QSharedPointerHelper(simplePtr2);
// Case 2: Composite type.
// Case 1.1: Null pointer.
QSharedPointer<QString> compositePtr;
// TODO: This case is not handled in gdbmacros.cpp (segfault!)
- //dumpQSharedPointerHelper(compoistePtr);
+ //dump_QSharedPointerHelper(compoistePtr);
// Case 1.2: Non-null pointer,
QSharedPointer<QString> compositePtr2(new QString("Test"));
- dumpQSharedPointerHelper(compositePtr2);
+ dump_QSharedPointerHelper(compositePtr2);
// Case 1.3: Shared pointer.
QSharedPointer<QString> compositePtr3 = compositePtr2;
- dumpQSharedPointerHelper(compositePtr2);
+ dump_QSharedPointerHelper(compositePtr2);
// Case 1.4: Weak pointer.
QWeakPointer<QString> compositePtr4(compositePtr2);
- dumpQSharedPointerHelper(compositePtr2);
+ dump_QSharedPointerHelper(compositePtr2);
#endif
}
-void tst_Gdb::dumpQVariant_invalid()
+void tst_Gdb::dump_QVariant_invalid()
{
QVariant v;
testDumper("value='(invalid)',type='$T',numchild='0'",
&v, NS"QVariant", false);
}
-void tst_Gdb::dumpQVariant_QString()
+void tst_Gdb::dump_QVariant_QString()
{
QVariant v = "abc";
testDumper("value='KFFTdHJpbmcpICJhYmMi',valueencoded='5',type='$T',"
@@ -2356,7 +2397,7 @@ void tst_Gdb::dumpQVariant_QString()
*/
}
-void tst_Gdb::dumpQVariant_QStringList()
+void tst_Gdb::dump_QVariant_QStringList()
{
QVariant v = QStringList() << "Hi";
testDumper("value='(QStringList) ',type='$T',numchild='1',"
@@ -2366,7 +2407,7 @@ void tst_Gdb::dumpQVariant_QStringList()
&v, NS"QVariant", true);
}
-void tst_Gdb::dumpStdVector()
+void tst_Gdb::dump_StdVector()
{
std::vector<std::list<int> *> vector;
QByteArray inner = "std::list<int> *";
@@ -2393,7 +2434,7 @@ void tst_Gdb::dumpStdVector()
vector.push_back(0);
}
-void tst_Gdb::dumpQTextCodecHelper(QTextCodec *codec)
+void tst_Gdb::dump_QTextCodecHelper(QTextCodec *codec)
{
const QByteArray name = codec->name().toBase64();
QByteArray expected = QByteArray("value='%',valueencoded='1',type='$T',"
@@ -2403,51 +2444,20 @@ void tst_Gdb::dumpQTextCodecHelper(QTextCodec *codec)
testDumper(expected, codec, NS"QTextCodec", true);
}
-void tst_Gdb::dumpQTextCodec()
+void tst_Gdb::dump_QTextCodec()
{
const QList<QByteArray> &codecNames = QTextCodec::availableCodecs();
foreach (const QByteArray &codecName, codecNames)
- dumpQTextCodecHelper(QTextCodec::codecForName(codecName));
+ dump_QTextCodecHelper(QTextCodec::codecForName(codecName));
}
-#if QT_VERSION >= 0x040500
-template <typename T1, typename T2>
- size_t offsetOf(const T1 *klass, const T2 *member)
-{
- return static_cast<size_t>(reinterpret_cast<const char *>(member) -
- reinterpret_cast<const char *>(klass));
-}
-
-template <typename T>
-void tst_Gdb::dumpQWeakPointerHelper(QWeakPointer<T> &ptr)
-{
- typedef QtSharedPointer::ExternalRefCountData Data;
- const size_t dataOffset = 0;
- const Data *d = *reinterpret_cast<const Data **>(
- reinterpret_cast<const char **>(&ptr) + dataOffset);
- const int *weakRefPtr = reinterpret_cast<const int *>(&d->weakref);
- const int *strongRefPtr = reinterpret_cast<const int *>(&d->strongref);
- T *data = ptr.toStrongRef().data();
- const QString dataStr = valToString(*data);
- QByteArray expected("value='");
- if (isSimpleType<T>())
- expected.append(dataStr);
- expected.append("',valuedisabled='true',numchild='1',children=[{name='data',addr='").
- append(ptrToBa(data)).append("',type='").append(typeToString<T>()).
- append("',value='").append(dataStr).append("'},{name='weakref',value='").
- append(valToString(*weakRefPtr)).append("',type='int',addr='").
- append(ptrToBa(weakRefPtr)).append("',numchild='0'},{name='strongref',value='").
- append(valToString(*strongRefPtr)).append("',type='int',addr='").
- append(ptrToBa(strongRefPtr)).append("',numchild='0'}]");
- testDumper(expected, &ptr, NS"QWeakPointer", true, typeToString<T>());
-}
-#endif
#endif // #if 0
///////////////////////////// QWeakPointer /////////////////////////////////
#if QT_VERSION >= 0x040500
-void dumpQWeakPointer_11()
+
+void dump_QWeakPointer_11()
{
// Case 1: Simple type.
// Case 1.1: Null pointer.
@@ -2456,7 +2466,23 @@ void dumpQWeakPointer_11()
/* B */ (void) 0;
}
-void dumpQWeakPointer_12()
+void tst_Gdb::dump_QWeakPointer_11()
+{
+ // Case 1.1: Null pointer.
+ prepare("dump_QWeakPointer_11");
+ if (checkUninitialized)
+ run("A","{iname='local.sp',addr='-',name='sp',"
+ "type='"NS"QSharedPointer<int>',value='<not in scope>',numchild='0'}");
+ next();
+ next();
+ run("B","{iname='local.sp',addr='-',name='sp',"
+ "type='"NS"QSharedPointer<int>',value='<null>',numchild='0'},"
+ "{iname='local.wp',addr='-',name='wp',"
+ "type='"NS"QWeakPointer<int>',value='<null>',numchild='0'}");
+}
+
+
+void dump_QWeakPointer_12()
{
// Case 1.2: Weak pointer is unique.
/* A */ QSharedPointer<int> sp(new int(99));
@@ -2464,103 +2490,118 @@ void dumpQWeakPointer_12()
/* B */ (void) 0;
}
-void dumpQWeakPointer_13()
+void tst_Gdb::dump_QWeakPointer_12()
+{
+ // Case 1.2: Weak pointer is unique.
+ prepare("dump_QWeakPointer_12");
+ if (checkUninitialized)
+ run("A","{iname='local.sp',addr='-',name='sp',"
+ "type='"NS"QSharedPointer<int>',value='<not in scope>',numchild='0'}");
+ next();
+ next();
+ run("B","{iname='local.sp',addr='-',name='sp',"
+ "type='"NS"QSharedPointer<int>',value='',numchild='3'},"
+ "{iname='local.wp',addr='-',name='wp',"
+ "type='"NS"QWeakPointer<int>',value='',numchild='3'}");
+ run("B","{iname='local.sp',addr='-',name='sp',"
+ "type='"NS"QSharedPointer<int>',value='',numchild='3',children=["
+ "{name='data',type='int',value='99',numchild='0'},"
+ "{name='weakref',value='2',type='int',numchild='0'},"
+ "{name='strongref',value='2',type='int',numchild='0'}]},"
+ "{iname='local.wp',addr='-',name='wp',"
+ "type='"NS"QWeakPointer<int>',value='',numchild='3',children=["
+ "{name='data',type='int',value='99',numchild='0'},"
+ "{name='weakref',value='2',type='int',numchild='0'},"
+ "{name='strongref',value='2',type='int',numchild='0'}]}",
+ "local.sp,local.wp");
+}
+
+
+void dump_QWeakPointer_13()
{
// Case 1.3: There are other weak pointers.
/* A */ QSharedPointer<int> sp(new int(99));
/* */ QWeakPointer<int> wp = sp.toWeakRef();
+ /* */ QWeakPointer<int> wp2 = sp.toWeakRef();
/* B */ (void) 0;
}
-void dumpQWeakPointer_14()
+void tst_Gdb::dump_QWeakPointer_13()
{
- // Case 1.4: There are other strong shared pointers as well.
- /* A */ QSharedPointer<int> sp(new int(99));
- /* */ QSharedPointer<int> sp2(sp);
- /* B */ (void) 0;
+ // Case 1.3: There are other weak pointers.
+ prepare("dump_QWeakPointer_13");
+ if (checkUninitialized)
+ run("A","{iname='local.sp',addr='-',name='sp',"
+ "type='"NS"QSharedPointer<int>',value='<not in scope>',numchild='0'}");
+ next();
+ next();
+ next();
+ run("B","{iname='local.sp',addr='-',name='sp',"
+ "type='"NS"QSharedPointer<int>',value='',numchild='3'},"
+ "{iname='local.wp',addr='-',name='wp',"
+ "type='"NS"QWeakPointer<int>',value='',numchild='3'},"
+ "{iname='local.wp2',addr='-',name='wp2',"
+ "type='"NS"QWeakPointer<int>',value='',numchild='3'}");
+ run("B","{iname='local.sp',addr='-',name='sp',"
+ "type='"NS"QSharedPointer<int>',value='',numchild='3',children=["
+ "{name='data',type='int',value='99',numchild='0'},"
+ "{name='weakref',value='3',type='int',numchild='0'},"
+ "{name='strongref',value='3',type='int',numchild='0'}]},"
+ "{iname='local.wp',addr='-',name='wp',"
+ "type='"NS"QWeakPointer<int>',value='',numchild='3',children=["
+ "{name='data',type='int',value='99',numchild='0'},"
+ "{name='weakref',value='3',type='int',numchild='0'},"
+ "{name='strongref',value='3',type='int',numchild='0'}]},"
+ "{iname='local.wp2',addr='-',name='wp2',"
+ "type='"NS"QWeakPointer<int>',value='',numchild='3'}",
+ "local.sp,local.wp");
}
-void dumpQWeakPointer_2()
+
+void dump_QWeakPointer_2()
{
// Case 2: Composite type.
/* A */ QSharedPointer<QString> sp(new QString("Test"));
/* */ QWeakPointer<QString> wp = sp.toWeakRef();
/* B */ (void) 0;
}
-#endif
-void tst_Gdb::dumpQWeakPointer()
+void tst_Gdb::dump_QWeakPointer_2()
{
-#if QT_VERSION >= 0x040500
-
-return;
-
- // Case 1.1: Null pointer.
- prepare("dumpQWeakPointer_11");
+ // Case 2: Composite type.
+ prepare("dump_QWeakPointer_2");
if (checkUninitialized)
run("A","{iname='local.sp',addr='-',name='sp',"
- "type='"NS"QSharedPointer<int>',value='<not in scope>',numchild='0'}");
+ "type='"NS"QSharedPointer<"NS"QString>',value='<not in scope>',numchild='0'}");
+ next();
next();
run("B","{iname='local.sp',addr='-',name='sp',"
- "type='"NS"QSharedPointer<int>',value='<0 items>',numchild='1'}");
-
-/*
- //,numchild='1',children=[{name='data',addr='").
- append(ptrToBa(data)).append("',type='").append(typeToString<T>()).
- append("',value='").append(dataStr).append("'},{name='weakref',value='").
- append(valToString(*weakRefPtr)).append("',type='int',addr='").
- append(ptrToBa(weakRefPtr)).append("',numchild='0'},{name='strongref',value='").
- append(valToString(*strongRefPtr)).append("',type='int',addr='").
- append(ptrToBa(strongRefPtr)).append("',numchild='0'}]");
-
- // Case 1.2: Weak pointer is unique.
-void tst_Gdb::dumpQWeakPointerHelper(QWeakPointer<T> &ptr)
-{
- typedef QtSharedPointer::ExternalRefCountData Data;
- const size_t dataOffset = 0;
- const Data *d = *reinterpret_cast<const Data **>(
- reinterpret_cast<const char **>(&ptr) + dataOffset);
- const int *weakRefPtr = reinterpret_cast<const int *>(&d->weakref);
- const int *strongRefPtr = reinterpret_cast<const int *>(&d->strongref);
- T *data = ptr.toStrongRef().data();
- const QString dataStr = valToString(*data);
- QByteArray expected("value='");
- if (isSimpleType<T>())
- expected.append(dataStr);
- expected.append("',valuedisabled='true',numchild='1',children=[{name='data',addr='").
- append(ptrToBa(data)).append("',type='").append(typeToString<T>()).
- append("',value='").append(dataStr).append("'},{name='weakref',value='").
- append(valToString(*weakRefPtr)).append("',type='int',addr='").
- append(ptrToBa(weakRefPtr)).append("',numchild='0'},{name='strongref',value='").
- append(valToString(*strongRefPtr)).append("',type='int',addr='").
- append(ptrToBa(strongRefPtr)).append("',numchild='0'}]");
- testDumper(expected, &ptr, NS"QWeakPointer", true, typeToString<T>());
-}
+ "type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3',children=["
+ "{name='data',type='"NS"QString',"
+ "valueencoded='7',value='5400650073007400',numchild='0'},"
+ "{name='weakref',value='2',type='int',numchild='0'},"
+ "{name='strongref',value='2',type='int',numchild='0'}]},"
+ "{iname='local.wp',addr='-',name='wp',"
+ "type='"NS"QWeakPointer<"NS"QString>',value='',numchild='3',children=["
+ "{name='data',type='"NS"QString',"
+ "valueencoded='7',value='5400650073007400',numchild='0'},"
+ "{name='weakref',value='2',type='int',numchild='0'},"
+ "{name='strongref',value='2',type='int',numchild='0'}]}",
+ "local.sp,local.wp");
+}
+
+#else // before Qt 4.5
+
+void tst_Gdb::dump_QWeakPointer_11() {}
+void tst_Gdb::dump_QWeakPointer_12() {}
+void tst_Gdb::dump_QWeakPointer_13() {}
+void tst_Gdb::dump_QWeakPointer_2() {}
-
- QSharedPointer<int> sp(new int(99));
- wp = sp.toWeakRef();
- dumpQWeakPointerHelper(wp);
-
- // Case 1.3: There are other weak pointers.
- QWeakPointer<int> wp2 = sp.toWeakRef();
- dumpQWeakPointerHelper(wp);
-
- // Case 1.4: There are other strong shared pointers as well.
- QSharedPointer<int> sp2(sp);
- dumpQWeakPointerHelper(wp);
-
- // Case 2: Composite type.
- QSharedPointer<QString> spS(new QString("Test"));
- QWeakPointer<QString> wpS = spS.toWeakRef();
- dumpQWeakPointerHelper(wpS);
-*/
#endif
-}
///////////////////////////// QHash<QString, QString> //////////////////////////////
-void dumpQHash_QString_QString()
+void dump_QHash_QString_QString()
{
/* A */ QHash<QString, QString> h;
/* B */ h["hello"] = "world";
@@ -2568,7 +2609,7 @@ void dumpQHash_QString_QString()
/* D */ (void) 0;
}
-void dumpQHash_int_int()
+void dump_QHash_int_int()
{
/* A */ QHash<int, int> h;
/* B */ h[43] = 44;
@@ -2576,7 +2617,7 @@ void dumpQHash_int_int()
/* D */ (void) 0;
}
-void tst_Gdb::dumpQHash()
+void tst_Gdb::dump_QHash()
{
// Need to check the following combinations:
// int-key optimization, small value
@@ -2590,7 +2631,7 @@ void tst_Gdb::dumpQHash()
// complex key
//struct NodeL { void *next; uint h; void *k; void *v; } nodeL
- prepare("dumpQHash_int_int");
+ prepare("dump_QHash_int_int");
if (checkUninitialized)
run("A","{iname='local.h',addr='-',name='h',"
"type='"NS"QHash<int, int>',value='<not in scope>',"
@@ -2605,7 +2646,7 @@ void tst_Gdb::dumpQHash()
"{name='45',value='46'}]}",
"local.h");
- prepare("dumpQHash_QString_QString");
+ prepare("dump_QHash_QString_QString");
if (checkUninitialized)
run("A","{iname='local.h',addr='-',name='h',"
"type='"NS"QHash<"NS"QString, "NS"QString>',value='<not in scope>',"
@@ -2638,7 +2679,7 @@ void tst_Gdb::dumpQHash()
///////////////////////////// QList<int> /////////////////////////////////
-void dumpQList_int()
+void dump_QList_int()
{
/* A */ QList<int> list;
/* B */ list.append(1);
@@ -2646,9 +2687,9 @@ void dumpQList_int()
/* D */ (void) 0;
}
-void tst_Gdb::dumpQList_int()
+void tst_Gdb::dump_QList_int()
{
- prepare("dumpQList_int");
+ prepare("dump_QList_int");
if (checkUninitialized)
run("A","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<int>',value='<not in scope>',numchild='0'}");
@@ -2672,18 +2713,46 @@ void tst_Gdb::dumpQList_int()
}
+///////////////////////////// QList<int *> /////////////////////////////////
+
+void dump_QList_int_star()
+{
+ /* A */ QList<int *> list;
+ /* B */ list.append(new int(1));
+ /* C */ list.append(0);
+ /* D */ list.append(new int(2));
+ /* E */ (void) 0;
+}
+
+void tst_Gdb::dump_QList_int_star()
+{
+ prepare("dump_QList_int_star");
+ if (checkUninitialized)
+ run("A","{iname='local.list',addr='-',name='list',"
+ "type='"NS"QList<int*>',value='<not in scope>',numchild='0'}");
+ next();
+ next();
+ next();
+ next();
+ run("E","{iname='local.list',addr='-',name='list',"
+ "type='"NS"QList<int*>',value='<3 items>',numchild='3',"
+ "childtype='int',childnumchild='0',children=["
+ "{value='1'},{value='<null>',type='int *'},{value='2'}]}", "local.list");
+}
+
+
///////////////////////////// QList<char> /////////////////////////////////
-void dumpQList_char()
+void dump_QList_char()
{
/* A */ QList<char> list;
/* B */ list.append('a');
/* C */ (void) 0;
}
-void tst_Gdb::dumpQList_char()
+void tst_Gdb::dump_QList_char()
{
- prepare("dumpQList_char");
+ prepare("dump_QList_char");
if (checkUninitialized)
run("A","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<char>',value='<not in scope>',numchild='0'}");
@@ -2702,7 +2771,7 @@ void tst_Gdb::dumpQList_char()
///////////////////////////// QList<const char *> /////////////////////////////////
-void dumpQList_char_star()
+void dump_QList_char_star()
{
/* A */ QList<const char *> list;
/* B */ list.append("a");
@@ -2711,9 +2780,9 @@ void dumpQList_char_star()
/* E */ (void) 0;
}
-void tst_Gdb::dumpQList_char_star()
+void tst_Gdb::dump_QList_char_star()
{
- prepare("dumpQList_char_star");
+ prepare("dump_QList_char_star");
if (checkUninitialized)
run("A","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<char const*>',value='<not in scope>',numchild='0'}");
@@ -2740,16 +2809,16 @@ void tst_Gdb::dumpQList_char_star()
///////////////////////////// QList<QString> /////////////////////////////////////
-void dumpQList_QString()
+void dump_QList_QString()
{
/* A */ QList<QString> list;
/* B */ list.append("Hallo");
/* C */ (void) 0;
}
-void tst_Gdb::dumpQList_QString()
+void tst_Gdb::dump_QList_QString()
{
- prepare("dumpQList_QString");
+ prepare("dump_QList_QString");
if (0 && checkUninitialized)
run("A","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<"NS"QString>',value='<not in scope>',numchild='0'}");
@@ -2768,16 +2837,16 @@ void tst_Gdb::dumpQList_QString()
///////////////////////////// QList<QString3> ///////////////////////////////////
-void dumpQList_QString3()
+void dump_QList_QString3()
{
/* A */ QList<QString3> list;
/* B */ list.append(QString3());
/* C */ (void) 0;
}
-void tst_Gdb::dumpQList_QString3()
+void tst_Gdb::dump_QList_QString3()
{
- prepare("dumpQList_QString3");
+ prepare("dump_QList_QString3");
if (checkUninitialized)
run("A","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<QString3>',value='<not in scope>',numchild='0'}");
@@ -2806,16 +2875,16 @@ void tst_Gdb::dumpQList_QString3()
///////////////////////////// QList<Int3> /////////////////////////////////////
-void dumpQList_Int3()
+void dump_QList_Int3()
{
/* A */ QList<Int3> list;
/* B */ list.append(Int3());
/* C */ (void) 0;
}
-void tst_Gdb::dumpQList_Int3()
+void tst_Gdb::dump_QList_Int3()
{
- prepare("dumpQList_Int3");
+ prepare("dump_QList_Int3");
if (checkUninitialized)
run("A","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<Int3>',value='<not in scope>',numchild='0'}");
@@ -2840,7 +2909,7 @@ void tst_Gdb::dumpQList_Int3()
///////////////////////////// QVector /////////////////////////////////
-void dumpQStack()
+void dump_QStack()
{
/* A */ QStack<int> v;
/* B */ v.append(3);
@@ -2848,9 +2917,9 @@ void dumpQStack()
/* D */ (void) 0;
}
-void tst_Gdb::dumpQStack()
+void tst_Gdb::dump_QStack()
{
- prepare("dumpQStack");
+ prepare("dump_QStack");
if (checkUninitialized)
run("A","{iname='local.v',addr='-',name='v',type='"NS"QStack<int>',"
"value='<not in scope>',numchild='0'}");
@@ -2878,7 +2947,7 @@ void tst_Gdb::dumpQStack()
///////////////////////////// QString /////////////////////////////////////
-void dumpQString()
+void dump_QString()
{
/* A */ QString s;
/* B */ s = "hallo";
@@ -2886,9 +2955,9 @@ void dumpQString()
/* D */ (void) 0;
}
-void tst_Gdb::dumpQString()
+void tst_Gdb::dump_QString()
{
- prepare("dumpQString");
+ prepare("dump_QString");
if (checkUninitialized)
run("A","{iname='local.s',addr='-',name='s',type='"NS"QString',"
"value='<not in scope>',numchild='0'}");
@@ -2920,7 +2989,7 @@ void tst_Gdb::dumpQString()
///////////////////////////// QStringList /////////////////////////////////
-void dumpQStringList()
+void dump_QStringList()
{
/* A */ QStringList s;
/* B */ s.append("hello");
@@ -2928,9 +2997,9 @@ void dumpQStringList()
/* D */ (void) 0;
}
-void tst_Gdb::dumpQStringList()
+void tst_Gdb::dump_QStringList()
{
- prepare("dumpQStringList");
+ prepare("dump_QStringList");
if (checkUninitialized)
run("A","{iname='local.s',addr='-',name='s',type='"NS"QStringList',"
"value='<not in scope>',numchild='0'}");
@@ -2961,7 +3030,7 @@ void tst_Gdb::dumpQStringList()
///////////////////////////// QVector /////////////////////////////////
-void dumpQVector()
+void dump_QVector()
{
/* A */ QVector<double> v;
/* B */ v.append(3.14);
@@ -2969,9 +3038,9 @@ void dumpQVector()
/* D */ (void) 0;
}
-void tst_Gdb::dumpQVector()
+void tst_Gdb::dump_QVector()
{
- prepare("dumpQVector");
+ prepare("dump_QVector");
if (checkUninitialized)
run("A","{iname='local.v',addr='-',name='v',type='"NS"QVector<double>',"
"value='<not in scope>',numchild='0'}");
@@ -3010,6 +3079,31 @@ int main(int argc, char *argv[])
return 0;
}
+ if (argc == 2 && QByteArray(argv[1]) == "debug") {
+ dump_array_char();
+ dump_array_int();
+ dump_Foo();
+ dump_misc();
+ dump_QByteArray();
+ dump_QChar();
+ dump_QHash_int_int();
+ dump_QList_char();
+ dump_QList_char_star();
+ dump_QList_int();
+ dump_QList_int_star();
+ dump_QList_Int3();
+ dump_QList_QString();
+ dump_QList_QString3();
+ dump_QStack();
+ dump_QString();
+ dump_QStringList();
+ dump_QVector();
+ dump_QWeakPointer_11();
+ dump_QWeakPointer_12();
+ dump_QWeakPointer_13();
+ dump_QWeakPointer_2();
+ }
+
try {
// Plain call. Start the testing.
QCoreApplication app(argc, argv);
diff --git a/tests/manual/trklauncher/main.cpp b/tests/manual/trklauncher/main.cpp
index 35336632173fe16ef8f9f9da9f9dbd4c4a5220ea..9938f847931f813be7dfdbe921a001bf16e96ecf 100644
--- a/tests/manual/trklauncher/main.cpp
+++ b/tests/manual/trklauncher/main.cpp
@@ -126,7 +126,7 @@ static TrkLauncherPtr parseArguments(const QStringList &arguments, bool *bluetoo
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
- QCoreApplication::setApplicationName(QLatin1String("trklauncher"));
+ QCoreApplication::setApplicationName(QLatin1String("TRKlauncher"));
QCoreApplication::setOrganizationName(QLatin1String("Nokia"));
bool bluetooth;