diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 6489b127f845fd2890e250a9760836eaa7604b5e..6cefbd28134f92b0971e63d578f31f92db4b13a0 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -14,7 +14,7 @@
<translation>Die Kommandozeilen-Argumente konnten nicht an die laufende Instanz übermittelt werden. Sie antwortet nicht.</translation>
</message>
<message>
- <location line="+136"/>
+ <location line="+132"/>
<source>Couldn't find 'Core.pluginspec' in %1</source>
<translation>Die Datei 'Core.pluginspec' konnte in %1 nicht gefunden werden</translation>
</message>
@@ -60,6 +60,34 @@
<translation>Löschen</translation>
</message>
</context>
+<context>
+ <name>AttachTcfDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/attachtcfdialog.ui"/>
+ <source>Start Debugger</source>
+ <translation>Debugger starten</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Host and port:</source>
+ <translation>Host und Portnummer:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Architecture:</source>
+ <translation>Architektur:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use server start script:</source>
+ <translation>Server-Startskript benutzen:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Server start script:</source>
+ <translation>Server-Startskript:</translation>
+ </message>
+</context>
<context>
<name>BINEditor::Internal::BinEditorPlugin</name>
<message>
@@ -101,7 +129,7 @@
<translation>Neuer Ordner</translation>
</message>
<message>
- <location filename="../../../src/shared/help/bookmarkmanager.cpp" line="+173"/>
+ <location filename="../../../src/shared/help/bookmarkmanager.cpp" line="+172"/>
<location line="+18"/>
<location line="+36"/>
<location line="+24"/>
@@ -139,21 +167,25 @@
<translation>Entfernen</translation>
</message>
<message>
- <location line="+110"/>
+ <location line="+1"/>
+ <source>You are going to delete a Folder which will also<br>remove its content. Are you sure you would like to continue?</source>
+ <translation>Beim Löschen eines Ordners wird auch dessen Inhalt gelöscht.<br>Möchten Sie trotzdem fortsetzen?</translation>
+ </message>
+ <message>
+ <location line="+109"/>
<location line="+9"/>
<source>New Folder</source>
<translation>Neuer Ordner</translation>
</message>
<message>
- <location line="-118"/>
<source>You are going to delete a Folder which will also<br>remove its content. Are you sure to continue?</source>
- <translation>Beim Löschen eines Ordners wird auch dessen Inhalt gelöscht.<br>Möchten Sie trotzdem fortsetzen?</translation>
+ <translation type="obsolete">Beim Löschen eines Ordners wird auch dessen Inhalt gelöscht.<br>Möchten Sie trotzdem fortsetzen?</translation>
</message>
</context>
<context>
<name>BookmarkWidget</name>
<message>
- <location line="-319"/>
+ <location line="-437"/>
<source>Delete Folder</source>
<translation>Ordner löschen</translation>
</message>
@@ -307,11 +339,6 @@
<name>BreakCondition</name>
<message>
<location filename="../../../src/plugins/debugger/breakcondition.ui"/>
- <source>Dialog</source>
- <translation></translation>
- </message>
- <message>
- <location/>
<source>Condition:</source>
<translation>Bedingung:</translation>
</message>
@@ -386,6 +413,11 @@
<source>CMake</source>
<translation>CMake</translation>
</message>
+ <message>
+ <location line="+9"/>
+ <source>CMake executable</source>
+ <translation>Ausführbare CMake-Datei</translation>
+ </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
@@ -459,11 +491,6 @@
<name>CdbOptionsPageWidget</name>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>These options take effect at the next start of Qt Creator.</source>
<translation>Die Einstellungen werden beim nächsten Start von Qt Creator wirksam.</translation>
</message>
@@ -474,13 +501,23 @@
</message>
<message>
<location/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
+ <source>Cdb</source>
+ <translation>Cdb</translation>
</message>
<message>
<location/>
- <source>Cdb</source>
- <translation>Cdb</translation>
+ <source>Debugger Paths</source>
+ <translation>Debugger-Pfade</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Symbol paths:</source>
+ <translation>Symbolpfade:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Source paths:</source>
+ <translation>Quelltext-Pfade:</translation>
</message>
</context>
<context>
@@ -494,11 +531,6 @@
<name>ChangeSelectionDialog</name>
<message>
<location filename="../../../src/plugins/git/changeselectiondialog.ui"/>
- <source>Dialog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Repository Location:</source>
<translation>Repository:</translation>
</message>
@@ -576,11 +608,6 @@
<name>CodePaster::PasteSelectDialog</name>
<message>
<location filename="../../../src/plugins/cpaster/pasteselect.ui"/>
- <source>Dialog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Paste:</source>
<translation>Ausschnitt:</translation>
</message>
@@ -589,11 +616,6 @@
<name>CodePaster::SettingsPage</name>
<message>
<location filename="../../../src/plugins/cpaster/settingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>CodePaster Server:</source>
<translation>CodePaster Server:</translation>
</message>
@@ -627,11 +649,6 @@
<name>CommonOptionsPage</name>
<message>
<location filename="../../../src/plugins/debugger/commonoptionspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>User interface</source>
<translation>Benutzeroberfläche</translation>
</message>
@@ -686,11 +703,6 @@
<name>CompletionSettingsPage</name>
<message>
<location filename="../../../src/plugins/cpptools/completionsettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Code Completion</source>
<translation>Code-Vervollständigung</translation>
</message>
@@ -728,7 +740,7 @@
<context>
<name>ContentWindow</name>
<message>
- <location filename="../../../src/shared/help/contentwindow.cpp" line="+133"/>
+ <location filename="../../../src/shared/help/contentwindow.cpp" line="+131"/>
<source>Open Link</source>
<translation>Adresse öffnen</translation>
</message>
@@ -810,12 +822,12 @@ Sollen sie überschrieben werden?</translation>
<name>Core::EditorManager</name>
<message>
<location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+186"/>
- <location line="+1467"/>
+ <location line="+1483"/>
<source>Revert to Saved</source>
<translation>Wiederherstellen</translation>
</message>
<message>
- <location line="-1464"/>
+ <location line="-1480"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -826,12 +838,12 @@ Sollen sie überschrieben werden?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1198"/>
+ <location line="+1214"/>
<source>Close Others</source>
<translation>Andere schließen</translation>
</message>
<message>
- <location line="-1197"/>
+ <location line="-1213"/>
<source>Next Document in History</source>
<translation>Nächstes Dokument im Verlauf</translation>
</message>
@@ -971,7 +983,7 @@ Sollen sie überschrieben werden?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+682"/>
+ <location line="+681"/>
<source>Opening File</source>
<translation>Datei Öffnen</translation>
</message>
@@ -986,28 +998,53 @@ Sollen sie überschrieben werden?</translation>
<translation>Datei öffnen</translation>
</message>
<message>
- <location line="+162"/>
- <location line="+7"/>
+ <location line="+137"/>
+ <source>File is Read Only</source>
+ <translation>Die Datei ist schreibgeschützt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The file %1 is read only.</source>
+ <translation>Die Datei %1 ist schreibgeschützt.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Open with VCS (%1)</source>
+ <translation>Öffnen mittels Versionskontrollsystem (%1)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Save as ...</source>
+ <translation>Speichern als...</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <location line="+8"/>
<source>Failed!</source>
<translation>Fehler</translation>
</message>
<message>
- <location line="-7"/>
- <source>Could not open the file for edit with SCC.</source>
+ <location line="-8"/>
+ <source>Could not open the file for editing with SCC.</source>
<translation>Die Datei konnte nicht mit Hilfe der Versionsverwaltung schreibbar gemacht werden.</translation>
</message>
<message>
- <location line="+7"/>
+ <source>Could not open the file for edit with SCC.</source>
+ <translation type="obsolete">Die Datei konnte nicht mit Hilfe der Versionsverwaltung schreibbar gemacht werden.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
<source>Could not set permissions to writable.</source>
<translation>Die Datei konnte schreibbar gemacht werden.</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+90"/>
<source><b>Warning:</b> You are changing a read-only file.</source>
<translation><b>Hinweis:</b> Sie sind im Begriff, eine schreibgeschützte Datei zu ändern.</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-129"/>
+ <location line="+130"/>
<source>Make writable</source>
<translation>Schreibbar machen</translation>
</message>
@@ -1070,7 +1107,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Die Datei '%1' kann nicht gespeichert werden. Wollen Sie trotzdem fortsetzen und Ihre Änderungen aufgeben?</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Overwrite?</source>
<translation>Ãœberschreiben?</translation>
</message>
@@ -1177,7 +1214,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::EditorView</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+406"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+451"/>
<location line="+35"/>
<source>Placeholder</source>
<translation>Platzhalter</translation>
@@ -1217,11 +1254,6 @@ Sollen sie überschrieben werden?</translation>
</message>
<message>
<location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>General settings</source>
<translation>Allgemeine Einstellungen</translation>
</message>
@@ -1489,11 +1521,6 @@ Sollen sie überschrieben werden?</translation>
<source>1</source>
<translation>1</translation>
</message>
- <message>
- <location/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Core::Internal::OpenEditorsWidget</name>
@@ -1534,12 +1561,12 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+6"/>
<source>Next Item</source>
- <translation>Nächstes Element</translation>
+ <translation>Nächster Eintrag</translation>
</message>
<message>
<location line="+6"/>
<source>Previous Item</source>
- <translation>Voriges Element</translation>
+ <translation>Vorangehender Eintrag</translation>
</message>
<message>
<location line="+56"/>
@@ -1670,7 +1697,98 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::WelcomeMode</name>
<message>
- <location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="+123"/>
+ <location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="+124"/>
+ <source>Projects</source>
+ <translation>Projekte</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sessions</source>
+ <translation>Sitzungen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Tutorials</source>
+ <translation>Anleitungen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Demos and Examples</source>
+ <translation>Qt Demos und Beispiele</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Did you know?</source>
+ <translation>Wussten Sie schon?</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>News from the Qt Labs</source>
+ <translation>Neuigkeiten von Qt Labs</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Websites</source>
+ <translation>Qt Internetseiten</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>http://labs.trolltech.com/blogs/feed</source>
+ <extracomment>Add localized feed here only if one exists</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt Software</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Labs</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Git Hosting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Centre</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt/S60 at Forum Nokia</source>
+ <translation>Qt/S60 beim Forum Nokia</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt Creator - A quick tour</source>
+ <translation>Qt Creator - Schnelleinstieg</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Understanding widgets</source>
+ <translation>Widgets verstehen</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Creating an address book</source>
+ <translation>Erstellen einer Adressbuch-Beispielanwendung</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Building with qmake</source>
+ <translation>Mit qmake arbeiten</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Writing test cases</source>
+ <translation>Testfälle erstellen</translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Welcome</source>
<translation>Willkommen</translation>
</message>
@@ -1679,11 +1797,34 @@ Sollen sie überschrieben werden?</translation>
<source>%1 (last session)</source>
<translation>%1 (zuletzt benutzt)</translation>
</message>
+ <message>
+ <location line="+80"/>
+ <source>You can switch between Qt Creator's modes using <tt>Ctrl+number</tt>:<ol><li> - Welcome</li><li> - Edit</li><li>- Debug</li><li>- Projects</li><li>- Help</li><li></li><li>- Output</li></ol></source>
+ <translation>Sie können mittels <tt>Ctrl+Ziffer</tt> zwischen den Modi von Qt Creator wechseln:<ol><li> - Willkommen</li><li> - Editieren</li><li>- Debuggen</li><li>- Projekte</li><li>- Hilfe</li><li></li><li>- Ausgabe</li></ol></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>You can show and hide the side bar using <tt>Alt+0<tt>.</source>
+ <translation>Die Sichtbarkeit der Seitenleiste kann mittels <tt>Alt+0<tt> umgeschaltet werden.</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>Sie können die <tt>Finden</tt>-Funktion durch Auswahl von &quot;Ganze Wörter&quot; oder &quot;Groß/Kleinschreibung&quot; steuern. Klicken Sie einfach auf die Symbole rechts vom Eingabefeld.</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>Wenn Sie eine <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">externe Bibliothek</a>, hinzufügen, bietet Qt Creator automatisch Syntax-Hervorhebung und Code-Vervollständigung.</translation>
+ </message>
+ <message>
+ <source>If you add a <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="obsolete">Wenn Sie eine <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">externe Bibliothek</a>, hinzufügen, bietet Qt Creator automatisch Syntax-Hervorhebung und Code-Vervollständigung.</translation>
+ </message>
</context>
<context>
<name>Core::Internal::WelcomePage</name>
<message>
- <location filename="../../../src/plugins/coreplugin/welcomemode.ui"/>
<source><style>
h1 {
font-size: 24px;
@@ -1707,7 +1848,7 @@ p {
<p><strong>Started</strong> to begin developing with Qt Creator.</p>
<hr style="margin-top:15px"/>
</source>
- <translation type="unfinished"><style>
+ <translation type="obsolete"><style>
h1 {
font-size: 24px;
font-weight: normal;
@@ -1734,9 +1875,13 @@ p {
<hr style="margin-top:15px"/></translation>
</message>
<message>
- <location/>
+ <source><qt>Getting Started &gt;&gt;</source>
+ <translation type="obsolete"><qt>Schnelleinstieg &gt;&gt;</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/welcomemode.ui"/>
<source>* {
- border-image: url(:/core/images/welcomemode/btn_27.png) 7;
+ border-image: url(:/core/images/welcomemode/btn_26.png) 7;
border-width: 7;
padding: -2px 0;
font-size: 12px;
@@ -1745,7 +1890,7 @@ p {
}
*:hover {
- border-image: url(:/core/images/welcomemode/btn_27_hover.png) 7;
+ border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7;
color: white;
}
</source>
@@ -1753,27 +1898,17 @@ p {
</message>
<message>
<location/>
- <source><qt>Getting Started &gt;&gt;</source>
- <translation><qt>Schnelleinstieg &gt;&gt;</translation>
- </message>
- <message>
- <location/>
- <source>#recentSessionsFrame {
- border-image: url(:/core/images/welcomemode/rc_combined.png) 8;
- border-width: 8;
-}
-</source>
- <translation type="unfinished"></translation>
+ <source><qt>Restore Last Session &gt;&gt;</source>
+ <translation><qt>Zuletzt benutzt &gt;&gt;</translation>
</message>
<message>
<location/>
<source>* {
border-image: url(:/core/images/welcomemode/btn_26.png) 7;
border-width: 7;
- padding: -2px 0;
+ padding: -2px 2px;
font-size: 12px;
font-family: lucida sans, dejavu sans, sans serif;
- color: black;
}
*:hover {
@@ -1785,43 +1920,66 @@ p {
</message>
<message>
<location/>
- <source><qt>Restore Last Session &gt;&gt;</source>
- <translation><qt>Zuletzt benutzt &gt;&gt;</translation>
+ <source><qt>Feedback&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></source>
+ <translation><qt>Rückmeldung&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></translation>
</message>
<message>
<location/>
- <source>#bottomWidget {
- background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
-}
-</source>
+ <source>Help us make Qt Creator even better</source>
+ <translation>Helfen Sie uns, Qt Creator zu verbessern</translation>
+ </message>
+ <message>
+ <location/>
+ <source>#Core--Internal--WelcomePage {
+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>
</message>
<message>
<location/>
- <source>* {
- border-image: url(:/core/images/welcomemode/btn_26.png) 7;
- border-width: 7;
- padding: -2px 2px;
- font-size: 12px;
- font-family: lucida sans, dejavu sans, sans serif;
-}
-
-*:hover {
- border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7;
- color: white;
+ <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>
+ </message>
+ <message>
+ <location/>
+ <source>#headerFrame {
+ border-image: url(:/core/images/welcomemode/center_frame_header.png) 0;
+ border-width: 0;
}
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source><qt>Feedback&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></source>
- <translation><qt>Rückmeldung&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></translation>
+ <source>Getting Started</source>
+ <translation>Schnelleinstieg</translation>
</message>
<message>
<location/>
- <source>Help us make Qt Creator even better</source>
- <translation>Helfen Sie uns, Qt Creator zu verbessern</translation>
+ <source>Develop</source>
+ <translation>Entwicklung</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Community</source>
+ <translation>Community</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Open</source>
+ <translation>Öffnen</translation>
+ </message>
+ <message>
+ <location/>
+ <source><</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>></source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1849,7 +2007,7 @@ p {
<context>
<name>Core::StandardFileWizard</name>
<message>
- <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+73"/>
+ <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+53"/>
<source>New %1</source>
<translatorcomment>TODO: Grammatical case problem</translatorcomment>
<translation>Neue %1</translation>
@@ -2010,11 +2168,6 @@ p {
</message>
<message>
<location filename="../../../src/libs/utils/newclasswidget.ui"/>
- <source>Dialog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Class name:</source>
<translation>Klassenname:</translation>
</message>
@@ -2098,7 +2251,35 @@ p {
</message>
</context>
<context>
- <name>Core::Utils::ProjectIntroPage</name>
+ <name>Core::Utils::PathListEditor</name>
+ <message>
+ <location filename="../../../src/libs/utils/pathlisteditor.cpp" line="+120"/>
+ <source>Insert...</source>
+ <translation>Einfügen...</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Add...</source>
+ <translation>Hinzufügen...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Delete line</source>
+ <translation>Zeile löschen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation>Löschen</translation>
+ </message>
+ <message>
+ <location line="+130"/>
+ <source>From "%1"</source>
+ <translation>Von "%1"</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::ProjectIntroPage</name>
<message>
<location filename="../../../src/libs/utils/projectintropage.cpp" line="+66"/>
<source><Enter_Name></source>
@@ -2116,19 +2297,9 @@ p {
</message>
<message>
<location filename="../../../src/libs/utils/projectintropage.ui"/>
- <source>WizardPage</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Introduction and project location</source>
<translation>Einführung und Projektverzeichnis</translation>
</message>
- <message>
- <location/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location/>
<source>Name:</source>
@@ -2170,11 +2341,6 @@ p {
<name>Core::Utils::WizardPage</name>
<message>
<location filename="../../../src/libs/utils/filewizardpage.ui"/>
- <source>WizardPage</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Choose the location</source>
<translation>Verzeichnis auswählen</translation>
</message>
@@ -2189,13 +2355,31 @@ p {
<translation>Pfad:</translation>
</message>
</context>
+<context>
+ <name>Core::Utils::reloadPrompt</name>
+ <message>
+ <location filename="../../../src/libs/utils/reloadpromptutils.cpp" line="+41"/>
+ <source>File Changed</source>
+ <translation>Datei geändert</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The file %1 has changed outside Qt Creator. Do you want to reload it?</source>
+ <translation>Die Datei %1 wurde außerhalb von Qt Creator geändert. Möchten Sie sie neu laden?</translation>
+ </message>
+</context>
<context>
<name>CppEditor::Internal::CPPEditor</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+258"/>
+ <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+265"/>
<source>Sort alphabetically</source>
<translation>Alphabetisch sortieren</translation>
</message>
+ <message>
+ <location line="+629"/>
+ <source>Reformat Document</source>
+ <translation>Dokument neu formatieren</translation>
+ </message>
</context>
<context>
<name>CppEditor::Internal::ClassNamePage</name>
@@ -2290,12 +2474,12 @@ p {
<context>
<name>CppFileSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+52"/>
+ <source>File naming conventions</source>
+ <translation>Konventionen für die Bildung von Dateinamen</translation>
</message>
<message>
- <location/>
+ <location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
<source>Header suffix:</source>
<translation>Endung für Header-Dateien:</translation>
</message>
@@ -2368,7 +2552,7 @@ p {
<context>
<name>CppTools::Internal::CppModelManager</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+253"/>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+269"/>
<source>Indexing</source>
<translation>Indizierung</translation>
</message>
@@ -2415,7 +2599,7 @@ p {
<translation>Debugger</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+365"/>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+380"/>
<source><Encoding error></source>
<translation><Encoding-Fehler></translation>
</message>
@@ -2423,7 +2607,7 @@ p {
<context>
<name>Debugger::Internal::AttachCoreDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+133"/>
+ <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+134"/>
<source>Select Executable</source>
<translation>Ausführbare Datei auswählen</translation>
</message>
@@ -2456,10 +2640,83 @@ p {
<translation>Aktualisieren</translation>
</message>
</context>
+<context>
+ <name>Debugger::Internal::AttachTcfDialog</name>
+ <message>
+ <location line="+71"/>
+ <source>Select Executable</source>
+ <translation>Ausführbare Datei auswählen</translation>
+ </message>
+</context>
<context>
<name>Debugger::Internal::BreakHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+387"/>
+ <location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+198"/>
+ <source>Marker File:</source>
+ <translation>Marker-Datei:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Marker Line:</source>
+ <translation>Marker-Zeile:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Breakpoint Number:</source>
+ <translation>Nummer des Haltepunkts:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Breakpoint Address:</source>
+ <translation>Adresse des Haltepunkts:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Property</source>
+ <translation>Eigenschaft</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Requested</source>
+ <translation>Angefordert</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Obtained</source>
+ <translation>Erhalten</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Internal Number:</source>
+ <translation>Interne Nummer:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>File Name:</source>
+ <translation>Dateiname:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Function Name:</source>
+ <translation>Funktionsname:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Line Number:</source>
+ <translation>Zeilennummer:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Condition:</source>
+ <translation>Bedingung:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ignore Count:</source>
+ <translation>Anhalten erst nach:</translation>
+ </message>
+ <message>
+ <location line="+189"/>
<source>Number</source>
<translation>Zahl</translation>
</message>
@@ -2489,7 +2746,7 @@ p {
<translation>Anhalten nach</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+62"/>
<source>Breakpoint will only be hit if this condition is met.</source>
<translation>Der Haltepunkt wird nur ausgelöst, wenn die Bedingung erfüllt ist.</translation>
</message>
@@ -2507,7 +2764,7 @@ p {
<translation>Haltepunkte</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Delete breakpoint</source>
<translation>Haltepunkt löschen</translation>
</message>
@@ -2542,7 +2799,17 @@ p {
<translation>Haltepunkt aktivieren</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+3"/>
+ <source>Use short path</source>
+ <translation>Verkürzten Pfad verwenden</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Use full path</source>
+ <translation>Vollen Pfad verwenden</translation>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Conditions on Breakpoint %1</source>
<translation>Bedingungen des Haltepunkts %1</translation>
</message>
@@ -2550,7 +2817,7 @@ p {
<context>
<name>Debugger::Internal::CdbDebugEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+124"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+126"/>
<source>Unable to load the debugger engine library '%1': %2</source>
<translation>Die Debugger-Bibliothek konnte '%1' nicht geladen werden: %2</translation>
</message>
@@ -2560,7 +2827,7 @@ p {
<translation>'%1' konnte in der Debugger-Bibliothek '%2' nicht gefunden werden</translation>
</message>
<message>
- <location line="+229"/>
+ <location line="+289"/>
<source>The dumper library '%1' does not exist.</source>
<translation>Es existiert keine Ausgabe-Hilfsbibliothek '%1'.</translation>
</message>
@@ -2602,7 +2869,7 @@ p {
<translation type="obsolete">Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation>
</message>
<message>
- <location line="+465"/>
+ <location line="+479"/>
<source>Unable to assign the value '%1' to '%2': %3</source>
<translation>Der Wert '%1' konnte nicht an '%2' zugewiesen werden: %3</translation>
</message>
@@ -2689,10 +2956,28 @@ p {
<translation>Suchen</translation>
</message>
</context>
+<context>
+ <name>Debugger::Internal::CdbSymbolPathListEditor</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp" line="+42"/>
+ <source>Symbol Server...</source>
+ <translation>Symbol-Server...</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>Fügt den von Microsoft betriebenen Symbol-Server hinzu, der die Symbole für die Bibliotheken des Betriebssystems bereitstellt. Erfordert die Angabe eines lokalen Cache-Verzeichnisses.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Pick a local cache directory</source>
+ <translation>Wählen Sie ein Cache-Verzeichnis aus</translation>
+ </message>
+</context>
<context>
<name>Debugger::Internal::DebugMode</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+184"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+181"/>
<source>Debug</source>
<translation>Debuggen</translation>
</message>
@@ -2700,18 +2985,18 @@ p {
<context>
<name>Debugger::Internal::DebuggerManager</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+308"/>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+313"/>
<source>Continue</source>
<translation>Fortsetzen</translation>
</message>
<message>
<location line="+4"/>
- <location line="+945"/>
+ <location line="+933"/>
<source>Interrupt</source>
<translation>Anhalten</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-929"/>
<source>Reset Debugger</source>
<translation>Debugger zurücksetzen</translation>
</message>
@@ -2776,7 +3061,7 @@ p {
<translation>Zu Überwachten Ausdrücken hinzufügen</translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+206"/>
<source>Stop requested...</source>
<translation>Stop angefordert...</translation>
</message>
@@ -2797,34 +3082,34 @@ p {
<translation>Läuft...</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+88"/>
<location line="+23"/>
<source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
<translation>Das Ändern des Haltepunkt-Status erfordert, dass die Anwendung läuft oder vollständig gestoppt ist.</translation>
</message>
<message>
- <location line="+81"/>
+ <location line="+77"/>
<source>Debugging VS executables is not supported.</source>
<translation>Das Debuggen von mit VS erzeugten ausführbaren Dateien wird nicht unterstützt.</translation>
</message>
<message>
- <location line="+63"/>
- <location line="+90"/>
+ <location line="+60"/>
+ <location line="+125"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="-89"/>
+ <location line="-124"/>
<source>Cannot attach to PID 0</source>
<translation>Der Debugger kann nicht an die Prozess-Id 0 angehängt werden</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+125"/>
<source>Cannot debug '%1': %2</source>
<translation>'%1' kann nicht debuggt werden: %2</translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+178"/>
<source>Save Debugger Log</source>
<translation>Debugger Log speichern</translation>
</message>
@@ -2895,16 +3180,26 @@ p {
</message>
<message>
<location line="+4"/>
+ <source>Attach to Running Tcf Agent...</source>
+ <translation>An laufenden Tcf-Agenten anhängen...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This attaches to a running 'Target Communication Framework' agent.</source>
+ <translation>An einen laufenden 'Target Communication Framework'-Agenten anhängen.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
<source>Start and Attach to Remote Application...</source>
<translation>An entfernte Anwendung anhängen...</translation>
</message>
<message>
<location line="+6"/>
<source>Detach debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger abhängen</translation>
</message>
<message>
- <location line="+37"/>
+ <location line="+41"/>
<source>Stop Debugger/Interrupt Debugger</source>
<translation>Debugger anhalten/unterbrechen</translation>
</message>
@@ -2934,7 +3229,7 @@ p {
<translation>Threads:</translation>
</message>
<message>
- <location line="+158"/>
+ <location line="+157"/>
<source>Remove Breakpoint</source>
<translation>Haltepunkt löschen</translation>
</message>
@@ -3093,7 +3388,7 @@ p {
<context>
<name>Debugger::Internal::DebuggingHelperOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-585"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-596"/>
<source>Debugging Helper</source>
<translation>Ausgabe-Hilfsbibliothek</translation>
</message>
@@ -3103,7 +3398,7 @@ p {
<translation>Pfad zur Ausgabe-Hilfsbibliothek einstellen</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+30"/>
<source>Ctrl+Shift+F11</source>
<translation type="unfinished"></translation>
</message>
@@ -3157,7 +3452,7 @@ p {
<context>
<name>Debugger::Internal::GdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/gdbengine.cpp" line="+208"/>
+ <location filename="../../../src/plugins/debugger/gdbengine.cpp" line="+207"/>
<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>
@@ -3175,12 +3470,12 @@ p {
<message>
<location line="-34"/>
<source>An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel.</source>
- <translation>Ein Fehler trat beim Versuch des Schreibens zum Gdb-Process auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen.</translation>
+ <translation>Ein Fehler trat beim Versuch des Schreibens zum Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen.</translation>
</message>
<message>
<location line="+5"/>
<source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
- <translation>Ein Fehler trat beim Versuch des Lesens vom Gdb-Process auf. Wahrscheinlich läuft der Prozess nicht.</translation>
+ <translation>Ein Fehler trat beim Versuch des Lesens vom Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht.</translation>
</message>
<message>
<location line="+4"/>
@@ -3190,14 +3485,14 @@ p {
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+970"/>
+ <location line="+958"/>
<location line="+19"/>
- <location line="+407"/>
+ <location line="+398"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location line="-1272"/>
+ <location line="-1251"/>
<source>Library %1 loaded.</source>
<translation>Bibliothek %1 geladen.</translation>
</message>
@@ -3237,7 +3532,7 @@ p {
<translation>Debugger-Fehler</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+114"/>
<source>Stopping temporarily.</source>
<translation>Temporär Anhalten.</translation>
</message>
@@ -3252,94 +3547,97 @@ p {
<translation>Core-Datei geladen.</translation>
</message>
<message>
- <location line="-509"/>
+ <location line="-511"/>
<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 type="unfinished"></translation>
+ <translation>Das Hochladen konnte nicht gestartet weden. Entweder fehlt das Skript '%1', oder die Berechtigungen sind nicht ausreichend.</translation>
</message>
<message>
<location line="+6"/>
<source>The upload process crashed some time after starting successfully.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Hochladen ist nach dem Starten abgestürzt.</translation>
</message>
<message>
<location line="+9"/>
<source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Fehler trat beim Versuch des Schreibens zum Hochlade-Prozess auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen.</translation>
</message>
<message>
<location line="+5"/>
<source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Fehler trat beim Versuch des Lesens vom Hochlade-Prozess auf. Wahrscheinlich läuft der Prozess nicht.</translation>
</message>
<message>
<location line="+4"/>
<source>An unknown error in the upload process occurred. This is the default return value of error().</source>
- <translation type="unfinished"></translation>
+ <translation>Es trat ein unbekannter Fehler im Hochlade-Prozess auf.</translation>
</message>
<message>
<location line="+180"/>
<source>Reading %1...</source>
- <translation type="unfinished"></translation>
+ <translation>Lese %1...</translation>
</message>
<message>
- <location line="+422"/>
+ <location line="+409"/>
<source>Jumped. Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation>Sprung ausgeführt/ Angehalten.</translation>
</message>
<message>
<location line="+25"/>
- <location line="+241"/>
+ <location line="+242"/>
<source>Run to Function finished. Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgeführung bis zu Funktion beendet. Angehalten.</translation>
</message>
<message>
<location line="-161"/>
<source>Program exited with exit code %1</source>
- <translation type="unfinished"></translation>
+ <translation>Das Programm wurde beendet, Rückgabewert %1</translation>
</message>
<message>
<location line="+3"/>
<source>Program exited after receiving signal %1</source>
- <translation type="unfinished"></translation>
+ <translation>Das Programm wurde nach Erhalt des Signals %1 beendet</translation>
</message>
<message>
<location line="+3"/>
<source>Program exited normally</source>
- <translation type="unfinished"></translation>
+ <translation>Das Programm wurde normal beendet</translation>
</message>
<message>
<location line="+48"/>
<source>Loading %1...</source>
- <translation type="unfinished"></translation>
+ <translation>Lade %1...</translation>
</message>
<message>
<location line="+55"/>
<source>Stopped at breakpoint.</source>
- <translation type="unfinished"></translation>
+ <translation>An Haltepunkt angehalten.</translation>
</message>
<message>
<location line="+30"/>
<source>Stopped: "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Angehalten: "%1"</translation>
</message>
<message>
<location line="+99"/>
<source>The debugger you are using identifies itself as:</source>
- <translation type="unfinished"></translation>
+ <translation>Der benutzte Debugger ist:</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>
+ <translation>Diese Version wird von Qt Creator nicht offiziell unterstützt.
+Das Debuggen wird wahrscheinlich nicht richtig funktionieren.
+Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
</message>
<message>
<location line="+29"/>
<location line="+19"/>
<source>Starting executable failed:
</source>
- <translation type="unfinished"></translation>
+ <translation>Das Starten der ausführbaren Datei schlug fehl:
+</translation>
</message>
<message>
<source>Running...</source>
@@ -3348,7 +3646,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="-248"/>
<source>Processing queued commands.</source>
- <translation type="unfinished"></translation>
+ <translation>Kommando-Warteschlange wird abgearbeitet.</translation>
</message>
<message>
<location line="+97"/>
@@ -3356,77 +3654,77 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>Angehalten.</translation>
</message>
<message>
- <location line="+299"/>
+ <location line="+289"/>
<location line="+27"/>
<source>Debugger Startup Failure</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Starten des Debuggers</translation>
</message>
<message>
<location line="-26"/>
<source>Cannot set up communication with child process: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Die Kommunikation mit dem untergeordneten Prozesss konnte nicht hergestellt werden: %1</translation>
</message>
<message>
<location line="+23"/>
<source>Starting Debugger: </source>
- <translation type="unfinished"></translation>
+ <translation>Starte Debugger: </translation>
</message>
<message>
<location line="+4"/>
<source>Cannot start debugger: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Der Debugger konnte nicht gestartet werden: %1</translation>
</message>
<message>
<location line="+8"/>
<source>Gdb Running...</source>
- <translation type="unfinished"></translation>
+ <translation>Gdb läuft...</translation>
</message>
<message>
<location line="+71"/>
<source>Cannot find debugger initialization script</source>
- <translation type="unfinished"></translation>
+ <translation>Das Initalisierungsskript konnte nicht gefunden werden</translation>
</message>
<message>
<location line="+1"/>
<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>
+ <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="+93"/>
+ <location line="+94"/>
<source>Attached to running process. Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation>An laufenden Prozess angehängt. Angehalten.</translation>
</message>
<message>
<location line="+55"/>
<source>Connecting to remote server failed:</source>
- <translation type="unfinished"></translation>
+ <translation>Die Verbindung zum Server konnte nicht hergestellt werden:</translation>
</message>
<message>
<location line="+9"/>
<source>Debugger exited.</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger beendet.</translation>
</message>
<message>
- <location line="+623"/>
+ <location line="+614"/>
<source><could not retreive module information></source>
- <translation type="unfinished"></translation>
+ <translation><Modulinformation nicht verfügbar></translation>
</message>
<message>
<location line="+39"/>
<source>Unable to run '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>'%1' kann nicht ausgeführt werden: %2</translation>
</message>
<message>
<location line="+61"/>
<source><unknown></source>
<extracomment>End address of loaded module</extracomment>
- <translation type="unfinished"></translation>
+ <translation><unbekannt></translation>
</message>
<message>
<location line="+30"/>
<location line="+83"/>
<source>Retrieving data for stack view...</source>
- <translation type="unfinished"></translation>
+ <translation>Daten der Stack-Anzeige werden empfangen...</translation>
</message>
<message>
<location line="+188"/>
@@ -3449,96 +3747,123 @@ Using gdb 6.7 or later is strongly recommended.</source>
<extracomment>Variable</extracomment>
<translation><nicht im Bereich></translation>
</message>
+ <message numerus="yes">
+ <location line="+98"/>
+ <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>
+ <numerusform>Daten der für die Anzeige der lokalen Variablen werden empfangen (%n austehende Anfragen) ...</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+330"/>
+ <source>%n custom dumpers found.</source>
+ <translation>
+ <numerusform>Ein unterstützter Typ wurde in der Ausgabe-Hilfsbibliothek gefunden.</numerusform>
+ <numerusform>%n unterstützte Typen wurden in der Ausgabe-Hilfsbibliothek gefunden.</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+282"/>
+ <source><%n items></source>
+ <extracomment>In string list</extracomment>
+ <translation>
+ <numerusform><Ein Element></numerusform>
+ <numerusform><%n Elemente></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+112"/>
- <location line="+42"/>
<source>Retrieving data for watch view (%1 requests pending)...</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Daten der für die Anzeige der lokalen Variablen werden empfangen (noch %1 austehende Anfragen) ...</translation>
</message>
<message>
- <location line="+209"/>
+ <location line="-346"/>
<source>Finished retrieving data.</source>
- <translation type="unfinished"></translation>
+ <translation>Alle Daten erhalten.</translation>
</message>
<message>
<location line="+11"/>
<source>Cannot evaluate expression: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Der Ausdruck konnte nicht ausgewertet werden: %1</translation>
</message>
<message>
<location line="+42"/>
<source>Debugging helpers not found.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>%1 custom dumpers found.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Ausgabe-Hilfsbibliothek konnte nicht gefunden werden.</translation>
</message>
<message>
- <location line="+111"/>
+ <location line="+121"/>
<source>Custom dumper setup: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe-Hilfsbibliothek-Initialisierung: %1</translation>
</message>
<message>
<location line="+165"/>
<source><0 items></source>
- <translation type="unfinished"></translation>
+ <translation><leer></translation>
</message>
<message>
- <location line="+7"/>
- <source><%1 items></source>
- <extracomment>In string list</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+124"/>
+ <location line="+136"/>
<source>%1 <shadowed %2></source>
<extracomment>Variable %1 <FIXME: does something - bug Andre about it></extracomment>
- <translation type="unfinished"></translation>
+ <translation>%1 <überlagert %2></translation>
</message>
<message>
<location line="+4"/>
<source><shadowed></source>
<extracomment>Type of variable <FIXME: what? bug Andre about it></extracomment>
- <translation type="unfinished"></translation>
+ <translation><überlagert></translation>
</message>
<message>
<location line="+159"/>
<source><n/a></source>
- <translation type="unfinished"></translation>
+ <translation><k.a.></translation>
</message>
<message>
<location line="+2"/>
<source><anonymous union></source>
- <translation type="unfinished"></translation>
+ <translation><Datentyp anonyme Union></translation>
</message>
<message>
<location line="+38"/>
<source><no information></source>
<extracomment>About variable's value</extracomment>
- <translation type="unfinished"></translation>
+ <translation><keine Angabe></translation>
</message>
<message>
<location line="+16"/>
<source>Unknown error: </source>
- <translation type="unfinished"></translation>
+ <translation>Unbekannter Fehler: </translation>
</message>
<message>
<location line="+19"/>
<source>%1 is a typedef.</source>
- <translation type="unfinished"></translation>
+ <translation>%1 ist eine Typdefinition (typedef).</translation>
</message>
<message>
<location line="+11"/>
<source>Retrieving data for tooltip...</source>
- <translation type="unfinished"></translation>
+ <translation>Empfange Daten für Tooltip...</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+70"/>
<source>The dumper library '%1' does not exist.</source>
<translation>Es existiert keine Dumper-Bibliothek '%1'.</translation>
</message>
+ <message>
+ <location line="+13"/>
+ <source>Dumper injection loading triggered (%1)...</source>
+ <translation>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>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Loading dumpers via debugger call (%1)...</source>
+ <translation>Lade die Ausgabe-Hilfsbibliothek (%1) per Debugger-Aufruf...</translation>
+ </message>
</context>
<context>
<name>Debugger::Internal::GdbOptionsPage</name>
@@ -3555,7 +3880,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+2"/>
<source>Choose Location of Startup Script File</source>
- <translation>Pfad zu Startup Script</translation>
+ <translation>Pfad zu Startup-Skript</translation>
</message>
</context>
<context>
@@ -3678,18 +4003,18 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+11"/>
<source>Cannot create FiFo %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die FiFo %1 konnte nicht erzeugt werden: %2</translation>
</message>
<message>
<location line="+6"/>
<source>Cannot open FiFo %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die FiFo %1 konnte nicht geöffnet werden: %2</translation>
</message>
</context>
<context>
<name>Debugger::Internal::RegisterHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/registerhandler.cpp" line="+92"/>
+ <location filename="../../../src/plugins/debugger/registerhandler.cpp" line="+90"/>
<source>Name</source>
<translation>Name</translation>
</message>
@@ -3730,7 +4055,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::ScriptEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/scriptengine.cpp" line="+455"/>
+ <location filename="../../../src/plugins/debugger/scriptengine.cpp" line="+466"/>
<source>'%1' contains no identifier</source>
<translation>'%1' enthält keinen Bezeichner</translation>
</message>
@@ -3789,7 +4114,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="+82"/>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+97"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
@@ -3799,13 +4124,42 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation><Mehr></translation>
</message>
<message>
- <location line="+23"/>
<source><table><tr><td>Address:</td><td>%1</td></tr><tr><td>Function: </td><td>%2</td></tr><tr><td>File: </td><td>%3</td></tr><tr><td>Line: </td><td>%4</td></tr><tr><td>From: </td><td>%5</td></tr></table><tr><td>To: </td><td>%6</td></tr></table></source>
<extracomment>Tooltip for variable</extracomment>
- <translation><table><tr><td>Adresse:</td><td>%1</td></tr><tr><td>Funktion: </td><td>%2</td></tr><tr><td>Datei: </td><td>%3</td></tr><tr><td>Zeile: </td><td>%4</td></tr><tr><td>Von: </td><td>%5</td></tr></table><tr><td>bis: </td><td>%6</td></tr></table></translation>
+ <translation type="obsolete"><table><tr><td>Adresse:</td><td>%1</td></tr><tr><td>Funktion: </td><td>%2</td></tr><tr><td>Datei: </td><td>%3</td></tr><tr><td>Zeile: </td><td>%4</td></tr><tr><td>Von: </td><td>%5</td></tr></table><tr><td>bis: </td><td>%6</td></tr></table></translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-45"/>
+ <source>Address:</source>
+ <translation>Adresse:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Function:</source>
+ <translation>Funktion:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>File:</source>
+ <translation>Datei:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Line:</source>
+ <translation>Zeile:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>From:</source>
+ <translation>Von:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>To:</source>
+ <translation>Bis:</translation>
+ </message>
+ <message>
+ <location line="+76"/>
<source>Level</source>
<translation>Tiefe</translation>
</message>
@@ -3856,7 +4210,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::StartExternalDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+70"/>
+ <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+87"/>
<source>Select Executable</source>
<translation>Ausführbare Datei auswählen</translation>
</message>
@@ -3880,14 +4234,27 @@ Using gdb 6.7 or later is strongly recommended.</source>
</message>
</context>
<context>
- <name>Debugger::Internal::ThreadsHandler</name>
+ <name>Debugger::Internal::TcfEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+107"/>
- <source>Thread: %1</source>
- <translation>Thread: %1</translation>
+ <location filename="../../../src/plugins/debugger/tcfengine.cpp" line="+201"/>
+ <source>%1.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+380"/>
+ <source>Stopped.</source>
+ <translation>Angehalten.</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::ThreadsHandler</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+107"/>
+ <source>Thread: %1</source>
+ <translation>Thread: %1</translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Thread ID</source>
<translation>Thread-Id</translation>
</message>
@@ -3921,7 +4288,32 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>Debugger::Internal::WatchHandler</name>
<message>
- <location line="+232"/>
+ <location line="+185"/>
+ <source>Expression</source>
+ <translation>Ausdruck</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source> ... <cut off></source>
+ <translation>...<Rest abgeschnitten></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Object Address</source>
+ <translation>Adresse des Objekts</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Stored Address</source>
+ <translation>Speicheradresse</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>iname</source>
+ <translation>iname</translation>
+ </message>
+ <message>
+ <location line="+66"/>
<source>Root</source>
<translation>Wurzelelement</translation>
</message>
@@ -3941,17 +4333,19 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>Überwachte Ausdrücke</translation>
</message>
<message>
- <location line="+270"/>
+ <location line="+242"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-338"/>
+ <location line="+339"/>
<source>Value</source>
<translation>Wert</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-345"/>
+ <location line="+346"/>
<source>Type</source>
<translation>Typ</translation>
</message>
@@ -4015,12 +4409,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<context>
<name>DebuggingHelperOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-596"/>
+ <source>Debugging Helper</source>
+ <translation>Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
- <location/>
+ <location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
<source>This will enable nice display of Qt and Standard Library objects in the Locals&Watchers view</source>
<translation>Diese Einstellung ermöglicht die Anzeige von Qt- und Standardbibliotheksobjekten in der Ansicht "Lokale Variablen und Über&wachte Ausdrücke"</translation>
</message>
@@ -4055,31 +4449,30 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+118"/>
<source>Unable to add dependency</source>
- <translation type="unfinished"></translation>
+ <translation>Die Abhängigkeit konnte nicht hinzugefügt werden</translation>
</message>
<message>
<location line="+1"/>
<source>This would create a circular dependency.</source>
- <translation type="unfinished"></translation>
+ <translation>Dadurch würde eine zirkuläre Abhängigkeit entstehen.</translation>
</message>
</context>
<context>
<name>Designer</name>
<message>
- <location filename="../../../src/shared/qrceditor/resourcefile.cpp" line="+85"/>
- <location line="+63"/>
- <source>file name is empty</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../src/shared/qrceditor/resourcefile.cpp" line="+54"/>
+ <source>The file name is empty.</source>
+ <translation>Der Dateiname ist leer.</translation>
</message>
<message>
- <location line="-46"/>
+ <location line="+54"/>
<source>XML error on line %1, col %2: %3</source>
- <translation type="unfinished"></translation>
+ <translation>XML-Fehler auf Zeile %1, Spalte %2: %3</translation>
</message>
<message>
<location line="+7"/>
- <source>no <RCC> root element</source>
- <translation type="unfinished"></translation>
+ <source>The <RCC> root element is missing.</source>
+ <translation>Das Wurzelelement (<RCC>) fehlt.</translation>
</message>
</context>
<context>
@@ -4087,20 +4480,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/editorwidget.cpp" line="+174"/>
<source>Action editor</source>
- <translation type="unfinished"></translation>
+ <translation>Aktionseditor</translation>
</message>
<message>
<location line="+1"/>
<source>Signals and slots editor</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Designer::Internal::FormClassWizard</name>
- <message>
- <location filename="../../../src/plugins/designer/cpp/formclasswizard.cpp" line="+93"/>
- <source>Internal error: FormClassWizard::generateFiles: empty template contents</source>
- <translation type="unfinished"></translation>
+ <translation>Signale und Slots</translation>
</message>
</context>
<context>
@@ -4108,7 +4493,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/cpp/formclasswizarddialog.cpp" line="+52"/>
<source>Qt Designer Form Class</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Designer-Formular-Klasse</translation>
</message>
</context>
<context>
@@ -4116,17 +4501,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+194"/>
<source>%1 - Error</source>
- <translation type="unfinished"></translation>
+ <translation>%1 - Fehler</translation>
</message>
<message>
<location filename="../../../src/plugins/designer/cpp/formclasswizardpage.ui"/>
<source>Choose a class name</source>
- <translation type="unfinished"></translation>
+ <translation>Wählen Sie einen Klassennamen</translation>
</message>
<message>
<location/>
<source>Class</source>
- <translation type="unfinished"></translation>
+ <translation>Klasse</translation>
</message>
<message>
<location/>
@@ -4136,37 +4521,32 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location/>
<source>More</source>
- <translation type="unfinished"></translation>
+ <translation>Weiter</translation>
</message>
<message>
<location/>
<source>Embedding of the UI class</source>
- <translation type="unfinished"></translation>
+ <translation>Verwendung der UI-Klasse</translation>
</message>
<message>
<location/>
<source>Aggregation as a pointer member</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>buttonGroup</source>
- <translation type="unfinished"></translation>
+ <translation>Aggregation als Zeiger</translation>
</message>
<message>
<location/>
<source>Aggregation</source>
- <translation type="unfinished"></translation>
+ <translation>Aggregation</translation>
</message>
<message>
<location/>
<source>Multiple Inheritance</source>
- <translation type="unfinished"></translation>
+ <translation>Mehrfachvererbung</translation>
</message>
<message>
<location/>
<source>Support for changing languages at runtime</source>
- <translation type="unfinished"></translation>
+ <translation>Wechsel der Sprache zur Laufzeit unterstützen</translation>
</message>
</context>
<context>
@@ -4174,27 +4554,27 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formeditorplugin.cpp" line="+148"/>
<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>Qt Designer-Formular</translation>
</message>
<message>
<location line="+1"/>
<source>This creates a new Qt Designer form file.</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellt eine neues Qt Designer-Formular </translation>
</message>
<message>
<location line="+6"/>
<source>Qt Designer Form Class</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Designer-Formular-Klasse</translation>
</message>
<message>
<location line="+1"/>
<source>This creates a new Qt Designer form class.</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellt eine neue Qt Designer-Formular-Klasse.</translation>
</message>
</context>
<context>
@@ -4202,37 +4582,37 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formeditorw.cpp" line="+272"/>
<source>Designer widgetbox</source>
- <translation type="unfinished"></translation>
+ <translation>Widgetbox</translation>
</message>
<message>
<location line="+5"/>
<source>Object inspector</source>
- <translation type="unfinished"></translation>
+ <translation>Objektanzeige</translation>
</message>
<message>
<location line="+5"/>
<source>Property editor</source>
- <translation type="unfinished"></translation>
+ <translation>Eigenschaften</translation>
</message>
<message>
<location line="+5"/>
<source>Signals and slots editor</source>
- <translation type="unfinished"></translation>
+ <translation>Signale und Slots</translation>
</message>
<message>
<location line="+4"/>
<source>Action editor</source>
- <translation type="unfinished"></translation>
+ <translation>Aktionseditor</translation>
</message>
<message>
<location line="+42"/>
<source>For&m editor</source>
- <translation type="unfinished"></translation>
+ <translation>For&mulareditor</translation>
</message>
<message>
<location line="+30"/>
<source>Edit widgets</source>
- <translation type="unfinished"></translation>
+ <translation>Widgets bearbeiten</translation>
</message>
<message>
<location line="+1"/>
@@ -4242,7 +4622,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+4"/>
<source>Edit signals/slots</source>
- <translation type="unfinished"></translation>
+ <translation>Signale und Slots bearbeiten</translation>
</message>
<message>
<location line="+1"/>
@@ -4252,12 +4632,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+4"/>
<source>Edit buddies</source>
- <translation type="unfinished"></translation>
+ <translation>Buddies bearbeiten</translation>
</message>
<message>
<location line="+5"/>
<source>Edit tab order</source>
- <translation type="unfinished"></translation>
+ <translation>Tabulatorreihenfolge bearbeiten</translation>
</message>
<message>
<location line="+5"/>
@@ -4307,22 +4687,22 @@ 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>Plugins...</translation>
</message>
<message>
<location line="+35"/>
<source>Preview in</source>
- <translation type="unfinished"></translation>
+ <translation>Vorschau in</translation>
</message>
<message>
<location line="+53"/>
<source>Designer</source>
- <translation type="unfinished"></translation>
+ <translation>Designer</translation>
</message>
<message>
<location line="+131"/>
- <source>The image could not be create: %1</source>
- <translation type="unfinished"></translation>
+ <source>The image could not be created: %1</source>
+ <translation>Das Bild konnte nicht erstellt werden: %1</translation>
</message>
</context>
<context>
@@ -4330,18 +4710,18 @@ 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>Wählen Sie eine Vorlage</translation>
</message>
<message>
<location line="+30"/>
<source>%1 - Error</source>
- <translation type="unfinished"></translation>
+ <translation>%1 - Fehler</translation>
</message>
</context>
<context>
<name>Designer::Internal::FormWindowEditor</name>
<message>
- <location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+161"/>
+ <location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+163"/>
<source>untitled</source>
<translation>kein Titel</translation>
</message>
@@ -4351,17 +4731,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formwindowfile.cpp" line="+76"/>
<source>Error saving %1</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Speichern von %1</translation>
</message>
<message>
<location line="+100"/>
<source>Unable to open %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 kann nicht geöffnet werden: %2</translation>
</message>
<message>
<location line="+12"/>
<source>Unable to write to %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei %1 kann nicht geschrieben werden: %2</translation>
</message>
</context>
<context>
@@ -4369,15 +4749,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>
- </message>
-</context>
-<context>
- <name>Designer::Internal::SettingsPage</name>
- <message>
- <location filename="../../../src/plugins/designer/settingspage.cpp" line="+63"/>
- <source>Designer</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Designer-Formular</translation>
</message>
</context>
<context>
@@ -4385,35 +4757,39 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
<source>The class definition of '%1' could not be found in %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Definition der Klasse '%1' konnte in %2 nicht gefunden werden.</translation>
</message>
<message>
<location line="+462"/>
<source>Error finding/adding a slot.</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Auffinden/Hinzufügen des Slot-Codes.</translation>
</message>
<message>
<location line="+41"/>
<source>No documents matching '%1' could be found.
Rebuilding the project might help.</source>
- <translation type="unfinished"></translation>
+ <translation>Es konnten keine dem Suchmuster '%1' entsprechenden Dokumente gefunden werden.
+Versuchen Sie, das Projekt neu zu erstellen.</translation>
</message>
<message>
<location line="+59"/>
<source>Unable to add the method definition.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Definition der Methode konnte nicht hinzugefügt werden.</translation>
</message>
</context>
<context>
- <name>DocSettingsPage</name>
+ <name>Designer::Internal::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/help/docsettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../src/plugins/designer/settingspage.cpp" line="+63"/>
+ <source>Designer</source>
+ <translation>Designer</translation>
</message>
+</context>
+<context>
+ <name>DocSettingsPage</name>
<message>
- <location/>
- <source>Registered Documentation:</source>
+ <location filename="../../../src/plugins/help/docsettingspage.ui"/>
+ <source>Registered Documentation</source>
<translation>Registrierte Dokumentationen</translation>
</message>
<message>
@@ -4427,23 +4803,55 @@ Rebuilding the project might help.</source>
<translation>Entfernen</translation>
</message>
</context>
+<context>
+ <name>DuiEditor::Internal::DuiEditorPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/duieditor/duieditorplugin.cpp" line="+98"/>
+ <location line="+1"/>
+ <source>Qt QML File</source>
+ <translation>Qt QML-Datei</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt</source>
+ <translation>Qt</translation>
+ </message>
+</context>
+<context>
+ <name>DuiEditor::Internal::ScriptEditor</name>
+ <message>
+ <location filename="../../../src/plugins/duieditor/duieditor.cpp" line="+456"/>
+ <source><Select Symbol></source>
+ <translation><Symbol auswählen></translation>
+ </message>
+ <message>
+ <location line="+101"/>
+ <source>Rename...</source>
+ <translation>Umbenennen...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>New id:</source>
+ <translation>Neue Id:</translation>
+ </message>
+ <message>
+ <location line="+147"/>
+ <source>Rename id '%1'...</source>
+ <translation>Id '%1' Umbenennen</translation>
+ </message>
+</context>
<context>
<name>EmbeddedPropertiesPage</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/embeddedpropertiespage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
+ <source>Skin:</source>
+ <translation>Skin:</translation>
</message>
<message>
<location/>
<source>Use Virtual Box
Note: This adds the toolchain to the build environment and runs the program inside a virtual machine.
-It also automatically sets the correct qt version.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Skin:</source>
+It also automatically sets the correct Qt version.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -4451,86 +4859,66 @@ It also automatically sets the correct qt version.</source>
<name>ExtensionSystem::Internal::PluginDetailsView</name>
<message>
<location filename="../../../src/libs/extensionsystem/plugindetailsview.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Name:</source>
<translation>Name:</translation>
</message>
- <message>
- <location/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location/>
<source>Version:</source>
- <translation type="unfinished"></translation>
+ <translation>Version:</translation>
</message>
<message>
<location/>
<source>Compatibility Version:</source>
- <translation type="unfinished"></translation>
+ <translation>Kompatible zu Version:</translation>
</message>
<message>
<location/>
<source>Vendor:</source>
- <translation type="unfinished"></translation>
+ <translation>Anbieter:</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>Pfad:</translation>
</message>
<message>
<location/>
<source>Description:</source>
- <translation type="unfinished"></translation>
+ <translation>Beschreibung:</translation>
</message>
<message>
<location/>
<source>Copyright:</source>
- <translation type="unfinished"></translation>
+ <translation>Copyright:</translation>
</message>
<message>
<location/>
<source>License:</source>
- <translation type="unfinished"></translation>
+ <translation>Lizenz:</translation>
</message>
<message>
<location/>
<source>Dependencies:</source>
- <translation type="unfinished"></translation>
+ <translation>Abhängigkeiten:</translation>
</message>
</context>
<context>
<name>ExtensionSystem::Internal::PluginErrorView</name>
<message>
<location filename="../../../src/libs/extensionsystem/pluginerrorview.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>State:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
+ <translation>Status:</translation>
</message>
<message>
<location/>
<source>Error Message:</source>
- <translation type="unfinished"></translation>
+ <translation>Fehlermeldung:</translation>
</message>
</context>
<context>
@@ -4538,28 +4926,23 @@ It also automatically sets the correct qt version.</source>
<message>
<location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+415"/>
<source>File does not exist: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei '%1' existiert nicht.</translation>
</message>
<message>
<location line="+2"/>
<source>Could not open file for read: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei konnte nicht zum Lesen geöffnen werden: %1</translation>
</message>
<message>
<location line="+16"/>
<source>Error parsing file %1: %2, at line %3, column %4</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Lesen der Datei %1: %2 auf Zeile %3, Spalte %4</translation>
</message>
</context>
<context>
<name>ExtensionSystem::Internal::PluginView</name>
<message>
<location filename="../../../src/libs/extensionsystem/pluginview.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>State</source>
<translation>Status</translation>
</message>
@@ -4571,17 +4954,17 @@ It also automatically sets the correct qt version.</source>
<message>
<location/>
<source>Version</source>
- <translation type="unfinished"></translation>
+ <translation>Version</translation>
</message>
<message>
<location/>
<source>Vendor</source>
- <translation type="unfinished"></translation>
+ <translation>Anbieter</translation>
</message>
<message>
<location/>
<source>Location</source>
- <translation type="unfinished"></translation>
+ <translation>Pfad</translation>
</message>
</context>
<context>
@@ -4589,82 +4972,82 @@ It also automatically sets the correct qt version.</source>
<message>
<location filename="../../../src/libs/extensionsystem/pluginerrorview.cpp" line="+78"/>
<source>Invalid</source>
- <translation type="unfinished"></translation>
+ <translation>Ungültig</translation>
</message>
<message>
<location line="+1"/>
<source>Description file found, but error on read</source>
- <translation type="unfinished"></translation>
+ <translation>Fehlerhafte Beschreibungsdatei gefunden</translation>
</message>
<message>
<location line="+3"/>
<source>Read</source>
- <translation type="unfinished"></translation>
+ <translation>Gelesen</translation>
</message>
<message>
<location line="+1"/>
<source>Description successfully read</source>
- <translation type="unfinished"></translation>
+ <translation>Beschreibungsdatei gelesen</translation>
</message>
<message>
<location line="+3"/>
<source>Resolved</source>
- <translation type="unfinished"></translation>
+ <translation>Abhängigkeiten bestimmt</translation>
</message>
<message>
<location line="+1"/>
<source>Dependencies are successfully resolved</source>
- <translation type="unfinished"></translation>
+ <translation>Die Abhängigkeiten wurden erfolgreich bestimmt</translation>
</message>
<message>
<location line="+3"/>
<source>Loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Geladen</translation>
</message>
<message>
<location line="+1"/>
<source>Library is loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Die Bibliothek wurde geladen</translation>
</message>
<message>
<location line="+3"/>
<source>Initialized</source>
- <translation type="unfinished"></translation>
+ <translation>Initialisiert</translation>
</message>
<message>
<location line="+1"/>
<source>Plugin's initialization method succeeded</source>
- <translation type="unfinished"></translation>
+ <translation>Die Initialisierungsmethode des Plugins wurde erfolgreich abgearbeitet</translation>
</message>
<message>
<location line="+3"/>
<source>Running</source>
- <translation type="unfinished"></translation>
+ <translation>Läuft</translation>
</message>
<message>
<location line="+1"/>
<source>Plugin successfully loaded and running</source>
- <translation type="unfinished"></translation>
+ <translation>Das Plugin wurde erfolgreich geladen und läuft</translation>
</message>
<message>
<location line="+3"/>
<source>Stopped</source>
- <translation type="unfinished"></translation>
+ <translation>Angehalten</translation>
</message>
<message>
<location line="+1"/>
<source>Plugin was shut down</source>
- <translation type="unfinished"></translation>
+ <translation>Das Plugin wurde angehalten</translation>
</message>
<message>
<location line="+2"/>
<source>Deleted</source>
- <translation type="unfinished"></translation>
+ <translation>Gelöscht</translation>
</message>
<message>
<location line="+1"/>
<source>Plugin ended it's life cycle and was deleted</source>
- <translation type="unfinished"></translation>
+ <translation>Das Plugin wurde nach Ablauf seiner Nutzungsdauer gelöscht</translation>
</message>
</context>
<context>
@@ -4673,30 +5056,46 @@ It also automatically sets the correct qt version.</source>
<location filename="../../../src/libs/extensionsystem/pluginmanager.cpp" line="+618"/>
<source>Circular dependency detected:
</source>
- <translation type="unfinished"></translation>
+ <translation>Zirkuläre Abhängigkeit festgestellt:
+</translation>
</message>
<message>
<location line="+3"/>
<source>%1(%2) depends on
</source>
- <translation type="unfinished"></translation>
+ <translation>%1 (%2) hängt von
+</translation>
</message>
<message>
<location line="+3"/>
<source>%1(%2)</source>
- <translation type="unfinished"></translation>
+ <translation>%1(%2)</translation>
</message>
<message>
<location line="+8"/>
<source>Cannot load plugin because dependencies are not resolved</source>
- <translation type="unfinished"></translation>
+ <translation>Das Plugin kann nicht geladen werden, weil die Abhängigkeiten nicht bestimmt werden konnten</translation>
</message>
<message>
<location line="+8"/>
<location line="+29"/>
<source>Cannot load plugin because dependency failed to load: %1(%2)
Reason: %3</source>
- <translation type="unfinished"></translation>
+ <translation>Das Plugin kann nicht geladen werden, weil eine Abhängigkeit nicht geladen werden konnte: %1(%2)
+Grund: %3</translation>
+ </message>
+</context>
+<context>
+ <name>FakeVim::Internal</name>
+ <message>
+ <location filename="../../../src/plugins/fakevim/fakevimactions.cpp" line="+119"/>
+ <source>Toggle vim-style editing</source>
+ <translation>Editieren im vim-Modus umschalten</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>FakeVim properties...</source>
+ <translation>FakeVim-Einstellungen...</translation>
</message>
</context>
<context>
@@ -4715,84 +5114,92 @@ Reason: %3</source>
<message>
<location line="+25"/>
<source>Not implemented in FakeVim</source>
- <translation type="unfinished"></translation>
+ <translation>In FakeVim nicht implementiert</translation>
</message>
<message>
<location line="+120"/>
<location line="+685"/>
<location line="+19"/>
<source>E20: Mark '%1' not set</source>
- <translation type="unfinished"></translation>
+ <translation>E20: Die Marke '%1' ist nicht gesetzt</translation>
</message>
<message>
<location line="+103"/>
<source>File '%1' exists (add ! to override)</source>
- <translation type="unfinished"></translation>
+ <translation>Die '%1' existiert bereits (Fügen Sie ! an, um sie zu überschreiben)</translation>
</message>
<message>
<location line="+19"/>
<source>Cannot open file '%1' for writing</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei '%1' kann nicht zum Schreiben geöffnet werden</translation>
</message>
<message>
<location line="+7"/>
<source>"%1" %2 %3L, %4C written</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" %2 %3L, %4C geschrieben</translation>
</message>
<message>
<location line="+4"/>
<source>Cannot open file '%1' for reading</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei '%1' kann nicht zum Lesen geöffnet werden</translation>
</message>
<message>
<location line="+10"/>
<source>"%1" %2L, %3C</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location line="+18"/>
- <source>%1 lines filtered</source>
- <translation type="unfinished"></translation>
+ <source>%n lines filtered</source>
+ <translation type="unfinished">
+ <numerusform>Eine Zeile gefiltert</numerusform>
+ <numerusform>%n Zeilen gefiltert
+</numerusform>
+ </translation>
</message>
- <message>
+ <message numerus="yes">
<location line="+7"/>
- <source>%1 lines >ed %2 time</source>
- <translation type="unfinished"></translation>
+ <source>%n lines >ed %1 time</source>
+ <translatorcomment>What is that?</translatorcomment>
+ <translation type="unfinished">
+ <numerusform>Eine Zeile >ed %1-mal</numerusform>
+ <numerusform>%n Zeilen >ed %1-mal</numerusform>
+ </translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+81"/>
<source>E512: Unknown option: </source>
- <translation type="unfinished"></translation>
+ <translation>E512: Unbekannte Option:</translation>
</message>
<message>
<location line="+21"/>
<source>E492: Not an editor command: </source>
- <translation type="unfinished"></translation>
+ <translation>E492: Kein Editor-Kommando:</translation>
</message>
<message>
<location line="+47"/>
<source>search hit BOTTOM, continuing at TOP</source>
- <translation type="unfinished"></translation>
+ <translation>Die Suche hat das Ende erreicht, setze am Anfang fort</translation>
</message>
<message>
<location line="+2"/>
<source>search hit TOP, continuing at BOTTOM</source>
- <translation type="unfinished"></translation>
+ <translation>Die Suche hat den Anfang erreicht, setze am Ende fort</translation>
</message>
<message>
<location line="+4"/>
<source>E486: Pattern not found: </source>
- <translation type="unfinished"></translation>
+ <translation>E486: Suchmuster nicht gefunden: </translation>
</message>
<message>
<location line="+374"/>
<source>Already at oldest change</source>
- <translation type="unfinished"></translation>
+ <translation>Älteste Änderung erreicht</translation>
</message>
<message>
<location line="+18"/>
<source>Already at newest change</source>
- <translation type="unfinished"></translation>
+ <translation>Letzte Änderung erreicht</translation>
</message>
</context>
<context>
@@ -4805,7 +5212,7 @@ Reason: %3</source>
<message>
<location line="+2"/>
<source>FakeVim</source>
- <translation type="unfinished"></translation>
+ <translation>FakeVim</translation>
</message>
</context>
<context>
@@ -4814,100 +5221,95 @@ Reason: %3</source>
<location line="+299"/>
<location line="+141"/>
<source>Quit FakeVim</source>
- <translation type="unfinished"></translation>
+ <translation>FakeVim Beenden</translation>
</message>
<message>
<location line="+7"/>
<source>FakeVim Information</source>
- <translation type="unfinished"></translation>
+ <translation>Informationen zu FakeVim</translation>
</message>
</context>
<context>
<name>FakeVimOptionPage</name>
<message>
<location filename="../../../src/plugins/fakevim/fakevimoptions.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Use FakeVim</source>
- <translation type="unfinished"></translation>
+ <translation>FakeVim benutzen</translation>
</message>
<message>
<location/>
<source>Vim style settings</source>
- <translation type="unfinished"></translation>
+ <translation>Einstellungen für Vim-Stil </translation>
</message>
<message>
<location/>
<source>vim's "expandtab" option</source>
- <translation type="unfinished"></translation>
+ <translation>Die "expandtab"-Einstellung von vim</translation>
</message>
<message>
<location/>
<source>Expand tabulators:</source>
- <translation type="unfinished"></translation>
+ <translation>Tabulatoren expandieren:</translation>
</message>
<message>
<location/>
<source>Highlight search results:</source>
- <translation type="unfinished"></translation>
+ <translation>Suchergebnisse hervorheben:</translation>
</message>
<message>
<location/>
<source>Shift width:</source>
- <translation type="unfinished"></translation>
+ <translation>Einrückung:</translation>
</message>
<message>
<location/>
<source>Smart tabulators:</source>
- <translation type="unfinished"></translation>
+ <translation>"Smart"-Tabularmodus:</translation>
</message>
<message>
<location/>
<source>Start of line:</source>
- <translation type="unfinished"></translation>
+ <translation>Zeilenanfang:</translation>
</message>
<message>
<location/>
<source>vim's "tabstop" option</source>
- <translation type="unfinished"></translation>
+ <translation>Die "tabstop"-Einstellung von vim</translation>
</message>
<message>
<location/>
<source>Tabulator size:</source>
- <translation type="unfinished"></translation>
+ <translation>Tabulatorweite:</translation>
</message>
<message>
<location/>
<source>Backspace:</source>
- <translation type="unfinished"></translation>
+ <translation>Rücktaste:</translation>
</message>
<message>
<location/>
<source>VIM's "autoindent" option</source>
- <translation type="unfinished"></translation>
+ <translation>Die "autoindent"-Einstellung von vim</translation>
</message>
<message>
<location/>
<source>Automatic indentation:</source>
- <translation type="unfinished"></translation>
+ <translation>Automatische Einrückung:</translation>
</message>
<message>
<location/>
<source>Copy text editor settings</source>
- <translation type="unfinished"></translation>
+ <translation>Texteditor-Einstellungen</translation>
</message>
<message>
<location/>
<source>Set Qt style</source>
- <translation type="unfinished"></translation>
+ <translation>Qt-Stil setzen</translation>
</message>
<message>
<location/>
<source>Set plain style</source>
- <translation type="unfinished"></translation>
+ <translation>Einfachen Stil setzen</translation>
</message>
</context>
<context>
@@ -4915,30 +5317,25 @@ Reason: %3</source>
<message>
<location filename="../../../src/shared/help/filternamedialog.ui"/>
<source>Add Filter Name</source>
- <translation type="unfinished"></translation>
+ <translation>Filternamen hinzufügen</translation>
</message>
<message>
<location/>
<source>Filter Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Filtername:</translation>
</message>
</context>
<context>
<name>FilterSettingsPage</name>
<message>
<location filename="../../../src/plugins/help/filtersettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Filter:</source>
<translation>Filter:</translation>
</message>
<message>
<location/>
<source>Attributes:</source>
- <translation type="unfinished"></translation>
+ <translation>Attribute:</translation>
</message>
<message>
<location/>
@@ -5115,86 +5512,76 @@ Reason: %3</source>
<name>GdbOptionsPage</name>
<message>
<location filename="../../../src/plugins/debugger/gdboptionspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Gdb interaction</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This is either a full abolute 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>Gdb-Interaktion</translation>
</message>
<message>
<location/>
<source>Gdb location:</source>
- <translation type="unfinished"></translation>
+ <translation>Pfad zu Gdb </translation>
</message>
<message>
<location/>
<source>Environment:</source>
- <translation type="unfinished"></translation>
+ <translation>Umgebung:</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>Ein Skript mit Kommandos, die unmittelbar nach dem Gdb-Start ausgeführt werden (optional).</translation>
</message>
<message>
<location/>
<source>Gdb startup script:</source>
- <translation type="unfinished"></translation>
+ <translation>Gdb-Startskript:</translation>
</message>
<message>
<location/>
<source>Behaviour of breakpoint setting in plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Setzen von Haltepunkten in Plugins</translation>
</message>
<message>
<location/>
<source>This is the slowest but safest option.</source>
- <translation type="unfinished"></translation>
+ <translation>Die sicherste Einstellung, zugleich aber auch die langsamste.</translation>
</message>
<message>
<location/>
<source>Try to set breakpoints in plugins always automatically.</source>
- <translation type="unfinished"></translation>
+ <translation>Versuche, Haltepunkte in Plugins automatisch zu setzen.</translation>
</message>
<message>
<location/>
<source>Try to set breakpoints in selected plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Versuche, Haltepunkte in ausgewählten Plugins zu setzen</translation>
</message>
<message>
<location/>
<source>Matching regular expression: </source>
- <translation type="unfinished"></translation>
+ <translation>Regulärer Ausdruck: </translation>
</message>
<message>
<location/>
<source>Never set breakpoints in plugins automatically</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkte in Plugins niemals automatisch setzen</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>Geben Sie den vollen, absoluten Pfad zu der ausführbaren Datei ein, oder einen relativen Pfad, der in der Pfad-Variable gesucht wird.</translation>
</message>
</context>
<context>
<name>GenericMakeStep</name>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericmakestep.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Override %1:</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœberschreibe %1:</translation>
</message>
<message>
<location/>
<source>Make arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Kommandozeilenargumente für make:</translation>
</message>
<message>
<location/>
@@ -5207,7 +5594,7 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+90"/>
<source><new></source>
- <translation type="unfinished"></translation>
+ <translation><neu></translation>
</message>
</context>
<context>
@@ -5219,7 +5606,7 @@ Reason: %3</source>
</message>
<message>
<location line="+7"/>
- <source>Tool chain:</source>
+ <source>Toolchain:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -5233,7 +5620,7 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+164"/>
<source>Override %1:</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœberschreibe %1:</translation>
</message>
</context>
<context>
@@ -5241,12 +5628,12 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericprojectwizard.cpp" line="+246"/>
<source>Import of Makefile-based Project</source>
- <translation type="unfinished"></translation>
+ <translation>Makefile-basiertes Projekt importieren</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a generic project, supporting any build system.</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellt ein generisches Projekt, was ein beliebiges Build-System unterstützt.</translation>
</message>
<message>
<location line="+2"/>
@@ -5256,7 +5643,7 @@ Reason: %3</source>
<message>
<location line="+124"/>
<source>The project %1 could not be opened.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Projekt %1 konnte nicht geöffnet werden.</translation>
</message>
</context>
<context>
@@ -5264,27 +5651,27 @@ Reason: %3</source>
<message>
<location line="-249"/>
<source>Import of Makefile-based Project</source>
- <translation type="unfinished"></translation>
+ <translation>Import eines Makefile-basierten Projektes</translation>
</message>
<message>
<location line="+4"/>
<source>Generic Project</source>
- <translation type="unfinished"></translation>
+ <translation>Generisches Projekt</translation>
</message>
<message>
<location line="+1"/>
<source>Project name:</source>
- <translation type="unfinished"></translation>
+ <translation>Projektname:</translation>
</message>
<message>
<location line="+1"/>
<source>Location:</source>
- <translation type="unfinished"></translation>
+ <translation>Pfad:</translation>
</message>
<message>
<location line="+7"/>
<source>Second Page Title</source>
- <translation type="unfinished"></translation>
+ <translation>Titel der zweiten Seite</translation>
</message>
</context>
<context>
@@ -5302,47 +5689,47 @@ Reason: %3</source>
<message>
<location line="+20"/>
<source>Unable to find the repository directory for '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Repository-Verzeichnis für '%1' konnte nicht gefunden werden.</translation>
</message>
<message>
<location line="+69"/>
<source>Delete Branch</source>
- <translation type="unfinished"></translation>
+ <translation>Branch löschen</translation>
</message>
<message>
<location line="+0"/>
<source>Would you like to delete the branch '%1'?</source>
- <translation type="unfinished"></translation>
+ <translation>Möchten Sie den Branch '%1' löschen?</translation>
</message>
<message>
<location line="+16"/>
<source>Failed to delete branch</source>
- <translation type="unfinished"></translation>
+ <translation>Das Löschen des Branches schlug fehl</translation>
</message>
<message>
<location line="+17"/>
<source>Failed to create branch</source>
- <translation type="unfinished"></translation>
+ <translation>Das Erstellen des Branches schlug fehl</translation>
</message>
<message>
<location line="+29"/>
<source>Failed to stash</source>
- <translation type="unfinished"></translation>
+ <translation>Die Operation 'stash' schlug fehl</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>Möchten Sie einen lokalen Branch '%1' erstellen, der dem entfernten Branch '%2' folgt?</translation>
</message>
<message>
<location line="+1"/>
<source>Create branch</source>
- <translation type="unfinished"></translation>
+ <translation>Branch erstellen</translation>
</message>
<message>
<location line="+15"/>
<source>Failed to create a tracking branch</source>
- <translation type="unfinished"></translation>
+ <translation>Das Erstellen des Branches schlug fehl</translation>
</message>
<message>
<location filename="../../../src/plugins/git/branchdialog.ui"/>
@@ -5352,18 +5739,13 @@ Reason: %3</source>
<message>
<location/>
<source>General information</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemeine Informationen</translation>
</message>
<message>
<location/>
<source>Repository:</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location/>
<source>Remote branches</source>
@@ -5375,12 +5757,12 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/git/changeselectiondialog.cpp" line="+42"/>
<source>Select a Git commit</source>
- <translation type="unfinished"></translation>
+ <translation>Wählen Sie einen Commit aus</translation>
</message>
<message>
<location line="+7"/>
<source>Select Git repository</source>
- <translation type="unfinished"></translation>
+ <translation>Wählen ein Git-Repository aus</translation>
</message>
<message>
<location line="+17"/>
@@ -5390,7 +5772,7 @@ Reason: %3</source>
<message>
<location line="+1"/>
<source>Selected directory is not a Git repository</source>
- <translation type="unfinished"></translation>
+ <translation>Das ausgewählte Verzeichnis ist kein Git-Repository</translation>
</message>
</context>
<context>
@@ -5403,24 +5785,24 @@ Reason: %3</source>
<message>
<location line="+15"/>
<source>Unable to determine the repository for %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Repository von %1 konnte nicht bestimmt werden.</translation>
</message>
<message>
<location line="+5"/>
<source>Unable to parse the file output.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Ausgabe der Datei konnte nicht ausgewertet werden.</translation>
</message>
<message>
<location line="+8"/>
<source>%1 Executing: %2 %3
</source>
<extracomment><timestamp> Executing: <executable> <arguments></extracomment>
- <translation type="unfinished"></translation>
+ <translation>%1 Kommando: %2 %3</translation>
</message>
<message>
<location line="+5"/>
<source>Waiting for data...</source>
- <translation type="unfinished"></translation>
+ <translation>Warte auf Daten...</translation>
</message>
<message>
<location line="+100"/>
@@ -5450,99 +5832,101 @@ Reason: %3</source>
<message numerus="yes">
<location line="+56"/>
<source>Unable to add %n file(s) to %1: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Keine der %n Dateien konnte zu %1 hinzugefügt werden: %2</numerusform>
+ <numerusform>Keine der %n Dateien konnte zu %1 hinzugefügt werden: %2</numerusform>
</translation>
</message>
<message numerus="yes">
<location line="+37"/>
<source>Unable to reset %n file(s) in %1: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Keine der %n Dateien in %1 konnte zurückgesetzt werden: %2</numerusform>
+ <numerusform>Keine der %n Dateien in %1 konnte zurückgesetzt werden: %2</numerusform>
</translation>
</message>
<message numerus="yes">
<location line="+18"/>
<source>Unable to checkout %n file(s) in %1: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Die Operation 'checkout' schlug für eine Datei in %1 fehl: %2</numerusform>
+ <numerusform>Die Operation 'checkout' schlug für %n Dateien in %1 fehl: %2</numerusform>
</translation>
</message>
<message>
<location line="+16"/>
<source>Unable stash in %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die Operation 'stash' schlug in %1 fehl: %2</translation>
</message>
<message>
<location line="+16"/>
<source>Unable to run branch command: %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Das Kommando 'branch' konnte nicht ausgeführt werden: %1: %2</translation>
</message>
<message>
<location line="+18"/>
<source>Unable to run show: %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Das Kommando 'show' konnte nicht ausgeführt werden: %1: %2</translation>
</message>
<message>
<location line="+142"/>
<source>Changes</source>
- <translation type="unfinished"></translation>
+ <translation>Änderungen</translation>
</message>
<message>
<location line="+1"/>
<source>You have modified files. Would you like to stash your changes?</source>
- <translation type="unfinished"></translation>
+ <translation>Es wurden Dateien geändert. Möchten Sie stash ausführen?</translation>
</message>
<message>
<location line="+51"/>
<source>Unable to obtain the status: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Der Status konnte nicht abgefragt werden: %1</translation>
</message>
<message>
<location line="+50"/>
<source>The repository %1 is not initialized yet.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Repository ist noch nicht initialisiert.</translation>
</message>
<message numerus="yes">
<location line="+102"/>
<source>Committed %n file(s).
</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Eine Datei abgegeben.</numerusform>
+ <numerusform>%n Dateien abgegeben.</numerusform>
</translation>
</message>
<message numerus="yes">
<location line="+1"/>
<source>Unable to commit %n file(s): %1
</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Commit schlug für eine Datei fehl: %1
+</numerusform>
+ <numerusform>Commit schlug für %n Dateien fehl: %1
+</numerusform>
</translation>
</message>
<message>
<location line="+81"/>
<source>Revert</source>
- <translation type="unfinished"></translation>
+ <translation>Rückgängig machen</translation>
</message>
<message>
<location line="+1"/>
<source>The file has been changed. Do you want to revert it?</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei wurde geändert. Möchten Sie die Änderungen rückgängig machen?</translation>
</message>
<message>
<location line="+24"/>
<source>The file is not modified.</source>
- <translation type="unfinished"></translation>
+ <translation>Datei ungeändert.</translation>
</message>
<message>
<location line="+24"/>
<source>There are no modified files.</source>
- <translation type="unfinished"></translation>
+ <translation>Es gibt keine geänderten Dateien.</translation>
</message>
</context>
<context>
@@ -5550,25 +5934,30 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/git/gitoutputwindow.cpp" line="+48"/>
<source>Git Output</source>
- <translation type="unfinished"></translation>
+ <translation>Git-Ausgabe</translation>
</message>
<message>
<location line="+16"/>
<source>Git</source>
- <translation type="unfinished"></translation>
+ <translation>Git</translation>
</message>
</context>
<context>
<name>Git::Internal::GitPlugin</name>
<message>
- <location filename="../../../src/plugins/git/gitplugin.cpp" line="+269"/>
+ <location filename="../../../src/plugins/git/gitplugin.cpp" line="+270"/>
<source>&Git</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<source>Diff Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Datei</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Diff "%1"</source>
+ <translation>Diff für "%1"</translation>
</message>
<message>
<location line="+4"/>
@@ -5578,7 +5967,12 @@ Reason: %3</source>
<message>
<location line="+5"/>
<source>File Status</source>
- <translation type="unfinished"></translation>
+ <translation>Status der Datei</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Status Related to "%1"</source>
+ <translation>Status relativ zu "%1"</translation>
</message>
<message>
<location line="+3"/>
@@ -5588,7 +5982,12 @@ Reason: %3</source>
<message>
<location line="+6"/>
<source>Log File</source>
- <translation type="unfinished"></translation>
+ <translation>Log für Datei</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Log of "%1"</source>
+ <translation>Log für "%1"</translation>
</message>
<message>
<location line="+3"/>
@@ -5598,7 +5997,12 @@ Reason: %3</source>
<message>
<location line="+6"/>
<source>Blame</source>
- <translation type="unfinished"></translation>
+ <translation>Blame für Datei</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Blame for "%1"</source>
+ <translation>Blame für "%1"</translation>
</message>
<message>
<location line="+3"/>
@@ -5608,7 +6012,12 @@ Reason: %3</source>
<message>
<location line="+6"/>
<source>Undo Changes</source>
- <translation type="unfinished"></translation>
+ <translation>Änderungen rückgängig machen</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Undo Changes for "%1"</source>
+ <translation>Änderungen in "%1" rückgängig machen</translation>
</message>
<message>
<location line="+3"/>
@@ -5618,7 +6027,12 @@ Reason: %3</source>
<message>
<location line="+6"/>
<source>Stage File for Commit</source>
- <translation type="unfinished"></translation>
+ <translation>Datei zu Commit hinzufügen (stage)</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Stage "%1" for Commit</source>
+ <translation>"%1" zu Commit hinzufügen (stage)</translation>
</message>
<message>
<location line="+3"/>
@@ -5628,38 +6042,62 @@ Reason: %3</source>
<message>
<location line="+6"/>
<source>Unstage File from Commit</source>
- <translation type="unfinished"></translation>
+ <translation>Datei aus Commit entfernen (unstage)</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Unstage "%1" from Commit</source>
+ <translation>"%1" aus Commit entfernen (unstage)</translation>
</message>
<message>
<location line="+6"/>
<source>Revert...</source>
- <translation type="unfinished"></translation>
+ <translation>Änderungen in Datei rückgängig machen...</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Revert "%1"...</source>
+ <translation>Änderungen in "%1" rückgängig machen...</translation>
</message>
<message>
<location line="+8"/>
<source>Diff Current Project</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Projekt</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Diff Project "%1"</source>
+ <translation>Diff für Projekt "%1"</translation>
</message>
<message>
<location line="+9"/>
<source>Project Status</source>
- <translation type="unfinished"></translation>
+ <translation>Status des Projekts (status)</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Status Project "%1"</source>
+ <translation>Status des Projekts "%1"</translation>
</message>
<message>
<location line="+6"/>
- <location line="+454"/>
<source>Log Project</source>
- <translation type="unfinished"></translation>
+ <translation>Log für Projekt</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Log Project "%1"</source>
+ <translation>Log für Projekt "%1"</translation>
</message>
<message>
- <location line="-451"/>
+ <location line="+3"/>
<source>Alt+G,Alt+K</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Undo Project Changes</source>
- <translation type="unfinished"></translation>
+ <translation>Änderungen des Projekts rückgängig machen</translation>
</message>
<message>
<location line="+8"/>
@@ -5669,7 +6107,7 @@ Reason: %3</source>
<message>
<location line="+1"/>
<source>Saves the current state of your work.</source>
- <translation type="unfinished"></translation>
+ <translation>Sichert den gegenwärtigen Arbeitsstand.</translation>
</message>
<message>
<location line="+6"/>
@@ -5684,7 +6122,7 @@ Reason: %3</source>
<message>
<location line="+1"/>
<source>Restores changes saved to the stash list using "Stash".</source>
- <translation type="unfinished"></translation>
+ <translation>Stellt den gesicherten Zustand von "Stash" wieder her.</translation>
</message>
<message>
<location line="+6"/>
@@ -5709,22 +6147,22 @@ Reason: %3</source>
<message>
<location line="+6"/>
<source>List Stashes</source>
- <translation type="unfinished"></translation>
+ <translation>Stashes auflisten</translation>
</message>
<message>
<location line="+6"/>
<source>Show Commit...</source>
- <translation type="unfinished"></translation>
+ <translation>Commit anzeigen...</translation>
</message>
<message>
<location line="+9"/>
<source>Commit</source>
- <translation type="unfinished"></translation>
+ <translation>Abgeben</translation>
</message>
<message>
<location line="+4"/>
<source>Diff Selected Files</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Auswahl</translation>
</message>
<message>
<location line="+3"/>
@@ -5739,12 +6177,12 @@ Reason: %3</source>
<message>
<location line="+60"/>
<source>Could not find working directory</source>
- <translation type="unfinished"></translation>
+ <translation>Das Arbeitsverzeichnis konnte nicht gefunden werden.</translation>
</message>
<message>
<location line="+85"/>
<source>Another submit is currently beeing executed.</source>
- <translation type="unfinished"></translation>
+ <translation>Es läuft bereits ein Commit.</translation>
</message>
<message>
<location line="+31"/>
@@ -5754,87 +6192,73 @@ Reason: %3</source>
<message>
<location line="+58"/>
<source>Closing git editor</source>
- <translation type="unfinished"></translation>
+ <translation>Git-Editor schließen</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to commit the change?</source>
- <translation type="unfinished"></translation>
+ <translation>Möchten Sie den Commit ausführen?</translation>
</message>
<message>
<location line="+1"/>
<source>The commit message check failed. Do you want to commit the change?</source>
- <translation type="unfinished"></translation>
+ <translation>Die Überprüfung der Beschreibung schlug fehl. Möchten Sie den Commit trotzdem ausführen?</translation>
</message>
<message>
- <location line="+106"/>
<source>File</source>
- <translation>Datei</translation>
+ <translation type="obsolete">Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>Diff %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Diff für %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Status Related to %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Status relativ zu %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Log of %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Log für %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Blame for %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Blame für %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Undo Changes for %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Änderungen in %1 rückgängig machen</translation>
</message>
<message>
- <location line="+1"/>
<source>Stage %1 for Commit</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Datei %1 zu Commit hinzufügen (stage)</translation>
</message>
<message>
- <location line="+1"/>
<source>Unstage %1 from Commit</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Datei %1 aus Commit entfernen (unstage)</translation>
</message>
<message>
- <location line="+1"/>
<source>Revert %1...</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">%1 Rücksetzen (revert)...</translation>
</message>
<message>
- <location line="+16"/>
<source>Diff Project</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Diff für Projekt</translation>
</message>
<message>
- <location line="+1"/>
<source>Status Project</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Status des Projekts</translation>
</message>
<message>
- <location line="+19"/>
<source>Diff Project %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Diff für Projekt %1</translation>
</message>
<message>
- <location line="+2"/>
<source>Status Project %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Status des Projekts %1 (status)</translation>
</message>
<message>
- <location line="+2"/>
<source>Log Project %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Log für Projekt %1</translation>
</message>
</context>
<context>
@@ -5842,7 +6266,7 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/git/gitsettings.cpp" line="+100"/>
<source>The binary '%1' could not be located in the path '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>Die ausführbare Datei '%1' konnte nicht im Pfad '%2' gefunden werden</translation>
</message>
</context>
<context>
@@ -5858,7 +6282,7 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/git/gitsubmitpanel.ui"/>
<source>General Information</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemeine Informationen</translation>
</message>
<message>
<location/>
@@ -5883,17 +6307,17 @@ Reason: %3</source>
<message>
<location/>
<source>Commit Information</source>
- <translation type="unfinished"></translation>
+ <translation>Informationen zu Commit</translation>
</message>
<message>
<location/>
<source>Author:</source>
- <translation type="unfinished"></translation>
+ <translation>Autor:</translation>
</message>
<message>
<location/>
<source>Email:</source>
- <translation type="unfinished"></translation>
+ <translation>E-Mail-Adresse:</translation>
</message>
</context>
<context>
@@ -5901,12 +6325,12 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/git/branchmodel.cpp" line="+181"/>
<source><New branch></source>
- <translation type="unfinished"></translation>
+ <translation><Neuer Branch></translation>
</message>
<message>
<location line="+1"/>
<source>Type to create a new branch</source>
- <translation type="unfinished"></translation>
+ <translation>Geben Sie den Namen des neuen Branches ein</translation>
</message>
</context>
<context>
@@ -5914,57 +6338,52 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/git/settingspage.cpp" line="+85"/>
<source>Git</source>
- <translation type="unfinished"></translation>
+ <translation>Git</translation>
</message>
<message>
<location line="+29"/>
<source>Git Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Git-Einstellungen</translation>
</message>
<message>
<location filename="../../../src/plugins/git/settingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Environment variables</source>
- <translation type="unfinished"></translation>
+ <translation>Umgebungsvariablen</translation>
</message>
<message>
<location/>
<source>PATH:</source>
- <translation type="unfinished"></translation>
+ <translation>Pfad-Variable:</translation>
</message>
<message>
<location/>
<source>From system</source>
- <translation type="unfinished"></translation>
+ <translation>Vom System</translation>
</message>
<message>
<location/>
<source><b>Note:</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>Hinweis:</b></translation>
</message>
<message>
<location/>
<source>Git needs to find Perl in the environment as well.</source>
- <translation type="unfinished"></translation>
+ <translation>Git benötigt Perl.</translation>
</message>
<message>
<location/>
<source>Log commit display count:</source>
- <translation type="unfinished"></translation>
+ <translation>Log-Anzeige beschränken auf:</translation>
</message>
<message>
<location/>
<source>Note that huge amount of commits might take some time.</source>
- <translation type="unfinished"></translation>
+ <translation>Beachten Sie, dass eine hohe Anzahl lange Wartezeiten hervorrufen kann.</translation>
</message>
<message>
<location/>
<source>Timeout (seconds):</source>
- <translation type="unfinished"></translation>
+ <translation>Zeitlimit (Sekunden):</translation>
</message>
</context>
<context>
@@ -5974,14 +6393,18 @@ Reason: %3</source>
<source>
'%1' failed (exit code %2).
</source>
- <translation type="unfinished"></translation>
+ <translation>
+'%1' schlug fehl (Rückgabewert %2).
+</translation>
</message>
<message>
<location line="+1"/>
<source>
'%1' completed (exit code %2).
</source>
- <translation type="unfinished"></translation>
+ <translation>
+'%1' erfolgreich ausgeführt (Rückgabewert %2).
+</translation>
</message>
</context>
<context>
@@ -6144,7 +6567,7 @@ Reason: %3</source>
<context>
<name>Help::Internal::HelpPlugin</name>
<message>
- <location filename="../../../src/plugins/help/helpplugin.cpp" line="+177"/>
+ <location filename="../../../src/plugins/help/helpplugin.cpp" line="+178"/>
<location line="+36"/>
<source>Contents</source>
<translation>Inhalt</translation>
@@ -6173,18 +6596,18 @@ Reason: %3</source>
</message>
<message>
<location line="+4"/>
- <location line="+168"/>
+ <location line="+170"/>
<source>Previous</source>
<translation>Vorige</translation>
</message>
<message>
- <location line="-164"/>
- <location line="+165"/>
+ <location line="-166"/>
+ <location line="+167"/>
<source>Next</source>
<translation>Nächste</translation>
</message>
<message>
- <location line="-161"/>
+ <location line="-163"/>
<source>Add Bookmark</source>
<translation>Lesezeichen hinzufügen</translation>
</message>
@@ -6209,7 +6632,7 @@ Reason: %3</source>
<translation>Suchen im Modus "Hilfe" zeigen</translation>
</message>
<message>
- <location line="+219"/>
+ <location line="+221"/>
<location line="+4"/>
<location line="+66"/>
<source>Unfiltered</source>
@@ -6313,7 +6736,7 @@ Sie wird übersprungen.</translation>
<context>
<name>HelpViewer</name>
<message>
- <location filename="../../../src/shared/help/helpviewer.cpp" line="+222"/>
+ <location filename="../../../src/shared/help/helpviewer.cpp" line="+221"/>
<source>Open Link in New Tab</source>
<translation>Adresse in neuem Reiter öffnen</translation>
</message>
@@ -6352,7 +6775,7 @@ Sie wird übersprungen.</translation>
<context>
<name>IndexWindow</name>
<message>
- <location filename="../../../src/shared/help/indexwindow.cpp" line="+54"/>
+ <location filename="../../../src/shared/help/indexwindow.cpp" line="+52"/>
<source>&Look for:</source>
<translation>&Suche nach:</translation>
</message>
@@ -6372,7 +6795,7 @@ Sie wird übersprungen.</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+75"/>
<source>Type Ctrl-<Return> to execute a line.</source>
- <translation type="unfinished"></translation>
+ <translation>Sie können eine Zeile mittels <Ctrl-Return> ausführen.</translation>
</message>
</context>
<context>
@@ -6385,7 +6808,7 @@ Sie wird übersprungen.</translation>
<message>
<location line="+1"/>
<source>Locator</source>
- <translation type="unfinished"></translation>
+ <translation>Locator</translation>
</message>
</context>
<context>
@@ -6414,7 +6837,7 @@ Sie wird übersprungen.</translation>
<message>
<location line="+2"/>
<source>Quit</source>
- <translation type="unfinished"></translation>
+ <translation>Beenden</translation>
</message>
<message>
<location line="+4"/>
@@ -6479,7 +6902,7 @@ Sie wird übersprungen.</translation>
<message>
<location line="+8"/>
<source>Files</source>
- <translation type="unfinished"></translation>
+ <translation>Dateien</translation>
</message>
<message>
<location line="+26"/>
@@ -6527,51 +6950,28 @@ in your .pro file.</source>
<name>MakeStep</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/makestep.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Override %1:</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœberschreibe %1:</translation>
</message>
<message>
<location/>
<source>Make arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Kommandozeilenargumente für make:</translation>
</message>
</context>
-<context>
- <name>MimeDatabase</name>
- <message>
- <location filename="../../../src/plugins/coreplugin/mimedatabase.cpp" line="+650"/>
- <source>Not a number '%1'.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Empty match value detected.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+32"/>
- <source>Missing 'type'-attribute</source>
- <translation type="unfinished"></translation>
- </message>
+<context>
+ <name>MimeDatabase</name>
<message>
- <location line="+49"/>
- <source>Unexpected element <%1></source>
- <translation type="unfinished"></translation>
+ <source>Not a number '%1'.</source>
+ <translation type="obsolete">'%1' ist keine gültige Zahlenangabe.</translation>
</message>
<message>
- <location line="+27"/>
- <source>An error has been encountered at line %1 of %2: %3:</source>
- <translation type="unfinished"></translation>
+ <source>Empty match value detected.</source>
+ <translation type="obsolete">Es wurde ein leerer Wert eines Match-Elementes gefunden.</translation>
</message>
<message>
- <location line="+115"/>
- <source>Cannot open %1: %2</source>
- <translation type="unfinished"></translation>
+ <source>Missing 'type'-attribute</source>
+ <translation type="obsolete">Das 'type'-Attribut fehlt</translation>
</message>
</context>
<context>
@@ -6589,7 +6989,7 @@ in your .pro file.</source>
<message>
<location filename="../../../src/plugins/vcsbase/nicknamedialog.ui"/>
<source>Nick Names</source>
- <translation type="unfinished"></translation>
+ <translation>Aliasnamen</translation>
</message>
<message>
<location/>
@@ -6602,25 +7002,17 @@ in your .pro file.</source>
<translation>Löschen</translation>
</message>
</context>
-<context>
- <name>OpenEditorsView</name>
- <message>
- <location filename="../../../src/plugins/coreplugin/editormanager/openeditorsview.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>OpenWithDialog</name>
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.ui"/>
<source>Open File With...</source>
- <translation type="unfinished"></translation>
+ <translation>Öffne Datei mit...</translation>
</message>
<message>
<location/>
<source>Open file extension with:</source>
- <translation type="unfinished"></translation>
+ <translation>Öffne Endung mit:</translation>
</message>
</context>
<context>
@@ -6628,12 +7020,12 @@ in your .pro file.</source>
<message>
<location filename="../../../src/plugins/perforce/changenumberdialog.ui"/>
<source>Change Number</source>
- <translation type="unfinished"></translation>
+ <translation>Change-Nummer</translation>
</message>
<message>
<location/>
<source>Change Number:</source>
- <translation type="unfinished"></translation>
+ <translation>Change-Nummer:</translation>
</message>
</context>
<context>
@@ -6641,12 +7033,12 @@ in your .pro file.</source>
<message>
<location filename="../../../src/plugins/perforce/pendingchangesdialog.ui"/>
<source>P4 Pending Changes</source>
- <translation type="unfinished"></translation>
+ <translation>P4 Ausstehende Changes</translation>
</message>
<message>
<location/>
<source>Submit</source>
- <translation type="unfinished"></translation>
+ <translation>Abgeben</translation>
</message>
<message>
<location/>
@@ -6664,7 +7056,7 @@ in your .pro file.</source>
<message>
<location filename="../../../src/plugins/perforce/perforceoutputwindow.cpp" line="+48"/>
<source>Perforce Output</source>
- <translation type="unfinished"></translation>
+ <translation>Perforce-Ausgabe</translation>
</message>
<message>
<location line="+2"/>
@@ -6674,101 +7066,127 @@ in your .pro file.</source>
<message>
<location line="+34"/>
<source>Perforce</source>
- <translation type="unfinished"></translation>
+ <translation>Perforce</translation>
</message>
</context>
<context>
<name>Perforce::Internal::PerforcePlugin</name>
<message>
- <location filename="../../../src/plugins/perforce/perforceplugin.cpp" line="+253"/>
+ <location filename="../../../src/plugins/perforce/perforceplugin.cpp" line="+250"/>
<source>&Perforce</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
- <location line="+399"/>
<source>Edit</source>
- <translation>Editieren</translation>
+ <translation>Anfordern</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Edit "%1"</source>
+ <translation>"%1" anfordern</translation>
</message>
<message>
- <location line="-396"/>
+ <location line="+3"/>
<source>Alt+P,Alt+E</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Edit File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei zum Editieren anfordern</translation>
</message>
<message>
<location line="+4"/>
- <location line="+392"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location line="-389"/>
+ <location line="+0"/>
+ <source>Add "%1"</source>
+ <translation>"%1" hinzufügen</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Alt+P,Alt+A</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Add File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei hinzufügen</translation>
</message>
<message>
<location line="+4"/>
- <location line="+385"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location line="-382"/>
+ <location line="+0"/>
+ <source>Delete "%1"</source>
+ <translation>"%1" löschen</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Delete File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei löschen</translation>
</message>
<message>
<location line="+4"/>
- <location line="+379"/>
<source>Revert</source>
- <translation type="unfinished"></translation>
+ <translation>Rückgängig machen</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Revert "%1"</source>
+ <translation>Änderungen in "%1" rückgängig machen (revert)</translation>
</message>
<message>
- <location line="-376"/>
+ <location line="+3"/>
<source>Alt+P,Alt+R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Revert File</source>
- <translation type="unfinished"></translation>
+ <translation>Änderungen in Datei rückgängig machen (revert)</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Diff Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Datei</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-3"/>
+ <source>Diff "%1"</source>
+ <translation>Diff für "%1"</translation>
+ </message>
+ <message>
+ <location line="+7"/>
<location line="+4"/>
<source>Diff Current Project/Session</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Projekt/Sitzung</translation>
</message>
<message>
- <location line="-1"/>
+ <location line="-4"/>
+ <source>Diff Project "%1"</source>
+ <translation>Diff für Projekt "%1"</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Alt+P,Alt+D</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Diff Opened Files</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für angeforderte Dateien</translation>
</message>
<message>
<location line="+10"/>
<source>Opened</source>
- <translation type="unfinished"></translation>
+ <translation>Angefordert</translation>
</message>
<message>
<location line="+2"/>
@@ -6776,14 +7194,9 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Resolve</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+4"/>
<source>Submit Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt abgeben</translation>
</message>
<message>
<location line="+2"/>
@@ -6793,51 +7206,59 @@ in your .pro file.</source>
<message>
<location line="+4"/>
<source>Pending Changes...</source>
- <translation type="unfinished"></translation>
+ <translation>Ausstehende Changes...</translation>
</message>
<message>
<location line="+10"/>
<source>Describe...</source>
- <translation type="unfinished"></translation>
+ <translation>Change anzeigen...</translation>
</message>
<message>
<location line="+5"/>
<location line="+3"/>
- <location line="+306"/>
<source>Annotate Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Annotation für Datei</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Annotate "%1"</source>
+ <translation>Annotation für "%1"</translation>
</message>
<message>
- <location line="-302"/>
+ <location line="+7"/>
<source>Annotate...</source>
- <translation type="unfinished"></translation>
+ <translation>Annotation...</translation>
</message>
<message>
<location line="+5"/>
<location line="+4"/>
- <location line="+294"/>
<source>Filelog Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Filelog für Datei</translation>
</message>
<message>
- <location line="-295"/>
+ <location line="-4"/>
+ <source>Filelog "%1"</source>
+ <translation>Filelog für "%1"</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Alt+P,Alt+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Filelog...</source>
- <translation type="unfinished"></translation>
+ <translation>Filelog...</translation>
</message>
<message>
<location line="+5"/>
<source>Submit</source>
- <translation type="unfinished"></translation>
+ <translation>Abgeben</translation>
</message>
<message>
<location line="+4"/>
<source>Diff Selected Files</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Auswahl</translation>
</message>
<message>
<location line="+3"/>
@@ -6852,39 +7273,40 @@ in your .pro file.</source>
<message>
<location line="+49"/>
<source>p4 revert</source>
- <translation type="unfinished"></translation>
+ <translation>Rückgängig machen</translation>
</message>
<message>
<location line="+1"/>
<source>The file has been changed. Do you want to revert it?</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei wurde geändert. Möchten Sie die Änderungen rückgängig machen?</translation>
</message>
<message>
- <location line="+57"/>
- <location line="+262"/>
+ <location line="+49"/>
+ <location line="+239"/>
<location line="+232"/>
<source>No p4 executable specified!</source>
- <translation type="unfinished"></translation>
+ <translation>Es wurde keine ausführbaren Datei angegeben!
+</translation>
</message>
<message>
- <location line="-489"/>
+ <location line="-466"/>
<source>Another submit is currently executed.</source>
- <translation type="unfinished"></translation>
+ <translation>Es läuft bereits ein Submit-Vorgang.</translation>
</message>
<message>
<location line="+7"/>
<source>Cannot create temporary file.</source>
- <translation type="unfinished"></translation>
+ <translation>Es konnte keine temporäre Datei erstellt werden.</translation>
</message>
<message>
<location line="+32"/>
<source>Project has no files</source>
- <translation type="unfinished"></translation>
+ <translation>Das Projekt hat keine Dateien</translation>
</message>
<message>
<location line="+50"/>
<source>p4 annotate</source>
- <translation type="unfinished"></translation>
+ <translation>Annotationen</translation>
</message>
<message>
<location line="+14"/>
@@ -6894,7 +7316,7 @@ in your .pro file.</source>
<message>
<location line="+14"/>
<source>p4 filelog</source>
- <translation type="unfinished"></translation>
+ <translation>Filelog</translation>
</message>
<message>
<location line="+14"/>
@@ -6902,80 +7324,43 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
<source>Edit %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">%1 bearbeiten</translation>
</message>
<message>
- <location line="+1"/>
- <source>Add %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Delete %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Revert %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
<source>Diff %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Annotate %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Filelog %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Diff</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Diff für %1</translation>
</message>
<message>
- <location line="+6"/>
<source>Diff Project %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Diff Current Project/Soluion</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Diff für Projekt %1</translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+132"/>
<source>%1 Executing: %2
</source>
- <translation type="unfinished"></translation>
+ <translation>%1 Kommando: %2
+</translation>
</message>
<message>
<location line="+34"/>
<source>The process terminated with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Prozess wurde beendet, Rückgabewert %1.</translation>
</message>
<message>
<location line="+3"/>
<source>The process terminated abnormally.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Prozess wurde in unnormaler Weise beendet.</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>Das Perforce-Kommando '%1' konnte nicht gestartet werden. Bitte überprüfen Sie die Einstellungen.</translation>
</message>
<message>
<location line="+3"/>
<source>Perforce did not respond within timeout limit (%1 ms).</source>
- <translation type="unfinished"></translation>
+ <translation>Keine Antwort von Perforce innerhalb des Zeitlimits (%1 ms).</translation>
</message>
<message>
<location line="+85"/>
@@ -6990,43 +7375,43 @@ in your .pro file.</source>
<message>
<location line="+37"/>
<source>Closing p4 Editor</source>
- <translation type="unfinished"></translation>
+ <translation>P4-Editor schließen</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to submit this change list?</source>
- <translation type="unfinished"></translation>
+ <translation>Möchten Sie die Changes abgeben?</translation>
</message>
<message>
<location line="+1"/>
<source>The commit message check failed. Do you want to submit this change list</source>
- <translation type="unfinished"></translation>
+ <translation>Die Überprüfung der Beschreibung schlug fehl. Möchten Sie den Submit-Vorgang trotzdem ausführen?</translation>
</message>
<message>
<location line="+25"/>
<location line="+8"/>
<source>Cannot execute p4 submit.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Kommando p4 submit konnte nicht ausgeführt werden.</translation>
</message>
<message>
<location line="+7"/>
<source>Pending change</source>
- <translation type="unfinished"></translation>
+ <translation>Ausstehender Change</translation>
</message>
<message>
<location line="+0"/>
<source>Could not submit the change, because your workspace was out of date. Created a pending submit instead.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Submit-Vorgang konnte nicht ausgeführt werden, weil Ihr Arbeitsbereich nicht auf dem aktuellsten Stand ist. Es wurde ein ausstehender Submit-Vorgang erzeugt.</translation>
</message>
<message>
<location line="+167"/>
<source>Timeout waiting for "where" (%1).</source>
- <translation type="unfinished"></translation>
+ <translation>Zeitüberschreitung bei der Ausführung von "where" (%1).</translation>
</message>
<message>
<location line="+11"/>
<source>Error running "where" on %1: The file is not mapped</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler bei der Ausführung von "where" auf %1: Die Datei ist nicht bekannt</translation>
</message>
</context>
<context>
@@ -7054,43 +7439,38 @@ in your .pro file.</source>
<name>Perforce::Internal::SettingsPage</name>
<message>
<location filename="../../../src/plugins/perforce/settingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>P4 Command:</source>
- <translation type="unfinished"></translation>
+ <translation>P4-Kommando:</translation>
</message>
<message>
<location/>
<source>Use default P4 environment variables</source>
- <translation type="unfinished"></translation>
+ <translation>Vorgefundene P4-Umgebungsvariablen benutzen</translation>
</message>
<message>
<location/>
<source>Environment variables</source>
- <translation type="unfinished"></translation>
+ <translation>Umgebungsvariablen</translation>
</message>
<message>
<location/>
<source>P4 Client:</source>
- <translation type="unfinished"></translation>
+ <translation>P4 Client:</translation>
</message>
<message>
<location/>
<source>P4 User:</source>
- <translation type="unfinished"></translation>
+ <translation>P4 Nutzer:</translation>
</message>
<message>
<location/>
<source>P4 Port:</source>
- <translation type="unfinished"></translation>
+ <translation>P4 Portnummer:</translation>
</message>
<message>
<location filename="../../../src/plugins/perforce/settingspage.cpp" line="+96"/>
<source>Perforce</source>
- <translation type="unfinished"></translation>
+ <translation>Perforce</translation>
</message>
</context>
<context>
@@ -7098,7 +7478,7 @@ in your .pro file.</source>
<message>
<location line="-49"/>
<source>Perforce Command</source>
- <translation type="unfinished"></translation>
+ <translation>Perforce-Kommando</translation>
</message>
</context>
<context>
@@ -7106,7 +7486,7 @@ in your .pro file.</source>
<message>
<location filename="../../../src/plugins/perforce/submitpanel.ui"/>
<source>Submit</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location/>
@@ -7116,12 +7496,12 @@ in your .pro file.</source>
<message>
<location/>
<source>Client:</source>
- <translation type="unfinished"></translation>
+ <translation>Client:</translation>
</message>
<message>
<location/>
<source>User:</source>
- <translation type="unfinished"></translation>
+ <translation>Nutzer:</translation>
</message>
</context>
<context>
@@ -7149,7 +7529,7 @@ in your .pro file.</source>
<message>
<location line="+20"/>
<source>Plugin Errors of %1</source>
- <translation type="unfinished"></translation>
+ <translation>Fehlermeldungen von %1</translation>
</message>
</context>
<context>
@@ -7158,17 +7538,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>Es existiert kein Plugin '%1'.</translation>
</message>
<message>
<location line="+45"/>
<source>Unknown option %1</source>
- <translation type="unfinished"></translation>
+ <translation>Ungültiges Kommandozeilenargument %1</translation>
</message>
<message>
<location line="+12"/>
<source>The option %1 requires an argument.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Kommandozeilenargument %1erfordert ein Argument</translation>
</message>
</context>
<context>
@@ -7176,94 +7556,90 @@ 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>Das Attribut '%1' fehlt bei '%2'</translation>
</message>
<message>
<location line="+5"/>
<source>'%1' has invalid format</source>
- <translation type="unfinished"></translation>
+ <translation>'%1' ist in einem ungültigem Format</translation>
</message>
<message>
<location line="+5"/>
<source>Invalid element '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Ungültiges Element '%1'</translation>
</message>
<message>
<location line="+5"/>
<source>Unexpected closing element '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Falsch platziertes schließendes Element '%1'</translation>
</message>
<message>
<location line="+5"/>
<source>Unexpected token</source>
- <translation type="unfinished"></translation>
+ <translation>Falsch platziertes Token</translation>
</message>
<message>
<location line="+11"/>
<source>Expected element '%1' as top level element</source>
- <translation type="unfinished"></translation>
+ <translation>Das Wurzelelement muss '%1' sein</translation>
</message>
<message>
<location line="+234"/>
<source>Resolving dependencies failed because state != Read</source>
- <translation type="unfinished"></translation>
+ <translation>Das Bestimmen der Abhängigkeiten schlug fehl, weil der Status != Gelesen ist</translation>
</message>
<message>
<location line="+17"/>
<source>Could not resolve dependency '%1(%2)'</source>
- <translation type="unfinished"></translation>
+ <translation>Die Abhängigkeit '%1 (%2)' konnte nicht aufgelöst werden</translation>
</message>
<message>
<location line="+24"/>
<source>Loading the library failed because state != Resolved</source>
- <translation type="unfinished"></translation>
+ <translation>Das Laden der Bibliothek schlug fehl, weil der Status != 'Abhängigkeiten bestimmt' ist</translation>
</message>
<message>
<location line="+30"/>
<source>
Library base name: %1</source>
- <translation type="unfinished"></translation>
+ <translation>
+Basisname der Bibliothek: %1</translation>
</message>
<message>
<location line="+6"/>
<source>Plugin is not valid (doesn't derive from IPlugin)</source>
- <translation type="unfinished"></translation>
+ <translation>Das Plugin ist ungültig (nicht von Klasse IPlugin abgeleitet)</translation>
</message>
<message>
<location line="+21"/>
<source>Initializing the plugin failed because state != Loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Die Initialisierung des Plugins schlug fehl, weil der Status != Geladen ist</translation>
</message>
<message>
<location line="+5"/>
<source>Internal error: have no plugin instance to initialize</source>
- <translation type="unfinished"></translation>
+ <translation>Interner Fehler: Es existiert keine Plugininstanz zur Initialisierung</translation>
</message>
<message>
<location line="+6"/>
<source>Plugin initialization failed: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Die Initialisierungs des Plugins schlug fehl: %1</translation>
</message>
<message>
<location line="+19"/>
<source>Cannot perform extensionsInitialized because state != Initialized</source>
- <translation type="unfinished"></translation>
+ <translation>extensionsInitialized kann nicht abgearbeitet werden, weil der Status != Initialisiert ist</translation>
</message>
<message>
<location line="+5"/>
<source>Internal error: have no plugin instance to perform extensionsInitialized</source>
- <translation type="unfinished"></translation>
+ <translation>Interner Fehler: Es existiert keine Plugininstanz zur Abarbeitung von extensionsInitialized</translation>
</message>
</context>
<context>
<name>ProEditorContainer</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/proeditorcontainer.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Advanced Mode</source>
<translation>Erweiterter Modus</translation>
</message>
@@ -7339,7 +7715,7 @@ Library base name: %1</source>
<context>
<name>ProjectExplorer::CustomExecutableRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+158"/>
+ <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+160"/>
<source>Custom Executable</source>
<translation>Benutzerdefinierte, ausführbare Datei</translation>
</message>
@@ -7449,11 +7825,6 @@ Library base name: %1</source>
<name>ProjectExplorer::Internal::BuildSettingsPropertiesPage</name>
<message>
<location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Configurations</source>
<translation>Konfigurationen</translation>
</message>
@@ -7467,11 +7838,6 @@ Library base name: %1</source>
<source>-</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>ProjectExplorer::Internal::BuildSettingsWidget</name>
@@ -7537,11 +7903,6 @@ Library base name: %1</source>
<name>ProjectExplorer::Internal::BuildStepsPage</name>
<message>
<location filename="../../../src/plugins/projectexplorer/buildstepspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>1</source>
<translation>1</translation>
</message>
@@ -7583,7 +7944,7 @@ Library base name: %1</source>
<context>
<name>ProjectExplorer::Internal::CoreListenerCheckingForRunningBuild</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+113"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+114"/>
<source>Cancel Build && Close</source>
<translation>Erstellen abbrechen und schließen</translation>
</message>
@@ -7708,11 +8069,6 @@ Library base name: %1</source>
<name>ProjectExplorer::Internal::EditorSettingsPropertiesPage</name>
<message>
<location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Default File Encoding:</source>
<translation>Encoding-Vorgabe:</translation>
</message>
@@ -7797,11 +8153,6 @@ Library base name: %1</source>
<name>ProjectExplorer::Internal::ProcessStepWidget</name>
<message>
<location filename="../../../src/plugins/projectexplorer/processstep.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Enable custom process step</source>
<translation>Benutzerdefinierten Verarbeitungsschritt aktivieren</translation>
</message>
@@ -7932,11 +8283,6 @@ Library base name: %1</source>
<name>ProjectExplorer::Internal::ProjetExplorerSettingsPageUi</name>
<message>
<location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Build Settings</source>
<translation>'Build'-Einstellungen</translation>
</message>
@@ -7992,11 +8338,6 @@ Library base name: %1</source>
<name>ProjectExplorer::Internal::RunSettingsPropertiesPage</name>
<message>
<location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Run &configuration:</source>
<translation>Ausführungskonfiguration</translation>
</message>
@@ -8072,7 +8413,7 @@ Library base name: %1</source>
<location line="-347"/>
<location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+61"/>
<source>Build Issues</source>
- <translation></translation>
+ <translation>Build-Probleme</translation>
</message>
<message>
<location line="+11"/>
@@ -8097,11 +8438,6 @@ Library base name: %1</source>
<name>ProjectExplorer::Internal::WizardPage</name>
<message>
<location filename="../../../src/plugins/projectexplorer/projectwizardpage.ui"/>
- <source>WizardPage</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Project management</source>
<translation>Projektmanagement</translation>
</message>
@@ -8197,15 +8533,22 @@ Library base name: %1</source>
<translation>Zuletzt bearbeitete Projekte</translation>
</message>
<message>
- <location line="+6"/>
- <location line="+808"/>
<source>Unload Project</source>
- <translation>Projekt entladen</translation>
+ <translation type="obsolete">Projekt entladen</translation>
</message>
<message>
- <location line="-800"/>
<source>Unload All Projects</source>
- <translation>Alle Projekte entladen</translation>
+ <translation type="obsolete">Alle Projekte entladen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Close Project</source>
+ <translation>Projekt schließen</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Close All Projects</source>
+ <translation>Alle Projekte schließen</translation>
</message>
<message>
<location line="+7"/>
@@ -8239,27 +8582,56 @@ Library base name: %1</source>
</message>
<message>
<location line="+6"/>
- <location line="+748"/>
<source>Build Project</source>
<translation>Projekt erstellen</translation>
</message>
<message>
- <location line="-745"/>
+ <location line="+2"/>
<source>Ctrl+B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Rebuild Project</source>
- <translation>Projekt neu erstellen</translation>
+ <location line="+5"/>
+ <source>Rebuild Project</source>
+ <translation>Projekt neu erstellen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Clean Project</source>
+ <translation>Projekt bereinigen</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Project Only</source>
+ <translation>Aktuelles Projekt</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Build</source>
+ <translation>Erstellen</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Rebuild</source>
+ <translation>Neu Erstellen</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Clean</source>
+ <translation>Bereinigen</translation>
+ </message>
+ <message>
+ <location line="+736"/>
+ <source>Current Project</source>
+ <translation>Aktuelles Projekt</translation>
</message>
<message>
- <location line="+6"/>
- <source>Clean Project</source>
- <translation>Projekt bereinigen</translation>
+ <location line="+3"/>
+ <source>Project "%1"</source>
+ <translation>Projekt "%1"</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-725"/>
<location line="+18"/>
<source>Run</source>
<translation>Ausführen</translation>
@@ -8316,7 +8688,7 @@ Library base name: %1</source>
<translation>Umbenennen</translation>
</message>
<message>
- <location line="+120"/>
+ <location line="+123"/>
<source>Load Project</source>
<translation>Projekt laden</translation>
</message>
@@ -8327,17 +8699,20 @@ Library base name: %1</source>
<translation>Neues Projekt</translation>
</message>
<message>
- <location line="+453"/>
+ <location line="-388"/>
+ <source>Close Project "%1"</source>
+ <translation>Projekt "%1" schließen</translation>
+ </message>
+ <message>
<source>Unload Project "%1"</source>
- <translation>Projekt "%1" entladen</translation>
+ <translation type="obsolete">Projekt "%1" entladen</translation>
</message>
<message>
- <location line="+1"/>
<source>Build Project "%1"</source>
- <translation>Projekt '%1" erstellen</translation>
+ <translation type="obsolete">Projekt '%1" erstellen</translation>
</message>
<message>
- <location line="+387"/>
+ <location line="+1245"/>
<source>New File</source>
<comment>Title of dialog</comment>
<translation>Neue Datei</translation>
@@ -8409,14 +8784,22 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>ProjectExplorer::SessionManager</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+297"/>
<source>Error while loading session</source>
- <translation>Fehler beim Laden der Sitzung</translation>
+ <translation type="obsolete">Fehler beim Laden der Sitzung</translation>
</message>
<message>
- <location line="+1"/>
<source>Could not load session %1</source>
- <translation>Die Sitzung %1 konnte nicht geladen werden</translation>
+ <translation type="obsolete">Die Sitzung %1 konnte nicht geladen werden</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+297"/>
+ <source>Error while restoring session</source>
+ <translation>Beim Wiederherstellen der Sitzung ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not restore session %1</source>
+ <translation>Die Sitzung %1 konnte nicht wiederhergestellt werden</translation>
</message>
<message>
<location line="+36"/>
@@ -8521,23 +8904,18 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<name>QMakeStep</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qmakestep.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>QMake Build Configuration:</source>
- <translation type="unfinished"></translation>
+ <translation>QMake Build-Konfiguration:</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/>
@@ -8547,55 +8925,14 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>Effective qmake call:</source>
- <translation type="unfinished"></translation>
+ <translation>Resultierender qmake-Aufruf:</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
- <location filename="../../../src/libs/utils/reloadpromptutils.cpp" line="+40"/>
- <source>File Changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>The file %1 has changed outside Qt Creator. Do you want to reload it?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="-480"/>
- <source>File is Read Only</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>The file %1 is read only.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Open with VCS (%1)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
<source>Make writable</source>
- <translation>Schreibbar machen</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Save as ...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../src/plugins/fakevim/fakevimactions.cpp" line="+117"/>
- <source>Toggle vim-style editing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+50"/>
- <source>FakeVim properties...</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Schreibbar machen</translation>
</message>
<message>
<location filename="../../../src/plugins/qtestlib/qtestlibplugin.cpp" line="+59"/>
@@ -8684,16 +9021,124 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QmlProjectManager::Internal::QmlNewProjectWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlnewprojectwizard.cpp" line="+188"/>
+ <source>QML Application</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a QML application.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Projects</source>
+ <translation>Projekte</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>The project %1 could not be opened.</source>
+ <translation>Das Projekt %1 konnte nicht geöffnet werden.</translation>
+ </message>
+</context>
+<context>
+ <name>QmlProjectManager::Internal::QmlNewProjectWizardDialog</name>
+ <message>
+ <location line="-134"/>
+ <source>New QML Project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This wizard generates a QML application project.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>QmlProjectManager::Internal::QmlProjectWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectwizard.cpp" line="+190"/>
+ <source>Import of existing QML directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a QML project from an existing directory of QML files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Projects</source>
+ <translation>Projekte</translation>
+ </message>
+ <message>
+ <location line="+94"/>
+ <source>The project %1 could not be opened.</source>
+ <translation>Das Projekt %1 konnte nicht geöffnet werden.</translation>
+ </message>
+</context>
+<context>
+ <name>QmlProjectManager::Internal::QmlProjectWizardDialog</name>
+ <message>
+ <location line="-163"/>
+ <source>Import of QML Project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>QML Project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Project name:</source>
+ <translation>Projektname:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Location:</source>
+ <translation>Pfad:</translation>
+ </message>
+</context>
+<context>
+ <name>QmlProjectManager::Internal::QmlRunConfiguration</name>
+ <message>
+ <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+316"/>
+ <location line="+18"/>
+ <location line="+76"/>
+ <source>QML Viewer</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-75"/>
+ <source>Could not find the qmlviewer executable, please specify one.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <location line="+35"/>
+ <location line="+41"/>
+ <source><Current File></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-48"/>
+ <source>Main QML File:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>QrcEditor</name>
<message>
- <location filename="../../../src/shared/qrceditor/qrceditor.ui"/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+151"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>Formular</translation>
</message>
<message>
- <location/>
+ <location filename="../../../src/shared/qrceditor/qrceditor.ui"/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Add</source>
<translation>Hinzufügen</translation>
@@ -8708,7 +9153,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Properties</source>
- <translation type="unfinished"></translation>
+ <translation>Eigenschaften</translation>
</message>
<message>
<location/>
@@ -8720,13 +9165,13 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Language:</source>
- <translation type="unfinished"></translation>
+ <translation>Sprache:</translation>
</message>
<message>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Alias:</source>
- <translation type="unfinished"></translation>
+ <translation>Aliasname:</translation>
</message>
</context>
<context>
@@ -8734,20 +9179,24 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp" line="+58"/>
<source>Qt4 Console Application</source>
- <translation type="unfinished"></translation>
+ <translation>Qt4 Konsolenanwendung</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt4 console application.</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellt eine Qt4 Konsolenanwendung.</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::ConsoleAppWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp" line="+52"/>
<source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not present a GUI. You can press 'Finish' at any point in time.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Dieser Wizard erstellt eine Qt4 Konsolenanwendung. Sie leitet von der Klasse QCoreApplication ab und hat keine Benutzeroberfläche. Sie können jederzeit </translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp" line="+52"/>
+ <source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not provide a GUI.</source>
+ <translation>Dieser Wizard erstellt eine Qt4 Konsolenanwendung. Sie leitet von der Klasse QCoreApplication ab und hat keine Benutzeroberfläche.</translation>
</message>
</context>
<context>
@@ -8755,7 +9204,28 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/embeddedpropertiespage.cpp" line="+80"/>
<source>Embedded Linux</source>
- <translation type="unfinished"></translation>
+ <translation>Embedded Linux</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::EmptyProjectWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp" line="+40"/>
+ <source>Empty Qt4 Project</source>
+ <translation>Leeres Qt4-Projekt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates an empty Qt project.</source>
+ <translation>Erstellt ein leeres Qt-Projekt.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::EmptyProjectWizardDialog</name>
+ <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>Dieser Wizard erstellt ein leeres Qt4-Projekt. Mit Hilfe der anderen Wizards können später Dateien hinzufügt werden.</translation>
</message>
</context>
<context>
@@ -8763,22 +9233,22 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/enveditdialog.ui"/>
<source>Build Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Build-Umgebung</translation>
</message>
<message>
<location/>
<source>Make Command:</source>
- <translation type="unfinished"></translation>
+ <translation>make-Kommando:</translation>
</message>
<message>
<location/>
<source>Build Environment:</source>
- <translation type="unfinished"></translation>
+ <translation>Build-Umgebung:</translation>
</message>
<message>
<location/>
<source>mkspec:</source>
- <translation type="unfinished"></translation>
+ <translation>mkspec:</translation>
</message>
<message>
<location/>
@@ -8793,17 +9263,17 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>Values:</source>
- <translation type="unfinished"></translation>
+ <translation>Werte:</translation>
</message>
<message>
<location/>
<source>Variable:</source>
- <translation type="unfinished"></translation>
+ <translation>Variablen:</translation>
</message>
<message>
<location/>
<source>Import</source>
- <translation type="unfinished"></translation>
+ <translation>Import</translation>
</message>
<message>
<location/>
@@ -8820,13 +9290,8 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<name>Qt4ProjectManager::Internal::EnvVariablesPage</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/envvariablespage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Build Environments</source>
- <translation type="unfinished"></translation>
+ <translation>Build-Umgebungen</translation>
</message>
<message>
<location/>
@@ -8846,12 +9311,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>Default mkspec:</source>
- <translation type="unfinished"></translation>
+ <translation>Vorgabe-mkspec:</translation>
</message>
<message>
<location/>
<source>Default make command:</source>
- <translation type="unfinished"></translation>
+ <translation>Vorgabe-make-Kommando:</translation>
</message>
</context>
<context>
@@ -8859,12 +9324,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/filespage.cpp" line="+45"/>
<source>Class Information</source>
- <translation type="unfinished"></translation>
+ <translation>Information bezüglich Klasse</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>Geben Sie Informationen bezüglich der Klassen ein, für die Sie Quelltexte generieren wollen.</translation>
</message>
</context>
<context>
@@ -8872,17 +9337,17 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizard.cpp" line="+72"/>
<source>Qt4 Gui Application</source>
- <translation type="unfinished"></translation>
+ <translation>Qt4-Gui-Anwendung</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt4 Gui Application with one form.</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellt eine Qt4-Gui-Anwendung mit einem Formular.</translation>
</message>
<message>
<location line="+92"/>
<source>The template file '%1' could not be opened for reading: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die Vorgabendatei '%1' konnte nicht zum Lesen geöffnet werden: %2</translation>
</message>
</context>
<context>
@@ -8890,7 +9355,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<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>Dieser Wizard erstellt eine Qt4-GUI-Anwendung. Sie leitet von der Klasse QApplication ab und enthält ein leeres Widget.</translation>
</message>
</context>
<context>
@@ -8898,12 +9363,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizard.cpp" line="+50"/>
<source>C++ Library</source>
- <translation type="unfinished"></translation>
+ <translation>C++-Bibliothek</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a C++ Library.</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellt eine C++-Bibliothek.</translation>
</message>
</context>
<context>
@@ -8911,17 +9376,17 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp" line="+122"/>
<source>Shared library</source>
- <translation type="unfinished"></translation>
+ <translation>Dynamisch gebunden</translation>
</message>
<message>
<location line="+2"/>
<source>Statically linked library</source>
- <translation type="unfinished"></translation>
+ <translation>Statisch gebunden</translation>
</message>
<message>
<location line="+2"/>
<source>Qt 4 plugin</source>
- <translation type="unfinished"></translation>
+ <translation>Qt 4 Plugin</translation>
</message>
<message>
<location line="+2"/>
@@ -8931,7 +9396,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+35"/>
<source>This wizard generates a C++ library project.</source>
- <translation type="unfinished"></translation>
+ <translation>Dieser Wizard erstellt ein C++-Bibliotheksprojekt.</translation>
</message>
</context>
<context>
@@ -8939,12 +9404,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/modulespage.cpp" line="+50"/>
<source>Select required modules</source>
- <translation type="unfinished"></translation>
+ <translation>Auswahl der benötigten Module</translation>
</message>
<message>
<location line="+1"/>
<source>Select the modules you want to include in your project. The recommended modules for this project are selected by default.</source>
- <translation type="unfinished"></translation>
+ <translation>Wählen Sie die Module aus, die Sie in Ihrem Projekt verwenden wollen. Die empfohlenen Module für dieses Projekt sind bereits ausgewählt.</translation>
</message>
</context>
<context>
@@ -8962,27 +9427,27 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>Up</source>
- <translation type="unfinished"></translation>
+ <translation>Nach oben</translation>
</message>
<message>
<location/>
<source>Down</source>
- <translation type="unfinished"></translation>
+ <translation>Nach unten</translation>
</message>
<message>
<location filename="../../../src/shared/proparser/proeditor.cpp" line="+51"/>
<source>Cut</source>
- <translation type="unfinished"></translation>
+ <translation>Ausschneiden</translation>
</message>
<message>
<location line="+1"/>
<source>Copy</source>
- <translation type="unfinished"></translation>
+ <translation>Kopieren</translation>
</message>
<message>
<location line="+1"/>
<source>Paste</source>
- <translation type="unfinished"></translation>
+ <translation>Einfügen</translation>
</message>
<message>
<location line="+37"/>
@@ -9002,17 +9467,17 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+9"/>
<source>Add Variable</source>
- <translation type="unfinished"></translation>
+ <translation>Variable hinzufügen</translation>
</message>
<message>
<location line="+1"/>
<source>Add Scope</source>
- <translation type="unfinished"></translation>
+ <translation>Bereich hinzufügen</translation>
</message>
<message>
<location line="+1"/>
<source>Add Block</source>
- <translation type="unfinished"></translation>
+ <translation>Block hinzufügen</translation>
</message>
</context>
<context>
@@ -9020,47 +9485,47 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/shared/proparser/proeditormodel.cpp" line="+446"/>
<source><Global Scope></source>
- <translation type="unfinished"></translation>
+ <translation><Globaler Bereich></translation>
</message>
<message>
<location line="+74"/>
<source>Change Item</source>
- <translation type="unfinished"></translation>
+ <translation>Element bearbeiten</translation>
</message>
<message>
<location line="+20"/>
<source>Change Variable Assignment</source>
- <translation type="unfinished"></translation>
+ <translation>Variablenzuweisung bearbeiten</translation>
</message>
<message>
<location line="+11"/>
<source>Change Variable Type</source>
- <translation type="unfinished"></translation>
+ <translation>Type der Variablen bearbeiten</translation>
</message>
<message>
<location line="+14"/>
<source>Change Scope Condition</source>
- <translation type="unfinished"></translation>
+ <translation>Bedingung des Bereichs bearbeiten</translation>
</message>
<message>
<location line="+13"/>
<source>Change Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Ausdruck ändern</translation>
</message>
<message>
<location line="+51"/>
<source>Move Item</source>
- <translation type="unfinished"></translation>
+ <translation>Element verschieben</translation>
</message>
<message>
<location line="+41"/>
<source>Remove Item</source>
- <translation type="unfinished"></translation>
+ <translation>Element löschen</translation>
</message>
<message>
<location line="+49"/>
<source>Insert Item</source>
- <translation type="unfinished"></translation>
+ <translation>Element einfügen</translation>
</message>
</context>
<context>
@@ -9068,35 +9533,30 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+189"/>
<source>Import existing settings</source>
- <translation type="unfinished"></translation>
+ <translation>Existierende Einstellungen importieren</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></source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator hat einen existierenden Build im Quelverzeichnis gefunden.<br><br><b>Qt-Version:</b> %1<br><b>Build-Konfiguration:</b> %2<br></translation>
</message>
<message>
<location line="+10"/>
<source>Import existing build settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Existierende Einstellungen importieren.</translation>
</message>
<message>
<location line="+6"/>
- <source><b>Note:</b> Importing the settings will automatically add the Qt Version from:<br><b>%1</b> to the list of qt versions.</source>
- <translation type="unfinished"></translation>
+ <source><b>Note:</b> Importing the settings will automatically add the Qt Version from:<br><b>%1</b> to the list of Qt versions.</source>
+ <translation><b>Hinweis:</b> Das Importieren der Einstellungen wird die Qt-Version aus:<br><b>%1</b> zur Liste der Qt-Versionen hinzufügen.</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::Qt4BuildEnvironmentWidget</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Clear system environment</source>
- <translation type="unfinished"></translation>
+ <translation>Systemumgebung löschen</translation>
</message>
<message>
<location/>
@@ -9106,27 +9566,27 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>&Add</source>
- <translation type="unfinished"></translation>
+ <translation>Hinzu&fügen</translation>
</message>
<message>
<location/>
<source>&Reset</source>
- <translation type="unfinished"></translation>
+ <translation>&Rücksetzen</translation>
</message>
<message>
<location/>
<source>&Unset</source>
- <translation type="unfinished"></translation>
+ <translation>&Leeren</translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+84"/>
<source>Build Environment</source>
- <translation type="unfinished"></translation>
+ <translation>Build-Umgebung</translation>
</message>
<message>
<location line="+54"/>
<source>Reset</source>
- <translation type="unfinished"></translation>
+ <translation>Rücksetzen</translation>
</message>
<message>
<location line="+2"/>
@@ -9137,7 +9597,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::Internal::Qt4PriFileNode</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+280"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+281"/>
<location line="+7"/>
<source>Failed!</source>
<translation>Fehler</translation>
@@ -9155,78 +9615,73 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+33"/>
<source>There are unsaved changes for project file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Projektdatei %1 hat ungespeicherte Änderungen.</translation>
</message>
<message>
<location line="+22"/>
<source>Error while parsing file %1. Giving up.</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Auswerten von %1. Abbruch.</translation>
</message>
<message>
<location line="+7"/>
<source>Error while changing pro file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Ändern der Projektdatei %1.</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::Qt4ProFileNode</name>
<message>
- <location line="+227"/>
+ <location line="+236"/>
<source>Error while parsing file %1. Giving up.</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Auswerten von %1. Abbruch.</translation>
</message>
<message>
- <location line="+373"/>
+ <location line="+375"/>
<source>Could not find .pro file for sub dir '%1' in '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>Die .pro-Datei des Unterverzeichnisses '%1' konnte in '%2' nicht gefunden werden</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::Qt4ProjectConfigWidget</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Name der Konfiguration:</translation>
</message>
<message>
<location/>
<source>Qt Version:</source>
- <translation type="unfinished"></translation>
+ <translation>Qt-Version:</translation>
</message>
<message>
<location/>
<source>Manage Qt Versions</source>
- <translation type="unfinished"></translation>
+ <translation>Qt-Versionen verwalten</translation>
</message>
<message>
<location/>
<source>This Qt-Version is invalid.</source>
- <translation type="unfinished"></translation>
+ <translation>Diese Qt-Version ist ungültig.</translation>
</message>
<message>
<location/>
<source>Shadow Build:</source>
- <translation type="unfinished"></translation>
+ <translation>Shadow-Build:</translation>
</message>
<message>
<location/>
<source>Build Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Build-Verzeichnis:</translation>
</message>
<message>
<location/>
<source><a href="import">Import existing build</a></source>
- <translation type="unfinished"></translation>
+ <translation><a href="import">Existierenden Build importieren</a></translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+59"/>
<source>Shadow Build Directory</source>
- <translation type="unfinished"></translation>
+ <translation>Shadow-Build-Verzeichnis</translation>
</message>
<message>
<location line="+45"/>
@@ -9236,13 +9691,13 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+35"/>
<source>Default Qt Version</source>
- <translation type="unfinished"></translation>
+ <translation>Vorgabe-Qt-Version</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+151"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+154"/>
<location line="+5"/>
<source>Run qmake</source>
<translation>qmake ausführen</translation>
@@ -9252,20 +9707,20 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+69"/>
- <location line="+245"/>
+ <location line="+307"/>
<source>Qt4RunConfiguration</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+52"/>
<source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
- <translation type="unfinished"></translation>
+ <translation>%1 konnte nicht ausgewertet werden. Die Qt 4-Ausführungskonfiguration %2 konnte nicht gestartet werden.</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
<message>
- <location line="-267"/>
+ <location line="-329"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
@@ -9274,15 +9729,25 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
+ <message>
+ <location line="+5"/>
+ <source>Select the working directory</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+3"/>
+ <source>Reset to default</source>
+ <translation>Zurücksetzen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Working Directory:</source>
<translation>Arbeitsverzeichnis:</translation>
</message>
<message>
<location line="+2"/>
<source>&Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Kommandozeilen&argumente:</translation>
</message>
<message>
<location line="+5"/>
@@ -9292,7 +9757,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+5"/>
<source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
- <translation type="unfinished"></translation>
+ <translation>Debug-Version des Frameworks verwenden (DYLD_IMAGE_SUFFIX=_debug)</translation>
</message>
</context>
<context>
@@ -9300,37 +9765,37 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+65"/>
<source><specify a name></source>
- <translation type="unfinished"></translation>
+ <translation><Geben Sie einen Namen an></translation>
</message>
<message>
<location line="+1"/>
<source><specify a path></source>
- <translation type="unfinished"></translation>
+ <translation><Geben Sie einenPfad an></translation>
</message>
<message>
<location line="+11"/>
<source>Select QTDIR</source>
- <translation type="unfinished"></translation>
+ <translation>QTDIR Auswählen</translation>
</message>
<message>
<location line="+2"/>
<source>Select the Qt Directory</source>
- <translation type="unfinished"></translation>
+ <translation>Wählen Sie das Qt-Verzeichnis aus</translation>
</message>
<message>
<location line="+211"/>
<source>The Qt Version %1 is not installed. Run make install</source>
- <translation type="unfinished"></translation>
+ <translation>Die Qt-Version %1 ist nicht installiert. Führen Sie make install aus</translation>
</message>
<message>
<location line="+3"/>
- <source>%1 is not a valid qt directory</source>
- <translation type="unfinished"></translation>
+ <source>%1 is not a valid Qt directory</source>
+ <translation>%1 ist kein gültiges Qt-Verzeichnis</translation>
</message>
<message>
<location line="+4"/>
<source>Found Qt version %1, using mkspec %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die Qt-Version %1 mit mkspec %2 wurde gefunden</translation>
</message>
</context>
<context>
@@ -9340,15 +9805,10 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
- <message>
- <location/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location/>
<source>Qt versions</source>
- <translation type="unfinished"></translation>
+ <translation>Qt-Versionen</translation>
</message>
<message>
<location/>
@@ -9378,32 +9838,32 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>Version Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Name der Version:</translation>
</message>
<message>
<location/>
<source>MinGw Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>MinGw-Verzeichnis:</translation>
</message>
<message>
<location/>
<source>Debugging Helper:</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger-Ausgabe-Hilfsbibliothek:</translation>
</message>
<message>
<location/>
<source>Show &Log</source>
- <translation type="unfinished"></translation>
+ <translation>&Protokoll anzeigen</translation>
</message>
<message>
<location/>
<source>&Rebuild</source>
- <translation type="unfinished"></translation>
+ <translation>&Neu erstellen</translation>
</message>
<message>
<location/>
<source>Default Qt Version:</source>
- <translation type="unfinished"></translation>
+ <translation>Vorgabe-Qt-Version:</translation>
</message>
</context>
<context>
@@ -9411,7 +9871,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/qtwizard.cpp" line="+91"/>
<source>The project %1 could not be opened.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Projekt %1 konnte nicht geöffnet werden.</translation>
</message>
</context>
<context>
@@ -9419,67 +9879,67 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/shared/proparser/valueeditor.ui"/>
<source>Edit Variable</source>
- <translation type="unfinished"></translation>
+ <translation>Variable bearbeiten</translation>
</message>
<message>
<location/>
<source>Variable Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Name der Variablen:</translation>
</message>
<message>
<location/>
<source>Assignment Operator:</source>
- <translation type="unfinished"></translation>
+ <translation>Zuweisungsoperator:</translation>
</message>
<message>
<location/>
<source>Variable:</source>
- <translation type="unfinished"></translation>
+ <translation>Variablen:</translation>
</message>
<message>
<location/>
<source>Append (+=)</source>
- <translation type="unfinished"></translation>
+ <translation>Anhängen (+=)</translation>
</message>
<message>
<location/>
<source>Remove (-=)</source>
- <translation type="unfinished"></translation>
+ <translation>Entfernen (-=)</translation>
</message>
<message>
<location/>
<source>Replace (~=)</source>
- <translation type="unfinished"></translation>
+ <translation>Ersetzen (~=)</translation>
</message>
<message>
<location/>
<source>Set (=)</source>
- <translation type="unfinished"></translation>
+ <translation>Zuweisen (=)</translation>
</message>
<message>
<location/>
<source>Unique (*=)</source>
- <translation type="unfinished"></translation>
+ <translation>Eindeutig zuweisen (*=)</translation>
</message>
<message>
<location/>
<source>Select Item</source>
- <translation type="unfinished"></translation>
+ <translation>Element auswählen</translation>
</message>
<message>
<location/>
<source>Edit Item</source>
- <translation type="unfinished"></translation>
+ <translation>Element bearbeiten</translation>
</message>
<message>
<location/>
<source>Select Items</source>
- <translation type="unfinished"></translation>
+ <translation>Elemente auswählen</translation>
</message>
<message>
<location/>
<source>Edit Items</source>
- <translation type="unfinished"></translation>
+ <translation>Elemente bearbeiten</translation>
</message>
<message>
<location/>
@@ -9494,22 +9954,22 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/shared/proparser/valueeditor.cpp" line="+252"/>
<source>Edit Values</source>
- <translation type="unfinished"></translation>
+ <translation>Werte bearbeiten</translation>
</message>
<message>
<location line="+3"/>
<source>Edit %1</source>
- <translation type="unfinished"></translation>
+ <translation>%1 bearbeiten</translation>
</message>
<message>
<location line="+69"/>
<source>Edit Scope</source>
- <translation type="unfinished"></translation>
+ <translation>Bereich bearbeiten</translation>
</message>
<message>
<location line="+14"/>
<source>Edit Advanced Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Erweiterten Ausdruck bearbeiten</translation>
</message>
</context>
<context>
@@ -9517,12 +9977,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+78"/>
<source><font color="#ff0000">Could not find make command: %1 in the build environment</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Das make-Kommando %1 konnte in der Build-Umgebung nicht gefunden werden</font></translation>
</message>
<message>
<location line="+50"/>
<source><font color="#0000ff"><b>No Makefile found, assuming project is clean.</b></font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff"><b>Es wurde kein Makefile gefunden; das Projekt ist offenbar im bereinigten Zustand.</b></font></translation>
</message>
</context>
<context>
@@ -9530,7 +9990,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+52"/>
<source>Override %1:</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœberschreibe %1:</translation>
</message>
</context>
<context>
@@ -9540,58 +10000,62 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<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>Es ist keine gültige Qt-Version gesetzt. Setzen Sie sie unter Einstellungen</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>Es ist keine gültige Qt-Version gesetzt. Setzen Sie sie unter Werkzeuge/Einstellungen</b></font>
+</translation>
</message>
<message>
<location line="+10"/>
<source>QMAKESPEC from environment (%1) overrides mkspec of selected Qt (%2).</source>
- <translation type="unfinished"></translation>
+ <translation>Die QMAKESPEC-ANgabe aus der Umgebung (%1) überschreibt die mkspec-Angabe der gewählten Qt-Version (%2).</translation>
</message>
<message>
<location line="+53"/>
<source><font color="#0000ff">Configuration unchanged, skipping QMake step.</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff">Konfiguration unverändert, übersrpinge QMake-Schritt.</font></translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Qt4Manager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+133"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+191"/>
<source>Loading project %1 ...</source>
- <translation type="unfinished"></translation>
+ <translation>Lade Projekt %1 ...</translation>
</message>
<message>
<location line="+9"/>
<source>Failed opening project '%1': Project file does not exist</source>
- <translation type="unfinished"></translation>
+ <translation>Das Projekt %1 konnte nicht geöffnet werden: Die Projektdatei existiert nicht</translation>
</message>
<message>
<location line="+1"/>
<location line="+7"/>
<source>Failed opening project</source>
- <translation type="unfinished"></translation>
+ <translation>Das Projekt konnte nicht geöffnet werden</translation>
</message>
<message>
<location line="-1"/>
<source>Failed opening project '%1': Project already open</source>
- <translation type="unfinished"></translation>
+ <translation>Das Projekt %1 konnte nicht geöffnet werden da es bereits geladen ist</translation>
</message>
<message>
<location line="+6"/>
<source>Opening %1 ...</source>
- <translation type="unfinished"></translation>
+ <translation>Öffne %1 ...</translation>
</message>
<message>
<location line="+5"/>
<source>Done opening project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt geöffnet</translation>
</message>
</context>
<context>
@@ -9611,15 +10075,15 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QtDumperHelper</name>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+163"/>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+225"/>
<source><none></source>
- <translation type="unfinished"></translation>
+ <translation><kein></translation>
</message>
<message numerus="yes">
<location line="+1"/>
<source>%n known types, Qt version: %1, Qt namespace: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n bekannte Typen, Qt-Version: %1, Namensraum: %2</numerusform>
<numerusform></numerusform>
</translation>
</message>
@@ -9643,7 +10107,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+2"/>
<source>Qt</source>
- <translation type="unfinished"></translation>
+ <translation>Qt</translation>
</message>
<message>
<location line="+57"/>
@@ -9723,11 +10187,6 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<name>QuickOpen::Internal::DirectoryFilterOptions</name>
<message>
<location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
- <source>Dialog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Name:</source>
<translation>Name:</translation>
</message>
@@ -9885,14 +10344,12 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<translation>Entfernen</translation>
</message>
<message>
- <location/>
<source>Edit</source>
- <translation>Editieren</translation>
+ <translation type="obsolete">Editieren</translation>
</message>
<message>
- <location/>
<source>Refresh Intervall:</source>
- <translation>Aktualisierungsintervall:</translation>
+ <translation type="obsolete">Aktualisierungsintervall:</translation>
</message>
<message>
<location/>
@@ -9904,6 +10361,16 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<source>Refresh now!</source>
<translation>Jetzt aktualisieren!</translation>
</message>
+ <message>
+ <location/>
+ <source>Edit...</source>
+ <translation>Ändern...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Refresh Interval:</source>
+ <translation>Aktualisierungsintervall:</translation>
+ </message>
</context>
<context>
<name>QuickOpen::Internal::SettingsPage</name>
@@ -10060,7 +10527,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+2"/>
<source>Qt</source>
- <translation type="unfinished"></translation>
+ <translation>Qt</translation>
</message>
<message>
<location line="+12"/>
@@ -10086,17 +10553,17 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.ui"/>
<source>Save Changes</source>
- <translation type="unfinished"></translation>
+ <translation>Änderungen speichern</translation>
</message>
<message>
<location/>
<source>The following files have unsaved changes:</source>
- <translation type="unfinished"></translation>
+ <translation>Die folgenden Dateien wurden geändert:</translation>
</message>
<message>
<location/>
- <source>Automatically save all Files before building</source>
- <translation type="unfinished"></translation>
+ <source>Automatically save all files before building</source>
+ <translation>Geänderte Dateien vorm Erstellen automatisch speichern</translation>
</message>
</context>
<context>
@@ -10104,7 +10571,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.ui"/>
<source>Options</source>
- <translation type="unfinished"></translation>
+ <translation>Einstellungen</translation>
</message>
<message>
<location/>
@@ -10117,62 +10584,62 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location filename="../../../src/shared/qrceditor/qrceditor.cpp" line="+57"/>
<source>Add Files</source>
- <translation type="unfinished"></translation>
+ <translation>Dateien hinzufügen</translation>
</message>
<message>
<location line="+1"/>
<source>Add Prefix</source>
- <translation type="unfinished"></translation>
+ <translation>Präfix hinzufügen</translation>
</message>
<message>
<location line="+156"/>
<source>Invalid file</source>
- <translation type="unfinished"></translation>
+ <translation>Ungültige Datei</translation>
</message>
<message>
<location line="+2"/>
<source>Copy</source>
- <translation type="unfinished"></translation>
+ <translation>Kopieren</translation>
</message>
<message>
<location line="+4"/>
<source>Skip</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœberspringen</translation>
</message>
<message>
<location line="+3"/>
<source>Abort</source>
- <translation type="unfinished"></translation>
+ <translation>Abbrechen</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>Die Datei %1 befindet sich nicht in einem Unterverzeichnis der Ressourcendatei. Durch das Hinzufügen würde eine ungültige Ressourcendatei entstehen.</translation>
</message>
<message>
<location line="+15"/>
<source>Choose copy location</source>
- <translation type="unfinished"></translation>
+ <translation>Wählen Sie ein Ziel zum Kopieren</translation>
</message>
<message>
<location line="+10"/>
<source>Overwrite failed</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Ãœberschreiben</translation>
</message>
<message>
<location line="+1"/>
<source>Could not overwrite file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei %1 konnte nicht überschrieben werden.</translation>
</message>
<message>
<location line="+10"/>
<source>Copying failed</source>
- <translation type="unfinished"></translation>
+ <translation>Das Kopieren schlug fehl</translation>
</message>
<message>
<location line="+1"/>
<source>Could not copy the file to %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei konnte nicht nach %1 kopiert werden.</translation>
</message>
</context>
<context>
@@ -10180,32 +10647,32 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location filename="../../../src/shared/qrceditor/resourceview.cpp" line="+362"/>
<source>Add Files...</source>
- <translation type="unfinished"></translation>
+ <translation>Dateien hinzufügen...</translation>
</message>
<message>
<location line="+1"/>
<source>Change Alias...</source>
- <translation type="unfinished"></translation>
+ <translation>Alias ändern...</translation>
</message>
<message>
<location line="+1"/>
<source>Add Prefix...</source>
- <translation type="unfinished"></translation>
+ <translation>Präfix hinzufügen...</translation>
</message>
<message>
<location line="+1"/>
<source>Change Prefix...</source>
- <translation type="unfinished"></translation>
+ <translation>Präfix ändern...</translation>
</message>
<message>
<location line="+1"/>
<source>Change Language...</source>
- <translation type="unfinished"></translation>
+ <translation>Sprache ändern...</translation>
</message>
<message>
<location line="+2"/>
<source>Remove Item</source>
- <translation type="unfinished"></translation>
+ <translation>Element löschen</translation>
</message>
<message>
<location line="+41"/>
@@ -10215,50 +10682,45 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+2"/>
<source>All files (*)</source>
- <translation type="unfinished"></translation>
+ <translation>Alle Dateien (*)</translation>
</message>
<message>
<location line="+93"/>
<source>Change Prefix</source>
- <translation type="unfinished"></translation>
+ <translation>Präfix ändern</translation>
</message>
<message>
<location line="+0"/>
<source>Input Prefix:</source>
- <translation type="unfinished"></translation>
+ <translation>Präfix:</translation>
</message>
<message>
<location line="+13"/>
<source>Change Language</source>
- <translation type="unfinished"></translation>
+ <translation>Sprache ändern</translation>
</message>
<message>
<location line="+0"/>
<source>Language:</source>
- <translation type="unfinished"></translation>
+ <translation>Sprache:</translation>
</message>
<message>
<location line="+16"/>
<source>Change File Alias</source>
- <translation type="unfinished"></translation>
+ <translation>Dateialias ändern</translation>
</message>
<message>
<location line="+0"/>
<source>Alias:</source>
- <translation type="unfinished"></translation>
+ <translation>Aliasname:</translation>
</message>
</context>
<context>
<name>ShortcutSettings</name>
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/shortcutsettings.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"></translation>
+ <translation>Tastenkürzel</translation>
</message>
<message>
<location/>
@@ -10268,7 +10730,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location/>
<source>Command</source>
- <translation type="unfinished"></translation>
+ <translation>Kommando</translation>
</message>
<message>
<location/>
@@ -10278,37 +10740,37 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location/>
<source>Shortcut</source>
- <translation type="unfinished"></translation>
+ <translation>Tastenkürzel</translation>
</message>
<message>
<location/>
<source>Defaults</source>
- <translation type="unfinished"></translation>
+ <translation>Vorgabe</translation>
</message>
<message>
<location/>
<source>Import...</source>
- <translation type="unfinished"></translation>
+ <translation>Importieren...</translation>
</message>
<message>
<location/>
<source>Export...</source>
- <translation type="unfinished"></translation>
+ <translation>Exportieren...</translation>
</message>
<message>
<location/>
<source>Key Sequence</source>
- <translation type="unfinished"></translation>
+ <translation>Tastenfolge</translation>
</message>
<message>
<location/>
<source>Shortcut:</source>
- <translation type="unfinished"></translation>
+ <translation>Tastenkürzel:</translation>
</message>
<message>
<location/>
<source>Reset</source>
- <translation type="unfinished"></translation>
+ <translation>Rücksetzen</translation>
</message>
<message>
<location/>
@@ -10318,344 +10780,126 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
</context>
<context>
<name>ShowBuildLog</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/showbuildlog.ui"/>
- <source>Debugging Helper Build Log</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>SimpleProEditor</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/speinfo.cpp" line="+59"/>
- <source>Debug and Release</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Debug specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Release specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>All platforms</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>MS Windows specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Linux/Unix specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Mac OSX specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Target Options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Type and name of the target.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Preprocessor Definitions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting of the preprocessor definitions.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Include path</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting of the pathes where the header files are located.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Libraries</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Defining the libraries to link the target against and the pathes where these are located.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Source Files</source>
- <translation>Quelldateien</translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Header Files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Forms</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Qt Modules</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting up which of the Qt modules will be used in the target application.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Resource files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Target name</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>The name of the resulting target.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Configuration.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Destination directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Where the resulting target will be created.</source>
- <translation type="unfinished"></translation>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/showbuildlog.ui"/>
+ <source>Debugging Helper Build Log</source>
+ <translation>Erstellungsprotokoll der Ausgabe-Hilfsbibliothek</translation>
</message>
+</context>
+<context>
+ <name>QtModulesInfo</name>
<message>
- <location line="+15"/>
<source>QtCore Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Core non-GUI classes used by other modules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtGui Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Graphical user interface components</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtNetwork Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for network programming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtOpenGL Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>OpenGL support classes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtSql Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for database integration using SQL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtScript Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for evaluating Qt Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtSvg Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for displaying the contents of SVG files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtWebKit Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for displaying and editing Web content</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtXml Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for handling XML</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtXmlPatterns Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>An XQuery/XPath engine for XML and custom data models</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>Phonon Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Multimedia framework classes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>Qt3Support Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes that ease porting from Qt 3 to Qt 4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtTest Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Tool classes for unit testing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtDBus module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for Inter-Process Communication using the D-Bus</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+15"/>
- <source>Application</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a standalone application</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Dynamic Library</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a dynamic library for usage in other applications</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Static Library</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a static library for usage in other applications</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Add Operator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Remove Operator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Replace Operator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Set Operator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Unique Add Operator</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Snippets::Internal::SnippetsPlugin</name>
@@ -10698,63 +10942,53 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<source>Start Debugger</source>
<translation>Debugger starten</translation>
</message>
- <message>
- <location/>
- <source>localhost:5115</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location/>
<source>Architecture:</source>
- <translation type="unfinished"></translation>
+ <translation>Architektur:</translation>
</message>
<message>
<location/>
<source>Host and port:</source>
- <translation type="unfinished"></translation>
+ <translation>Host und Portnummer:</translation>
</message>
<message>
<location/>
<source>Use server start script:</source>
- <translation type="unfinished"></translation>
+ <translation>Server-Startskript benutzen:</translation>
</message>
<message>
<location/>
<source>Server start script:</source>
- <translation type="unfinished"></translation>
+ <translation>Server-Startskript:</translation>
</message>
</context>
<context>
<name>Subversion::Internal::SettingsPage</name>
<message>
<location filename="../../../src/plugins/subversion/settingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Subversion Command:</source>
- <translation type="unfinished"></translation>
+ <translation>Subversion-Kommando:</translation>
</message>
<message>
<location/>
<source>Authentication</source>
- <translation type="unfinished"></translation>
+ <translation>Authentifizierung</translation>
</message>
<message>
<location/>
<source>User name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nutzername:</translation>
</message>
<message>
<location/>
<source>Password:</source>
- <translation type="unfinished"></translation>
+ <translation>Passwort:</translation>
</message>
<message>
<location filename="../../../src/plugins/subversion/settingspage.cpp" line="+84"/>
<source>Subversion</source>
- <translation type="unfinished"></translation>
+ <translation>Subversion</translation>
</message>
</context>
<context>
@@ -10762,7 +10996,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="-34"/>
<source>Subversion Command</source>
- <translation type="unfinished"></translation>
+ <translation>Subversion-Kommando</translation>
</message>
</context>
<context>
@@ -10770,26 +11004,31 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location filename="../../../src/plugins/subversion/subversionoutputwindow.cpp" line="+43"/>
<source>Subversion Output</source>
- <translation type="unfinished"></translation>
+ <translation>Subversion-Ausgabe</translation>
</message>
<message>
<location line="+17"/>
<source>Subversion</source>
- <translation type="unfinished"></translation>
+ <translation>Subversion</translation>
</message>
</context>
<context>
<name>Subversion::Internal::SubversionPlugin</name>
<message>
- <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+312"/>
+ <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+313"/>
<source>&Subversion</source>
- <translation type="unfinished"></translation>
+ <translation>&Subversion</translation>
</message>
<message>
<location line="+11"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
+ <message>
+ <location line="+0"/>
+ <source>Add "%1"</source>
+ <translation>"%1" hinzufügen</translation>
+ </message>
<message>
<location line="+5"/>
<source>Alt+S,Alt+A</source>
@@ -10800,20 +11039,35 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<source>Delete</source>
<translation>Löschen</translation>
</message>
+ <message>
+ <location line="+0"/>
+ <source>Delete "%1"</source>
+ <translation>"%1" löschen</translation>
+ </message>
<message>
<location line="+7"/>
<source>Revert</source>
- <translation type="unfinished"></translation>
+ <translation>Rückgängig machen</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Revert "%1"</source>
+ <translation>Änderungen in "%1" rückgängig machen (revert)</translation>
</message>
<message>
<location line="+9"/>
<source>Diff Project</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Projekt</translation>
</message>
<message>
<location line="+6"/>
<source>Diff Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Datei</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Diff "%1"</source>
+ <translation>Diff für "%1"</translation>
</message>
<message>
<location line="+5"/>
@@ -10823,12 +11077,17 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+7"/>
<source>Commit All Files</source>
- <translation type="unfinished"></translation>
+ <translation>Alle Dateien abgeben</translation>
</message>
<message>
<location line="+6"/>
<source>Commit Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei abgeben</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Commit "%1"</source>
+ <translation>"%1" abgeben</translation>
</message>
<message>
<location line="+5"/>
@@ -10838,37 +11097,47 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+7"/>
<source>Filelog Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Filelog für Datei</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Filelog "%1"</source>
+ <translation>Filelog für "%1"</translation>
</message>
<message>
<location line="+8"/>
<source>Annotate Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Annotation für Datei</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Annotate "%1"</source>
+ <translation>Annotation für "%1"</translation>
</message>
<message>
<location line="+8"/>
<source>Describe...</source>
- <translation type="unfinished"></translation>
+ <translation>Beschreibung zu...</translation>
</message>
<message>
<location line="+7"/>
<source>Project Status</source>
- <translation type="unfinished"></translation>
+ <translation>Status des Projekts (status)</translation>
</message>
<message>
<location line="+6"/>
<source>Update Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt auf aktuellen Stand bringen</translation>
</message>
<message>
<location line="+9"/>
<source>Commit</source>
- <translation type="unfinished"></translation>
+ <translation>Abgeben</translation>
</message>
<message>
<location line="+4"/>
<source>Diff Selected Files</source>
- <translation type="unfinished"></translation>
+ <translation>Diff für Auswahl</translation>
</message>
<message>
<location line="+3"/>
@@ -10883,72 +11152,41 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+39"/>
<source>Closing Subversion Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Subversion-Editor schließen</translation>
</message>
<message>
<location line="+1"/>
<source>Do you want to commit the change?</source>
- <translation type="unfinished"></translation>
+ <translation>Möchten Sie den Commit ausführen?</translation>
</message>
<message>
<location line="+1"/>
<source>The commit message check failed. Do you want to commit the change?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+97"/>
- <source>Add %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Delete %1</source>
- <translation type="unfinished"></translation>
+ <translation>Die Überprüfung der Beschreibung schlug fehl. Möchten Sie den Commit trotzdem ausführen?</translation>
</message>
<message>
- <location line="+1"/>
- <source>Revert %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
<source>Diff %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Commit %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Filelog %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Annotate %1</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Diff für %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+124"/>
<source>The file has been changed. Do you want to revert it?</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei wurde geändert. Möchten Sie sie zurücksetzen?</translation>
</message>
<message>
<location line="+90"/>
<source>The commit list spans several respositories (%1). Please commit them one by one.</source>
- <translation type="unfinished"></translation>
+ <translation>Die abzugebenden Dateien umfassen mehrere Repositories. Bitte geben Sie sie einzeln ab.</translation>
</message>
<message>
<location line="+17"/>
<source>Another commit is currently being executed.</source>
- <translation type="unfinished"></translation>
+ <translation>Es läuft bereits ein Abgabevorgang.</translation>
</message>
<message>
<location line="+15"/>
<source>There are no modified files.</source>
- <translation type="unfinished"></translation>
+ <translation>Es gibt keine geänderten Dateien.</translation>
</message>
<message>
<location line="+8"/>
@@ -10958,44 +11196,45 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+184"/>
<source>Describe</source>
- <translation type="unfinished"></translation>
+ <translation>Beschreibe</translation>
</message>
<message>
<location line="+1"/>
<source>Revision number:</source>
- <translation type="unfinished"></translation>
+ <translation>Revisionsnummer:</translation>
</message>
<message>
<location line="+47"/>
<source>No subversion executable specified!</source>
- <translation type="unfinished"></translation>
+ <translation>Es wurde keine ausführbaren Subversion-Datei angegeben!
+</translation>
</message>
<message>
<location line="+8"/>
<source>%1 Executing: %2 %3
</source>
<extracomment><timestamp> Executing: <executable> <arguments></extracomment>
- <translation type="unfinished"></translation>
+ <translation>%1 Kommando: %2 %3</translation>
</message>
<message>
<location line="+29"/>
<source>The process terminated with exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Prozess wurde beendet, Rückgabewert %1.</translation>
</message>
<message>
<location line="+3"/>
<source>The process terminated abnormally.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Prozess wurde in unnormaler Weise beendet.</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>Das Subversion-Kommando '%1' konnte nicht gestartet werden. Bitte überprüfen Sie die Einstellungen.</translation>
</message>
<message>
<location line="+3"/>
<source>Subversion did not respond within timeout limit (%1 ms).</source>
- <translation type="unfinished"></translation>
+ <translation>Keine Antwort von Subversion innerhalb des Zeitlimits (%1 ms).</translation>
</message>
</context>
<context>
@@ -11028,12 +11267,12 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextDocument</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+172"/>
+ <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+158"/>
<source>untitled</source>
<translation>kein Titel</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source><em>Binary data</em></source>
<translation><em>Binäre Daten</em></translation>
</message>
@@ -11041,7 +11280,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+227"/>
+ <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+228"/>
<source>Print Document</source>
<translation>Dokument drucken</translation>
</message>
@@ -11059,7 +11298,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+3570"/>
+ <location line="+3585"/>
<source>Line: %1, Col: %2</source>
<translation>Zeile: %1, Spalte: %2</translation>
</message>
@@ -11073,11 +11312,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<name>TextEditor::BehaviorSettingsPage</name>
<message>
<location filename="../../../src/plugins/texteditor/behaviorsettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Storage</source>
<translation>Abspeichern</translation>
</message>
@@ -11156,11 +11390,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<name>TextEditor::DisplaySettingsPage</name>
<message>
<location filename="../../../src/plugins/texteditor/displaysettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Display</source>
<translation>Anzeige</translation>
</message>
@@ -11214,6 +11443,16 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<source>Animate matching parentheses</source>
<translation>Passende Klammern animieren</translation>
</message>
+ <message>
+ <location/>
+ <source>Navigation</source>
+ <translation>Navigation</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Enable &mouse navigation</source>
+ <translation>&Mausnavigation aktivieren</translation>
+ </message>
</context>
<context>
<name>TextEditor::FontSettingsPage</name>
@@ -11292,11 +11531,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<name>TextEditor::Internal::FontSettingsPage</name>
<message>
<location filename="../../../src/plugins/texteditor/fontsettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Font</source>
<translation>Zeichensatz</translation>
</message>
@@ -11400,7 +11634,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::TextEditorActionHandler</name>
<message>
- <location filename="../../../src/plugins/texteditor/texteditoractionhandler.cpp" line="+115"/>
+ <location filename="../../../src/plugins/texteditor/texteditoractionhandler.cpp" line="+116"/>
<source>&Undo</source>
<translation>&Rückgangig</translation>
</message>
@@ -11460,17 +11694,22 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+9"/>
<source>Delete &Line</source>
<translation>&Zeile löschen</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-3"/>
<source>Shift+Del</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-2"/>
+ <source>Cut &Line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>Collapse</source>
<translation>Einklappen</translation>
</message>
@@ -11745,27 +11984,27 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location filename="../../../src/shared/help/topicchooser.cpp" line="+42"/>
<source>Choose a topic for <b>%1</b>:</source>
- <translation type="unfinished"></translation>
+ <translation>Wählen Sie ein Thema für <b>%1</b>:</translation>
</message>
<message>
<location filename="../../../src/shared/help/topicchooser.ui"/>
<source>Choose Topic</source>
- <translation type="unfinished"></translation>
+ <translation>Themenwahl</translation>
</message>
<message>
<location/>
<source>&Topics</source>
- <translation type="unfinished"></translation>
+ <translation>&Themen</translation>
</message>
<message>
<location/>
<source>&Display</source>
- <translation type="unfinished"></translation>
+ <translation>&Anzeigen</translation>
</message>
<message>
<location/>
<source>&Close</source>
- <translation type="unfinished"></translation>
+ <translation>&Schließen</translation>
</message>
</context>
<context>
@@ -11773,7 +12012,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbaseconstants.h" line="+38"/>
<source>Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>Versionskontrolle</translation>
</message>
<message>
<location line="+1"/>
@@ -11791,22 +12030,22 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location line="+0"/>
<source>E-mail</source>
- <translation type="unfinished"></translation>
+ <translation>E-Mail-Adresse</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-E-Mail-Adresse</translation>
</message>
<message>
<location line="+15"/>
<source>Cannot open '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei '%1' kann nicht geöffnet werden: %2</translation>
</message>
</context>
<context>
@@ -11827,7 +12066,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbaseeditor.cpp" line="+315"/>
<source>Describe change %1</source>
- <translation type="unfinished"></translation>
+ <translation>Details zur Änderung %1 anzeigen</translation>
</message>
</context>
<context>
@@ -11835,86 +12074,87 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbasesubmiteditor.cpp" line="+134"/>
<source>Check message</source>
- <translation type="unfinished"></translation>
+ <translation>Beschreibung prüfen</translation>
</message>
<message>
<location line="+6"/>
<source>Insert name...</source>
- <translation type="unfinished"></translation>
+ <translation>Namen einfügen...</translation>
</message>
<message>
<location line="+361"/>
<source>Submit Message Check failed</source>
- <translation type="unfinished"></translation>
+ <translation>Die Überprüfung der Beschreibung schlug fehl</translation>
</message>
<message>
<location line="+28"/>
<source>Unable to open '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>'%1' kann nicht geöffnet werden: %2</translation>
</message>
<message>
<location line="+10"/>
<source>The check script '%1' could not be started: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Das Skript zur Überprüfung '%1' konnte nicht gestartet werden: %2</translation>
</message>
<message>
<location line="+4"/>
<source>The check script '%1' could not be run: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Das Skript zur Überprüfung '%1' konnte nicht ausgeführt werden: %2</translation>
</message>
<message>
<location line="+7"/>
<source>The check script returned exit code %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Skript zur Überprüfung wurde beendet, Rückgabewert %1.</translation>
</message>
</context>
<context>
<name>VCSBaseSettingsPage</name>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbasesettingspage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
+ <source>Prompt to submit</source>
+ <translation>Abgabe bestätigen</translation>
</message>
<message>
<location/>
- <source>Prompt to submit</source>
- <translation type="unfinished"></translation>
+ <source>Common</source>
+ <translation>Allgemein</translation>
</message>
<message>
<location/>
<source>Wrap submit message at:</source>
- <translation type="unfinished"></translation>
+ <translation>Beschreibung umbrechen bei:</translation>
</message>
<message>
<location/>
<source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source>
- <translation type="unfinished"></translation>
+ <translation>Eine ausführbare Datei, die mit der Beschreibung in einer temporären Datei als erstem Kommandozeilenparameter aufgerufen wird. Bei Fehlschlag sollte sie einen Rückgabewert ungleich Null mit einer entsprechende Nachricht auf der Fehlerausgabe zurückgeben.</translation>
</message>
<message>
<location/>
<source>Submit message check script:</source>
- <translation type="unfinished"></translation>
+ <translation>Skript zur Überprüfung der Beschreibung:</translation>
</message>
<message>
<location/>
<source>A file listing user names and email addresses in a 4-column mailmap format:
name <email> alias <email></source>
- <translation type="unfinished"></translation>
+ <translation>Eine Datei, die Nutzernamen und E-Mail-Adressen in einem vierspaltigen Format (mailmap) enthält:
+Namen <E-Mail> Alias <E-Mail?</translation>
</message>
<message>
<location/>
<source>User/alias configuration file:</source>
- <translation type="unfinished"></translation>
+ <translation>Nutzer/Alias-Konfigurationsdatei:</translation>
</message>
<message>
<location/>
<source>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</source>
- <translation type="unfinished"></translation>
+ <translation>Eine Datei, die Zeilen mit Feldnamen (zum Beispiel "Reviewed-By:") enthält, die im Abgabefenster unter der Beschreibung erscheinen.</translation>
</message>
<message>
<location/>
<source>User fields configuration file:</source>
- <translation type="unfinished"></translation>
+ <translation>Nutzerfeld-Konfigurationsdatei:</translation>
</message>
</context>
<context>
@@ -11922,13 +12162,14 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+132"/>
<source>Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>Versionskontrolle</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>Möchten Sie die Datei aus der Versionskontrolle entferned (%1)?
+Hinweis: Unter Umständen wird die Datei gelöscht.</translation>
</message>
</context>
<context>
@@ -11936,25 +12177,25 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/shared/cpaster/view.cpp" line="+89"/>
<source>Paste</source>
- <translation type="unfinished"></translation>
+ <translation>Einfügen</translation>
</message>
<message>
<location line="+11"/>
<location line="+41"/>
<source><Username></source>
- <translation type="unfinished"></translation>
+ <translation><Nutzername></translation>
</message>
<message>
<location line="-33"/>
<location line="+38"/>
<source><Description></source>
- <translation type="unfinished"></translation>
+ <translation><Beschreibung></translation>
</message>
<message>
<location line="-30"/>
<location line="+35"/>
<source><Comment></source>
- <translation type="unfinished"></translation>
+ <translation><Kommentar></translation>
</message>
</context>
<context>
@@ -11962,27 +12203,27 @@ Note: This might remove the local file.</source>
<message>
<location filename="../../../src/shared/cpaster/view.ui"/>
<source>Send to Codepaster</source>
- <translation type="unfinished"></translation>
+ <translation>An CodePaster senden</translation>
</message>
<message>
<location/>
<source>&Username:</source>
- <translation type="unfinished"></translation>
+ <translation>&Nutzername:</translation>
</message>
<message>
<location/>
<source><Username></source>
- <translation type="unfinished"></translation>
+ <translation><Nutzername></translation>
</message>
<message>
<location/>
<source>&Description:</source>
- <translation type="unfinished"></translation>
+ <translation>&Beschreibung:</translation>
</message>
<message>
<location/>
<source><Description></source>
- <translation type="unfinished"></translation>
+ <translation><Beschreibung></translation>
</message>
<message>
<location/>
@@ -11990,12 +12231,15 @@ Note: This might remove the local file.</source>
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;Comment&gt;</p></body></html></source>
- <translation type="unfinished"></translation>
+ <translation><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;Kommentar&gt;</p></body></html></translation>
</message>
<message>
<location/>
<source>Parts to send to codepaster</source>
- <translation type="unfinished"></translation>
+ <translation>An CodePaster zu sendende Teile</translation>
</message>
<message>
<location/>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 9c335abd6377496549108178b175544ed7db615e..a4d9c23f4c42db0035169fe99ebda10ba521563b 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -2301,6 +2301,11 @@ p {
</context>
<context>
<name>CppFileSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+52"/>
+ <source>File naming conventions</source>
+ <translation>Convenzioni sul nome dei file</translation>
+ </message>
<message>
<location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
<source>Header suffix:</source>
@@ -4053,6 +4058,11 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato.</translation>
</context>
<context>
<name>DebuggingHelperOptionPage</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-596"/>
+ <source>Debugging Helper</source>
+ <translation>Helper del Debug</translation>
+ </message>
<message>
<location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
<source>This will enable nice display of Qt and Standard Library objects in the Locals&Watchers view</source>
@@ -4438,8 +4448,8 @@ La ricompilazione del progetto potrebbe aiutare.</translation>
<name>DocSettingsPage</name>
<message>
<location filename="../../../src/plugins/help/docsettingspage.ui"/>
- <source>Registered Documentation:</source>
- <translation>Documentazione Registrata:</translation>
+ <source>Registered Documentation</source>
+ <translation>Documentazione Registrata</translation>
</message>
<message>
<location/>
@@ -10218,337 +10228,119 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
</message>
</context>
<context>
- <name>SimpleProEditor</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/speinfo.cpp" line="+59"/>
- <source>Debug and Release</source>
- <translation>Debug e Release</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Debug specific</source>
- <translation>Specifico del Debug</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Release specific</source>
- <translation>Specifico del Release</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>All platforms</source>
- <translation>Tutte le piattaforme</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>MS Windows specific</source>
- <translation>Specifico di MS Windows</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Linux/Unix specific</source>
- <translation>Specifico di Linux/Unix</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Mac OSX specific</source>
- <translation>Specifico di Max OSX</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Target Options</source>
- <translation>Opzioni Destinazione</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Type and name of the target.</source>
- <translation>Tipo e nome della destinazione.</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Preprocessor Definitions</source>
- <translation>Definizioni del Preprocessore</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting of the preprocessor definitions.</source>
- <translation>Impostazione delle definizioni del preprocessore.</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Include path</source>
- <translation>Percorso degli Include</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting of the pathes where the header files are located.</source>
- <translation>Impostazione dei percorsi dove si trovano i file header.</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Libraries</source>
- <translation>Librerie</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Defining the libraries to link the target against and the pathes where these are located.</source>
- <translation>Definizione delle librerie con cui linkare la destinazione a dei percorsi che le contengono.</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Source Files</source>
- <translation>File Sorgenti</translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Header Files</source>
- <translation>File Header</translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Forms</source>
- <translation>Form</translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Qt Modules</source>
- <translation>Moduli Qt</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting up which of the Qt modules will be used in the target application.</source>
- <translation>Imposta quali moduli Qt saranno usati nell'applicazione di destinazione.</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Resource files</source>
- <translation>File delle Risorse</translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Target name</source>
- <translation>Nome Destinazione</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>The name of the resulting target.</source>
- <translation>Il nome della destinazione.</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Configuration</source>
- <translation>Configurazione</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Configuration.</source>
- <translation>Configurazione.</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Destination directory</source>
- <translation>Cartella di Destinazione</translation>
- </message>
+ <name>QtModulesInfo</name>
<message>
- <location line="+3"/>
- <source>Where the resulting target will be created.</source>
- <translation>La destinazione sarà creata qui dentro.</translation>
- </message>
- <message>
- <location line="+15"/>
<source>QtCore Module</source>
<translation>Modulo QtCore</translation>
</message>
<message>
- <location line="+3"/>
<source>Core non-GUI classes used by other modules</source>
<translation>Classi di Core, non-GUI, usate dagli altri moduli</translation>
</message>
<message>
- <location line="+13"/>
<source>QtGui Module</source>
<translation>Modulo QtGui</translation>
</message>
<message>
- <location line="+3"/>
<source>Graphical user interface components</source>
<translation>Componenti dell'interfaccia grafica</translation>
</message>
<message>
- <location line="+13"/>
<source>QtNetwork Module</source>
<translation>Modulo QtNetwork</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for network programming</source>
<translation>Classi per la programmazione della rete</translation>
</message>
<message>
- <location line="+13"/>
<source>QtOpenGL Module</source>
<translation>Modulo QtOpenGL</translation>
</message>
<message>
- <location line="+3"/>
<source>OpenGL support classes</source>
<translation>Classi per il supporto OpenGL</translation>
</message>
<message>
- <location line="+13"/>
<source>QtSql Module</source>
<translation>Modulo QtSql</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for database integration using SQL</source>
<translation>Classi per l'integrazione con database SQL</translation>
</message>
<message>
- <location line="+13"/>
<source>QtScript Module</source>
<translation>Modulo QtScript</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for evaluating Qt Scripts</source>
<translation>Classi per l'esecuzione di Qt Script</translation>
</message>
<message>
- <location line="+13"/>
<source>QtSvg Module</source>
<translation>Modulo QtSvg</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for displaying the contents of SVG files</source>
<translation>Classi per la visualizzazione del contenuto di file SVG</translation>
</message>
<message>
- <location line="+13"/>
<source>QtWebKit Module</source>
<translation>Modulo QtWebKit</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for displaying and editing Web content</source>
<translation>Classi per la visualizzazione e modifica del contenuto Web</translation>
</message>
<message>
- <location line="+13"/>
<source>QtXml Module</source>
<translation>Modulo QtXml</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for handling XML</source>
<translation>Classi per la gestione di XML</translation>
</message>
<message>
- <location line="+13"/>
<source>QtXmlPatterns Module</source>
<translation>Modulo QtXmlPatterns</translation>
</message>
<message>
- <location line="+3"/>
<source>An XQuery/XPath engine for XML and custom data models</source>
<translation>Un motore XQuery/XPath per XML e modelli di dati speciali</translation>
</message>
<message>
- <location line="+13"/>
<source>Phonon Module</source>
<translation>Modulo Phonon</translation>
</message>
<message>
- <location line="+3"/>
<source>Multimedia framework classes</source>
<translation>Classi del framework multimediale</translation>
</message>
<message>
- <location line="+13"/>
<source>Qt3Support Module</source>
<translation>Modulo Qt3Support</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes that ease porting from Qt 3 to Qt 4</source>
<translation>Classi che facilitano il porting da Qt 3 a Qt 4</translation>
</message>
<message>
- <location line="+13"/>
<source>QtTest Module</source>
<translation>Modulo QtTest</translation>
</message>
<message>
- <location line="+3"/>
<source>Tool classes for unit testing</source>
<translation>Classi di ausilio per lo unit testing</translation>
</message>
<message>
- <location line="+13"/>
<source>QtDBus module</source>
<translation>Modulo QtDBus</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for Inter-Process Communication using the D-Bus</source>
<translation>Classi per la comunicazione-intra-processo usando il D-Bus</translation>
</message>
- <message>
- <location line="+15"/>
- <source>Application</source>
- <translation>Applicazione</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a standalone application</source>
- <translation>Crea un'applicazione</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Dynamic Library</source>
- <translation>Libreria Condivisa</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a dynamic library for usage in other applications</source>
- <translation>Crea una libreria condivisa per l'uso in altre applicazioni</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Static Library</source>
- <translation>Libreria Statica</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a static library for usage in other applications</source>
- <translation>Crea una libreria statica per l'uso in altre applicazioni</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Add Operator</source>
- <translation>Operatore di Aggiunta</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Remove Operator</source>
- <translation>Operatore di Rimozione</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Replace Operator</source>
- <translation>Operatore di Sostituzione</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Set Operator</source>
- <translation>Operatore di Assegnazione</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Unique Add Operator</source>
- <translation>Operatore di Aggiunta Unica</translation>
- </message>
</context>
<context>
<name>Snippets::Internal::SnippetsPlugin</name>
@@ -11749,6 +11541,11 @@ Queste codifiche dovrebbero andare bene:</translation>
<source>Prompt to submit</source>
<translation>Prompt del submit</translation>
</message>
+ <message>
+ <location/>
+ <source>Common</source>
+ <translation>Comune</translation>
+ </message>
<message>
<location/>
<source>Wrap submit message at:</source>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 856539bf09faacf19383712df2fa6fff7b945e06..54b7559898b86c7d4a011af97c589e19f4cdbe17 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -2224,6 +2224,11 @@ background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
</context>
<context>
<name>CppFileSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+51"/>
+ <source>File naming conventions</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
<source>Form</source>
@@ -3713,6 +3718,11 @@ Using gdb 6.7 or later is strongly recommended.</source>
</context>
<context>
<name>DebuggingHelperOptionPage</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-596"/>
+ <source>Debugging Helper</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
<source>Form</source>
@@ -4112,7 +4122,7 @@ Rebuilding the project might help.</source>
</message>
<message>
<location/>
- <source>Registered Documentation:</source>
+ <source>Registered Documentation</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -10000,337 +10010,119 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
</message>
</context>
<context>
- <name>SimpleProEditor</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/speinfo.cpp" line="+59"/>
- <source>Debug and Release</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Debug specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Release specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>All platforms</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>MS Windows specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Linux/Unix specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Mac OSX specific</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Target Options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Type and name of the target.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Preprocessor Definitions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting of the preprocessor definitions.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Include path</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting of the pathes where the header files are located.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Libraries</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Defining the libraries to link the target against and the pathes where these are located.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Source Files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Header Files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Forms</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Qt Modules</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Setting up which of the Qt modules will be used in the target application.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Resource files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Target name</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>QtModulesInfo</name>
<message>
- <location line="+3"/>
- <source>The name of the resulting target.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Configuration.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Destination directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Where the resulting target will be created.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+15"/>
<source>QtCore Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Core non-GUI classes used by other modules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtGui Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Graphical user interface components</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtNetwork Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for network programming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtOpenGL Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>OpenGL support classes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtSql Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for database integration using SQL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtScript Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for evaluating Qt Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtSvg Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for displaying the contents of SVG files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtWebKit Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for displaying and editing Web content</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtXml Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for handling XML</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtXmlPatterns Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>An XQuery/XPath engine for XML and custom data models</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>Phonon Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Multimedia framework classes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>Qt3Support Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes that ease porting from Qt 3 to Qt 4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtTest Module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Tool classes for unit testing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>QtDBus module</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Classes for Inter-Process Communication using the D-Bus</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+15"/>
- <source>Application</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a standalone application</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Dynamic Library</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a dynamic library for usage in other applications</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Static Library</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Create a static library for usage in other applications</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Add Operator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Remove Operator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Replace Operator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Set Operator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Unique Add Operator</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Snippets::Internal::SnippetsPlugin</name>
@@ -11505,6 +11297,11 @@ The following encodings are likely to fit:</source>
<source>Form</source>
<translation type="unfinished">フォーム</translation>
</message>
+ <message>
+ <location/>
+ <source>Common</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location/>
<source>Prompt to submit</source>
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index bb6b6bebf8fcb27ee1a160765756efb30157b251..f24b23b6e0395edbece84cb5290adf26c16f250a 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -47,6 +47,7 @@
*/
#include "pp.h"
+#include "pp-cctype.h"
#include <Lexer.h>
#include <Token.h>
@@ -702,7 +703,7 @@ bool Preprocessor::markGeneratedTokens(bool markGeneratedTokens,
++it;
for (; it != end; ++it) {
- if (! std::isspace(*it))
+ if (! pp_isspace(*it))
out(' ');
else
@@ -773,7 +774,7 @@ void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &sour
++it;
for (; it != end; ++it) {
- if (std::isspace(*it))
+ if (pp_isspace(*it))
out(*it);
else
diff --git a/src/libs/utils/parameteraction.cpp b/src/libs/utils/parameteraction.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3653d1ca8f0c46267e0c145ee7896c8453804224
--- /dev/null
+++ b/src/libs/utils/parameteraction.cpp
@@ -0,0 +1,61 @@
+#include "parameteraction.h"
+
+namespace Core {
+namespace Utils {
+
+ParameterAction::ParameterAction(const QString &emptyText,
+ const QString ¶meterText,
+ EnablingMode mode,
+ QObject* parent) :
+ QAction(emptyText, parent),
+ m_emptyText(emptyText),
+ m_parameterText(parameterText),
+ m_enablingMode(mode)
+{
+}
+
+QString ParameterAction::emptyText() const
+{
+ return m_emptyText;
+}
+
+void ParameterAction::setEmptyText(const QString &t)
+{
+ m_emptyText = t;
+}
+
+QString ParameterAction::parameterText() const
+{
+ return m_parameterText;
+}
+
+void ParameterAction::setParameterText(const QString &t)
+{
+ m_parameterText = t;
+}
+
+ParameterAction::EnablingMode ParameterAction::enablingMode() const
+{
+ return m_enablingMode;
+}
+
+void ParameterAction::setEnablingMode(EnablingMode m)
+{
+ m_enablingMode = m;
+}
+
+void ParameterAction::setParameter(const QString &p)
+{
+ const bool enabled = !p.isEmpty();
+ if (enabled) {
+ setText(m_parameterText.arg(p));
+ } else {
+ setText(m_emptyText);
+ }
+ if (m_enablingMode == EnabledWithParameter)
+ setEnabled(enabled);
+}
+
+}
+}
+
diff --git a/src/libs/utils/parameteraction.h b/src/libs/utils/parameteraction.h
new file mode 100644
index 0000000000000000000000000000000000000000..d503afb81c65e7fb419b43873c151b746d599dd4
--- /dev/null
+++ b/src/libs/utils/parameteraction.h
@@ -0,0 +1,85 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+
+#ifndef PARAMETERACTION_H
+#define PARAMETERACTION_H
+
+#include "utils_global.h"
+
+#include <QtGui/QAction>
+
+namespace Core {
+namespace Utils {
+
+/* ParameterAction: Intended for actions that act on a 'current',
+ * string-type parameter (typically file name) and have 2 states:
+ * 1) <no current parameter> displaying "Do XX" (empty text)
+ * 2) <parameter present> displaying "Do XX with %1".
+ * Provides a slot to set the parameter, changing display
+ * and enabled state accordingly.
+ * The text passed in should already be translated; parameterText
+ * should contain a %1 where the parameter is to be inserted. */
+
+class QTCREATOR_UTILS_EXPORT ParameterAction : public QAction
+{
+ Q_ENUMS(EnablingMode)
+ Q_PROPERTY(QString emptyText READ emptyText WRITE setEmptyText)
+ Q_PROPERTY(QString parameterText READ parameterText WRITE setParameterText)
+ Q_PROPERTY(EnablingMode enablingMode READ enablingMode WRITE setEnablingMode)
+ Q_OBJECT
+public:
+ enum EnablingMode { AlwaysEnabled, EnabledWithParameter };
+
+ explicit ParameterAction(const QString &emptyText,
+ const QString ¶meterText,
+ EnablingMode em = AlwaysEnabled,
+ QObject* parent = 0);
+
+ QString emptyText() const;
+ void setEmptyText(const QString &);
+
+ QString parameterText() const;
+ void setParameterText(const QString &);
+
+ EnablingMode enablingMode() const;
+ void setEnablingMode(EnablingMode m);
+
+public slots:
+ void setParameter(const QString &);
+
+private:
+ QString m_emptyText;
+ QString m_parameterText;
+ EnablingMode m_enablingMode;
+};
+
+}
+}
+
+#endif // PARAMETERACTION_H
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index ce56977b6de6b9c708572e57d052c132928c41bc..c1085aac370e457fe81e1b0f908507c1dab9dce2 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -29,7 +29,8 @@ SOURCES += \
synchronousprocess.cpp \
submitfieldwidget.cpp \
consoleprocess.cpp \
- uncommentselection.cpp
+ uncommentselection.cpp \
+ parameteraction.cpp
win32 {
SOURCES += abstractprocess_win.cpp \
@@ -66,7 +67,8 @@ HEADERS += \
consoleprocess.h \
synchronousprocess.h \
submitfieldwidget.h \
- uncommentselection.h
+ uncommentselection.h \
+ parameteraction.h
FORMS += filewizardpage.ui \
projectintropage.ui \
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index d7f83d547aa41aa11e5c714d24839eee00cb1cab..558cedbff365d07a60237ff065f7d14caff1ee8f 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -163,7 +163,7 @@ WelcomeMode::WelcomeMode() :
m_d->ui.sitesTreeWidget->addItem(tr("Qt Labs"), QLatin1String("http://labs.qtsoftware.com"));
m_d->ui.sitesTreeWidget->addItem(tr("Qt Git Hosting"), QLatin1String("http://qt.gitorious.org"));
m_d->ui.sitesTreeWidget->addItem(tr("Qt Centre"), QLatin1String("http://www.qtcentre.org"));
- m_d->ui.sitesTreeWidget->addItem(tr("Qt/S60 at Forum Nokia"), QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196"));
+ m_d->ui.sitesTreeWidget->addItem(tr("Qt for S60 at Forum Nokia"), QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196"));
m_d->ui.tutorialTreeWidget->addItem(tr("Qt Creator - A quick tour"),
QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));
@@ -314,13 +314,15 @@ void WelcomeMode::slotFeedback()
void WelcomeMode::slotNextTip()
{
QStringList tips = tipsOfTheDay();
- m_d->ui.didYouKnowTextBrowser->setText(tips.at((++m_d->currentTip)%tips.count()));
+ m_d->currentTip = ((m_d->currentTip+1)%tips.count());
+ m_d->ui.didYouKnowTextBrowser->setText(tips.at(m_d->currentTip));
}
void WelcomeMode::slotPrevTip()
{
QStringList tips = tipsOfTheDay();
- m_d->ui.didYouKnowTextBrowser->setText(tips.at((--m_d->currentTip)%tips.count()));
+ m_d->currentTip = ((m_d->currentTip-1)+tips.count())%tips.count();
+ m_d->ui.didYouKnowTextBrowser->setText(tips.at(m_d->currentTip));
}
QStringList WelcomeMode::tipsOfTheDay()
diff --git a/src/plugins/cpaster/settingspage.ui b/src/plugins/cpaster/settingspage.ui
index dc0708205c5754a91e9e1f4b39ffc41cb79b925e..0ad3e9613b2404916eef49f65ed218bc7d842ff3 100644
--- a/src/plugins/cpaster/settingspage.ui
+++ b/src/plugins/cpaster/settingspage.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>CodePaster::SettingsPage</class>
- <widget class="QWidget" name="CodePaster::SettingsPage">
- <property name="geometry">
+ <widget class="QWidget" name="CodePaster::SettingsPage" >
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
@@ -10,73 +10,62 @@
<height>258</height>
</rect>
</property>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>CodePaster Server:</string>
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <item>
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="serverEdit"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Username:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="userEdit"/>
- </item>
- <item row="2" column="0">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="1">
- <widget class="QCheckBox" name="clipboardBox">
- <property name="text">
- <string>Copy Paste URL to clipboard</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="1">
- <widget class="QCheckBox" name="displayBox">
- <property name="text">
- <string>Display Output Pane after sending a post</string>
+ <property name="title" >
+ <string>General</string>
</property>
+ <layout class="QFormLayout" name="formLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>CodePaster Server:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLineEdit" name="serverEdit" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Username:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="userEdit" />
+ </item>
+ <item row="2" column="1" >
+ <widget class="QCheckBox" name="clipboardBox" >
+ <property name="text" >
+ <string>Copy Paste URL to clipboard</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QCheckBox" name="displayBox" >
+ <property name="text" >
+ <string>Display Output Pane after sending a post</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="4" column="0" colspan="2">
- <spacer name="verticalSpacer">
- <property name="orientation">
+ <item>
+ <spacer name="verticalSpacer" >
+ <property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="sizeHint" stdset="0" >
<size>
<width>223</width>
<height>100</height>
diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui
index f4cf62506f042896cb45084ad9a6dd66a787d09e..61bf7880f0c0118609391c22b2c5e232554eca1e 100644
--- a/src/plugins/cpptools/cppfilesettingspage.ui
+++ b/src/plugins/cpptools/cppfilesettingspage.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>CppFileSettingsPage</class>
- <widget class="QWidget" name="CppFileSettingsPage">
- <property name="geometry">
+ <widget class="QWidget" name="CppFileSettingsPage" >
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
@@ -10,70 +10,58 @@
<height>503</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout" >
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="headerSuffixLabel">
- <property name="text">
- <string>Header suffix:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="headerSuffixComboBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="lowerCaseFileNamesLabel">
- <property name="toolTip">
- <string>This determines how the file names of the class wizards are generated ("MyClass.h" versus "myclass.h").</string>
- </property>
- <property name="text">
- <string>Lower case file names:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QCheckBox" name="lowerCaseFileNamesCheckBox"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="sourceSuffixLabel">
- <property name="text">
- <string>Source suffix:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="sourceSuffixComboBox"/>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title" >
+ <string>File naming conventions</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout" >
+ <property name="fieldGrowthPolicy" >
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="headerSuffixLabel" >
+ <property name="text" >
+ <string>Header suffix:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QComboBox" name="headerSuffixComboBox" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="sourceSuffixLabel" >
+ <property name="text" >
+ <string>Source suffix:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QComboBox" name="sourceSuffixComboBox" />
+ </item>
+ <item row="2" column="1" >
+ <widget class="QCheckBox" name="lowerCaseFileNamesCheckBox" >
+ <property name="text" >
+ <string>Lower case file names</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
<item>
- <spacer name="verticalSpacer">
- <property name="orientation">
+ <spacer name="verticalSpacer" >
+ <property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>430</height>
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 303884b0fa40bd39599915ae020434a47287806f..796208eca9a5d57f8115e185bd7afcb3ef8afd99 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -430,6 +430,14 @@ void DebuggerManager::init()
m_threadsDock = createDockForWidget(m_threadsWindow);
+ QSplitter *localsAndWatchers = new QSplitter(Qt::Vertical, 0);
+ localsAndWatchers->setWindowTitle(m_localsWindow->windowTitle());
+ localsAndWatchers->addWidget(m_localsWindow);
+ localsAndWatchers->addWidget(m_watchersWindow);
+ localsAndWatchers->setStretchFactor(0, 3);
+ localsAndWatchers->setStretchFactor(1, 1);
+ m_watchDock = createDockForWidget(localsAndWatchers);
+
setStatus(DebuggerProcessNotReady);
}
@@ -457,17 +465,6 @@ IDebuggerManagerAccessForEngines *DebuggerManager::engineInterface()
return dynamic_cast<IDebuggerManagerAccessForEngines *>(this);
}
-void DebuggerManager::createDockWidgets()
-{
- QSplitter *localsAndWatchers = new QSplitter(Qt::Vertical, 0);
- localsAndWatchers->setWindowTitle(m_localsWindow->windowTitle());
- localsAndWatchers->addWidget(m_localsWindow);
- localsAndWatchers->addWidget(m_watchersWindow);
- localsAndWatchers->setStretchFactor(0, 3);
- localsAndWatchers->setStretchFactor(1, 1);
- m_watchDock = createDockForWidget(localsAndWatchers);
-}
-
void DebuggerManager::createNewDock(QWidget *widget)
{
QDockWidget *dockWidget = new QDockWidget(widget->windowTitle(), m_mainWindow);
@@ -482,12 +479,13 @@ QDockWidget *DebuggerManager::createDockForWidget(QWidget *widget)
{
QDockWidget *dockWidget = new QDockWidget(widget->windowTitle(), m_mainWindow);
dockWidget->setObjectName(widget->windowTitle());
- dockWidget->setFeatures(QDockWidget::DockWidgetClosable);
+ dockWidget->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable);
dockWidget->setTitleBarWidget(new QWidget(dockWidget));
dockWidget->setWidget(widget);
- connect(dockWidget->toggleViewAction(), SIGNAL(toggled(bool)),
- this, SLOT(dockToggled(bool)), Qt::QueuedConnection);
+ connect(dockWidget->toggleViewAction(), SIGNAL(triggered()),
+ this, SLOT(dockActionTriggered()), Qt::QueuedConnection);
m_dockWidgets.append(dockWidget);
+ m_dockWidgetActiveState.append(false);
return dockWidget;
}
@@ -518,11 +516,30 @@ void DebuggerManager::setSimpleDockWidgetArrangement()
m_outputDock->hide();
}
+void DebuggerManager::updateDockWidgetActiveStates()
+{
+ for (int i = 0; i < m_dockWidgets.size(); ++i) {
+ m_dockWidgetActiveState[i] = m_dockWidgets.at(i)->isVisible();
+ }
+}
+
+void DebuggerManager::setFloatingDockWidgetsVisible(bool visible)
+{
+ for (int i = 0; i < m_dockWidgets.size(); ++i) {
+ QDockWidget *dockWidget = m_dockWidgets.at(i);
+ if (dockWidget->isFloating() && m_dockWidgetActiveState.at(i)) {
+ dockWidget->setVisible(visible);
+ }
+ }
+ if (visible)
+ updateDockWidgetActiveStates(); // we can't do that earlier, because the dock widgets are not visible at startup
+}
+
void DebuggerManager::setLocked(bool locked)
{
const QDockWidget::DockWidgetFeatures features =
- (locked) ? QDockWidget::DockWidgetClosable :
- QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable;
+ (locked) ? QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable :
+ QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable;
foreach (QDockWidget *dockWidget, m_dockWidgets) {
QWidget *titleBarWidget = dockWidget->titleBarWidget();
@@ -537,11 +554,16 @@ void DebuggerManager::setLocked(bool locked)
}
}
-void DebuggerManager::dockToggled(bool on)
+void DebuggerManager::dockActionTriggered()
{
QDockWidget *dw = qobject_cast<QDockWidget *>(sender()->parent());
- if (on && dw)
- dw->raise();
+ if (dw) {
+ if (dw->isVisible())
+ dw->raise();
+ int index = m_dockWidgets.indexOf(dw);
+ if (index >= 0)
+ m_dockWidgetActiveState[index] = dw->isVisible();
+ }
}
QAbstractItemModel *DebuggerManager::threadsModel()
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index 3db8271a246fffa44b70d27d9d585efe99b2b5bd..22cd9e3c8bb7fa039b347024b014d0666cd6da19 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -217,7 +217,9 @@ public slots:
void setSimpleDockWidgetArrangement();
void setLocked(bool locked);
- void dockToggled(bool on);
+ void setFloatingDockWidgetsVisible(bool visible);
+ void updateDockWidgetActiveStates();
+ void dockActionTriggered();
void setBusyCursor(bool on);
void queryCurrentTextEditor(QString *fileName, int *lineNumber, QObject **ed);
@@ -316,7 +318,6 @@ private:
//
QWidget *threadsWindow() const { return m_threadsWindow; }
QList<QDockWidget*> dockWidgets() const { return m_dockWidgets; }
- void createDockWidgets();
virtual bool qtDumperLibraryEnabled() const;
virtual QString qtDumperLibraryName() const;
@@ -400,6 +401,7 @@ private:
QDockWidget *m_threadsDock;
QDockWidget *m_watchDock;
QList<QDockWidget*> m_dockWidgets;
+ QList<bool> m_dockWidgetActiveState;
BreakHandler *m_breakHandler;
DisassemblerHandler *m_disassemblerHandler;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f7081d8997010cbc1c9f0a90085041c0afa6ee26..2d853d73270c02a3029385dbeced4d010a4cc8e4 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -173,10 +173,6 @@ class DebugMode : public Core::BaseMode
public:
DebugMode(QObject *parent = 0);
~DebugMode();
-
- // IMode
- void activated() {}
- void shutdown() {}
};
DebugMode::DebugMode(QObject *parent)
@@ -409,8 +405,6 @@ DebuggerPlugin::~DebuggerPlugin()
void DebuggerPlugin::shutdown()
{
- if (m_debugMode)
- m_debugMode->shutdown(); // saves state including manager information
QTC_ASSERT(m_manager, /**/);
if (m_manager)
m_manager->shutdown();
@@ -758,12 +752,11 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
toolBarAddingLayout->addWidget(rightPaneSplitter);
toolBarAddingLayout->addWidget(debugToolBar);
- m_manager->createDockWidgets();
m_manager->setSimpleDockWidgetArrangement();
readSettings();
connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
- this, SLOT(focusCurrentEditor(Core::IMode*)));
+ this, SLOT(onModeChanged(Core::IMode*)));
m_debugMode->widget()->setFocusProxy(EditorManager::instance());
addObject(m_debugMode);
@@ -1047,10 +1040,13 @@ void DebuggerPlugin::readSettings()
m_manager->mainWindow()->restoreState(ba);
}
-void DebuggerPlugin::focusCurrentEditor(IMode *mode)
+void DebuggerPlugin::onModeChanged(IMode *mode)
{
- if (mode != m_debugMode)
+ if (mode != m_debugMode) {
+ m_manager->setFloatingDockWidgetsVisible(false);
return;
+ }
+ m_manager->setFloatingDockWidgetsVisible(true);
EditorManager *editorManager = EditorManager::instance();
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 116454ba291d4f80b7699050bbf630752c566029..c022e3a0ab81a133680cf85f4295626b5025f1b7 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -96,7 +96,7 @@ private slots:
void breakpointSetRemoveMarginActionTriggered();
void breakpointEnableDisableMarginActionTriggered();
- void focusCurrentEditor(Core::IMode *mode);
+ void onModeChanged(Core::IMode *mode);
void showSettingsDialog();
void startExternalApplication();
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index fc4933b1d6c9fc87e1e21f8d728b12021b57f1b1..d85f98c370766d46d7ae2784c311c4458b460f4b 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -10,85 +10,98 @@
<height>434</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QCheckBox" name="checkBoxUseDebuggingHelpers">
- <property name="toolTip">
- <string>This will enable nice display of Qt and Standard Library objects in the Locals&Watchers view</string>
- </property>
- <property name="text">
- <string>Use debugging helper</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBoxUseCustomDebuggingHelperLocation">
- <property name="toolTip">
- <string>This will load a dumper library</string>
- </property>
- <property name="text">
- <string>Use debugging helper from custom location</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="dumperLocationLabel">
- <property name="text">
- <string>Location: </string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="Core::Utils::PathChooser" name="dumperLocationChooser" native="true"/>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBoxDebugDebuggingHelpers">
- <property name="toolTip">
- <string notr="true">This is an internal tool to make debugging the debugging helper code easier. Using this action is in general not needed unless you want do debug Qt Creator itself.</string>
- </property>
- <property name="text">
- <string>Debug debugging helper</string>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Debugging helper</string>
</property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QCheckBox" name="checkBoxUseDebuggingHelpers">
+ <property name="toolTip">
+ <string>This will enable nice display of Qt and Standard Library objects in the Locals&Watchers view</string>
+ </property>
+ <property name="text">
+ <string>Use debugging helper</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>10</width>
+ <height>10</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBoxUseCustomDebuggingHelperLocation">
+ <property name="toolTip">
+ <string>This will load a dumper library</string>
+ </property>
+ <property name="text">
+ <string>Use debugging helper from custom location</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="dumperLocationLabel">
+ <property name="text">
+ <string>Location: </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Core::Utils::PathChooser" name="dumperLocationChooser" native="true"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBoxDebugDebuggingHelpers">
+ <property name="toolTip">
+ <string notr="true">This is an internal tool to make debugging the debugging helper code easier. Using this action is in general not needed unless you want do debug Qt Creator itself.</string>
+ </property>
+ <property name="text">
+ <string>Debug debugging helper</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ <zorder></zorder>
+ <zorder>checkBoxDebugDebuggingHelpers</zorder>
+ <zorder>checkBoxUseDebuggingHelpers</zorder>
+ <zorder></zorder>
</widget>
</item>
<item>
@@ -105,8 +118,6 @@
</spacer>
</item>
</layout>
- <zorder>checkBoxDebugDebuggingHelpers</zorder>
- <zorder>checkBoxUseDebuggingHelpers</zorder>
</widget>
<customwidgets>
<customwidget>
diff --git a/src/plugins/duieditor/duieditor.cpp b/src/plugins/duieditor/duieditor.cpp
index f4b09dcee8c9cc3e1e322f78fff793a3b3fe99ee..f6110625ddbe216b8270f93f4e0d2f77a5fa75be 100644
--- a/src/plugins/duieditor/duieditor.cpp
+++ b/src/plugins/duieditor/duieditor.cpp
@@ -85,15 +85,15 @@ protected:
using Visitor::visit;
using Visitor::endVisit;
- virtual bool visit(AST::UiPublicMember *node)
+ void addWords(AST::UiQualifiedId *id)
{
- if (node->name)
- _words.insert(node->name->asString());
-
- return true;
+ for (; id; id = id->next) {
+ if (id->name)
+ _words.insert(id->name->asString());
+ }
}
- virtual bool visit(AST::UiObjectDefinition *node)
+ virtual bool visit(AST::UiPublicMember *node)
{
if (node->name)
_words.insert(node->name->asString());
@@ -109,14 +109,6 @@ protected:
return true;
}
- virtual bool visit(AST::UiObjectBinding *node)
- {
- if (node->name)
- _words.insert(node->name->asString());
-
- return true;
- }
-
virtual bool visit(AST::IdentifierExpression *node)
{
if (node->name)
@@ -302,8 +294,8 @@ protected:
init(&decl, node);
decl.text.fill(QLatin1Char(' '), _depth);
- if (node->name)
- decl.text.append(node->name->asString());
+ if (node->qualifiedObjectNameId)
+ decl.text.append(asString(node->qualifiedObjectNameId));
else
decl.text.append(QLatin1Char('?'));
@@ -329,8 +321,8 @@ protected:
decl.text.append(asString(node->qualifiedId));
decl.text.append(QLatin1String(": "));
- if (node->name)
- decl.text.append(node->name->asString());
+ if (node->qualifiedObjectNameId)
+ decl.text.append(asString(node->qualifiedObjectNameId));
else
decl.text.append(QLatin1Char('?'));
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 204453936de1233e5710da539cc6fb1a1ceaeb03..702f2aa770c859419718aeebec03eb9441fda198 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -47,6 +47,7 @@
#include <coreplugin/editormanager/editormanager.h>
#include <utils/qtcassert.h>
+#include <utils/parameteraction.h>
#include <vcsbase/basevcseditorfactory.h>
#include <vcsbase/vcsbaseeditor.h>
@@ -275,7 +276,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
Core::Command *command;
- m_diffAction = new QAction(tr("Diff Current File"), this);
+ m_diffAction = new Core::Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_diffAction, "Git.Diff", globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
#ifndef Q_OS_MAC
@@ -284,7 +285,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
connect(m_diffAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
gitContainer->addAction(command);
- m_statusAction = new QAction(tr("File Status"), this);
+ m_statusAction = new Core::Utils::ParameterAction(tr("File Status"), tr("Status Related to \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_statusAction, "Git.Status", globalcontext);
#ifndef Q_OS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+S")));
@@ -293,7 +294,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
connect(m_statusAction, SIGNAL(triggered()), this, SLOT(statusFile()));
gitContainer->addAction(command);
- m_logAction = new QAction(tr("Log File"), this);
+ m_logAction = new Core::Utils::ParameterAction(tr("Log File"), tr("Log of \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_logAction, "Git.Log", globalcontext);
#ifndef Q_OS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
@@ -302,7 +303,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
connect(m_logAction, SIGNAL(triggered()), this, SLOT(logFile()));
gitContainer->addAction(command);
- m_blameAction = new QAction(tr("Blame"), this);
+ m_blameAction = new Core::Utils::ParameterAction(tr("Blame"), tr("Blame for \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_blameAction, "Git.Blame", globalcontext);
#ifndef Q_OS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+B")));
@@ -311,7 +312,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
connect(m_blameAction, SIGNAL(triggered()), this, SLOT(blameFile()));
gitContainer->addAction(command);
- m_undoFileAction = new QAction(tr("Undo Changes"), this);
+ m_undoFileAction = new Core::Utils::ParameterAction(tr("Undo Changes"), tr("Undo Changes for \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_undoFileAction, "Git.Undo", globalcontext);
#ifndef Q_OS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
@@ -320,7 +321,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
connect(m_undoFileAction, SIGNAL(triggered()), this, SLOT(undoFileChanges()));
gitContainer->addAction(command);
- m_stageAction = new QAction(tr("Stage File for Commit"), this);
+ m_stageAction = new Core::Utils::ParameterAction(tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_stageAction, "Git.Stage", globalcontext);
#ifndef Q_OS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+A")));
@@ -329,13 +330,13 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
connect(m_stageAction, SIGNAL(triggered()), this, SLOT(stageFile()));
gitContainer->addAction(command);
- m_unstageAction = new QAction(tr("Unstage File from Commit"), this);
+ m_unstageAction = new Core::Utils::ParameterAction(tr("Unstage File from Commit"), tr("Unstage \"%1\" from Commit"), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_unstageAction, "Git.Unstage", globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_unstageAction, SIGNAL(triggered()), this, SLOT(unstageFile()));
gitContainer->addAction(command);
- m_revertAction = new QAction(tr("Revert..."), this);
+ m_revertAction = new Core::Utils::ParameterAction(tr("Revert..."), tr("Revert \"%1\"..."), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_revertAction, "Git.Revert", globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_revertAction, SIGNAL(triggered()), this, SLOT(revertFile()));
@@ -343,7 +344,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Project"), this));
- m_diffProjectAction = new QAction(tr("Diff Current Project"), this);
+ m_diffProjectAction = new Core::Utils::ParameterAction(tr("Diff Current Project"), tr("Diff Project \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_diffProjectAction, "Git.DiffProject", globalcontext);
#ifndef Q_OS_MAC
command->setDefaultKeySequence(QKeySequence("Alt+G,Alt+Shift+D"));
@@ -352,13 +353,13 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffCurrentProject()));
gitContainer->addAction(command);
- m_statusProjectAction = new QAction(tr("Project Status"), this);
+ m_statusProjectAction = new Core::Utils::ParameterAction(tr("Project Status"), tr("Status Project \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_statusProjectAction, "Git.StatusProject", globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_statusProjectAction, SIGNAL(triggered()), this, SLOT(statusProject()));
gitContainer->addAction(command);
- m_logProjectAction = new QAction(tr("Log Project"), this);
+ m_logProjectAction = new Core::Utils::ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
command = actionManager->registerAction(m_logProjectAction, "Git.LogProject", globalcontext);
#ifndef Q_OS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+K")));
@@ -785,15 +786,14 @@ void GitPlugin::updateActions()
const QString repository = m_gitClient->findRepositoryForFile(current.absoluteFilePath());
// First check for file commands and if the current file is inside
// a Git-repository
- const QString file = fileName.isEmpty() ? tr("File") : "\"" + fileName + '"';
- m_diffAction->setText(tr("Diff %1").arg(file));
- m_statusAction->setText(tr("Status Related to %1").arg(file));
- m_logAction->setText(tr("Log of %1").arg(file));
- m_blameAction->setText(tr("Blame for %1").arg(file));
- m_undoFileAction->setText(tr("Undo Changes for %1").arg(file));
- m_stageAction->setText(tr("Stage %1 for Commit").arg(file));
- m_unstageAction->setText(tr("Unstage %1 from Commit").arg(file));
- m_revertAction->setText(tr("Revert %1...").arg(file));
+ m_diffAction->setParameter(fileName);
+ m_statusAction->setParameter(fileName);
+ m_logAction->setParameter(fileName);
+ m_blameAction->setParameter(fileName);
+ m_undoFileAction->setParameter(fileName);
+ m_stageAction->setParameter(fileName);
+ m_unstageAction->setParameter(fileName);
+ m_revertAction->setParameter(fileName);
bool enabled = !fileName.isEmpty() && !repository.isEmpty();
m_diffAction->setEnabled(enabled);
@@ -809,10 +809,10 @@ void GitPlugin::updateActions()
// If the file is not in a repository, the corresponding project will
// be neither and we can disable everything and return
m_diffProjectAction->setEnabled(false);
- m_diffProjectAction->setText(tr("Diff Project"));
- m_statusProjectAction->setText(tr("Status Project"));
+ m_diffProjectAction->setParameter(repository);
+ m_statusProjectAction->setParameter(repository);
m_statusProjectAction->setEnabled(false);
- m_logProjectAction->setText(tr("Log Project"));
+ m_logProjectAction->setParameter(repository);
m_logProjectAction->setEnabled(false);
return;
}
@@ -822,18 +822,18 @@ void GitPlugin::updateActions()
using namespace ProjectExplorer;
QString project;
if (m_projectExplorer) {
- if (Node *node = m_projectExplorer->currentNode())
- if (Node *projectNode = node->projectNode())
- project = '"' + QFileInfo(projectNode->path()).completeBaseName() + '"';
+ if (const Node *node = m_projectExplorer->currentNode())
+ if (const Node *projectNode = node->projectNode())
+ project = QFileInfo(projectNode->path()).completeBaseName();
}
enabled = !project.isEmpty();
m_diffProjectAction->setEnabled(enabled);
- m_diffProjectAction->setText(tr("Diff Project %1").arg(project));
+ m_diffProjectAction->setParameter(project);
m_statusProjectAction->setEnabled(enabled);
- m_statusProjectAction->setText(tr("Status Project %1").arg(project));
+ m_statusProjectAction->setParameter(project);
m_logProjectAction->setEnabled(enabled);
- m_logProjectAction->setText(tr("Log Project %1").arg(project));
+ m_logProjectAction->setParameter(project);
}
void GitPlugin::showCommit()
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 8f7f0bfeeddab0b62e234b1361cd07bf63484510..da5af49bb7412ab365cbc7690951b90bd512a76f 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -52,6 +52,9 @@ namespace Core {
class IEditorFactory;
class ICore;
class IVersionControl;
+namespace Utils {
+class ParameterAction;
+}
} // namespace Core
namespace Git {
@@ -133,19 +136,19 @@ private:
static GitPlugin *m_instance;
Core::ICore *m_core;
- QAction *m_diffAction;
- QAction *m_diffProjectAction;
- QAction *m_statusAction;
- QAction *m_statusProjectAction;
- QAction *m_logAction;
- QAction *m_blameAction;
- QAction *m_logProjectAction;
- QAction *m_undoFileAction;
+ Core::Utils::ParameterAction *m_diffAction;
+ Core::Utils::ParameterAction *m_diffProjectAction;
+ Core::Utils::ParameterAction *m_statusAction;
+ Core::Utils::ParameterAction *m_statusProjectAction;
+ Core::Utils::ParameterAction *m_logAction;
+ Core::Utils::ParameterAction *m_blameAction;
+ Core::Utils::ParameterAction *m_logProjectAction;
+ Core::Utils::ParameterAction *m_undoFileAction;
QAction *m_undoProjectAction;
QAction *m_showAction;
- QAction *m_stageAction;
- QAction *m_unstageAction;
- QAction *m_revertAction;
+ Core::Utils::ParameterAction *m_stageAction;
+ Core::Utils::ParameterAction *m_unstageAction;
+ Core::Utils::ParameterAction *m_revertAction;
QAction *m_commitAction;
QAction *m_pullAction;
QAction *m_pushAction;
diff --git a/src/plugins/help/docsettingspage.ui b/src/plugins/help/docsettingspage.ui
index 93c1124bf7d0756231394ceebb0c9bad8c9bd3ac..d67e66fc638ff7cdea1a6d232fe322292387b98f 100644
--- a/src/plugins/help/docsettingspage.ui
+++ b/src/plugins/help/docsettingspage.ui
@@ -11,61 +11,53 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<item>
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Registered Documentation:</string>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Registered Documentation</string>
</property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="_3" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="margin" >
- <number>0</number>
- </property>
- <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
<widget class="QListWidget" name="docsListWidget" />
- </item>
- <item>
+ </item>
+ <item>
<layout class="QVBoxLayout" name="_4" >
<property name="spacing" >
- <number>6</number>
- </property>
+ <number>6</number>
+ </property>
<property name="margin" >
- <number>0</number>
- </property>
- <item>
+ <number>0</number>
+ </property>
+ <item>
<widget class="QPushButton" name="addButton" >
<property name="text" >
- <string>Add...</string>
- </property>
- </widget>
- </item>
- <item>
+ <string>Add...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QPushButton" name="removeButton" >
<property name="text" >
- <string>Remove</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
+ <string>Remove</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
<property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
+ <enum>Qt::Vertical</enum>
+ </property>
<property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
</item>
</layout>
</widget>
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 1cb25746d2a1e57068e311a4c8be544fc2417d6b..4c4c3190755c10d6015ea34f6021c7745529037a 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -48,6 +48,7 @@
#include <coreplugin/uniqueidmanager.h>
#include <utils/qtcassert.h>
#include <utils/synchronousprocess.h>
+#include <utils/parameteraction.h>
#include <vcsbase/basevcseditorfactory.h>
#include <vcsbase/basevcssubmiteditorfactory.h>
#include <vcsbase/vcsbaseeditor.h>
@@ -263,7 +264,7 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
Core::Command *command;
QAction *tmpaction;
- m_editAction = new QAction(tr("Edit"), this);
+ m_editAction = new Core::Utils::ParameterAction(tr("Edit"), tr("Edit \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = am->registerAction(m_editAction, PerforcePlugin::EDIT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+E")));
@@ -271,7 +272,7 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
connect(m_editAction, SIGNAL(triggered()), this, SLOT(openCurrentFile()));
mperforce->addAction(command);
- m_addAction = new QAction(tr("Add"), this);
+ m_addAction = new Core::Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = am->registerAction(m_addAction, PerforcePlugin::ADD, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+A")));
@@ -279,14 +280,14 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
mperforce->addAction(command);
- m_deleteAction = new QAction(tr("Delete"), this);
+ m_deleteAction = new Core::Utils::ParameterAction(tr("Delete"), tr("Delete \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = am->registerAction(m_deleteAction, PerforcePlugin::DELETE_FILE, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultText(tr("Delete File"));
connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(deleteCurrentFile()));
mperforce->addAction(command);
- m_revertAction = new QAction(tr("Revert"), this);
+ m_revertAction = new Core::Utils::ParameterAction(tr("Revert"), tr("Revert \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = am->registerAction(m_revertAction, PerforcePlugin::REVERT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+R")));
@@ -299,14 +300,14 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
command = am->registerAction(tmpaction, QLatin1String("Perforce.Sep.Edit"), globalcontext);
mperforce->addAction(command);
- m_diffCurrentAction = new QAction(tr("Diff Current File"), this);
+ m_diffCurrentAction = new Core::Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = am->registerAction(m_diffCurrentAction, PerforcePlugin::DIFF_CURRENT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultText(tr("Diff Current File"));
connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
mperforce->addAction(command);
- m_diffProjectAction = new QAction(tr("Diff Current Project/Session"), this);
+ m_diffProjectAction = new Core::Utils::ParameterAction(tr("Diff Current Project/Session"), tr("Diff Project \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = am->registerAction(m_diffProjectAction, PerforcePlugin::DIFF_PROJECT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+D")));
@@ -351,7 +352,7 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
connect(m_describeAction, SIGNAL(triggered()), this, SLOT(describeChange()));
mperforce->addAction(command);
- m_annotateCurrentAction = new QAction(tr("Annotate Current File"), this);
+ m_annotateCurrentAction = new Core::Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = am->registerAction(m_annotateCurrentAction, PerforcePlugin::ANNOTATE_CURRENT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultText(tr("Annotate Current File"));
@@ -363,7 +364,7 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
connect(m_annotateAction, SIGNAL(triggered()), this, SLOT(annotate()));
mperforce->addAction(command);
- m_filelogCurrentAction = new QAction(tr("Filelog Current File"), this);
+ m_filelogCurrentAction = new Core::Utils::ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = am->registerAction(m_filelogCurrentAction, PerforcePlugin::FILELOG_CURRENT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+F")));
@@ -628,40 +629,22 @@ void PerforcePlugin::filelog(const QString &fileName)
void PerforcePlugin::updateActions()
{
- QString fileName = currentFileName();
- QString baseName = QFileInfo(fileName).fileName();
- const bool hasFile = !currentFileName().isEmpty();
- m_editAction->setEnabled(hasFile);
- m_addAction->setEnabled(hasFile);
- m_deleteAction->setEnabled(hasFile);
- m_revertAction->setEnabled(hasFile);
- m_diffCurrentAction->setEnabled(hasFile);
- m_annotateCurrentAction->setEnabled(hasFile);
- m_filelogCurrentAction->setEnabled(hasFile);
- if (hasFile) {
- m_editAction->setText(tr("Edit %1").arg(baseName));
- m_addAction->setText(tr("Add %1").arg(baseName));
- m_deleteAction->setText(tr("Delete %1").arg(baseName));
- m_revertAction->setText(tr("Revert %1").arg(baseName));
- m_diffCurrentAction->setText(tr("Diff %1").arg(baseName));
- m_annotateCurrentAction->setText(tr("Annotate %1").arg(baseName));
- m_filelogCurrentAction->setText(tr("Filelog %1").arg(baseName));
- } else {
- m_editAction->setText(tr("Edit"));
- m_addAction->setText(tr("Add"));
- m_deleteAction->setText(tr("Delete"));
- m_revertAction->setText(tr("Revert"));
- m_diffCurrentAction->setText(tr("Diff"));
- m_annotateCurrentAction->setText(tr("Annotate Current File"));
- m_filelogCurrentAction->setText(tr("Filelog Current File"));
- }
+ const QString fileName = currentFileName();
+ const QString baseName = fileName.isEmpty() ? fileName : QFileInfo(fileName).fileName();
+
+ m_editAction->setParameter(baseName);
+ m_addAction->setParameter(baseName);
+ m_deleteAction->setParameter(baseName);
+ m_revertAction->setParameter(baseName);
+ m_diffCurrentAction->setParameter(baseName);
+ m_annotateCurrentAction->setParameter(baseName);
+ m_filelogCurrentAction->setParameter(baseName);
+
if (m_projectExplorer && m_projectExplorer->currentProject()) {
- m_diffProjectAction->setEnabled(true);
- m_diffProjectAction->setText(tr("Diff Project %1").arg(m_projectExplorer->currentProject()->name()));
+ m_diffProjectAction->setParameter(m_projectExplorer->currentProject()->name());
m_submitAction->setEnabled(true);
} else {
- m_diffProjectAction->setEnabled(false);
- m_diffProjectAction->setText(tr("Diff Current Project/Solution"));
+ m_diffProjectAction->setParameter(QString());
m_submitAction->setEnabled(false);
}
m_diffAllAction->setEnabled(true);
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 733b514dd2349185744cde9324a366d10fbf9364..042736a2dd876edd09c491bebb6bb86d395ed313 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -51,6 +51,9 @@ QT_END_NAMESPACE
namespace Core {
class IEditorFactory;
+ namespace Utils {
+ class ParameterAction;
+ }
}
namespace Perforce {
@@ -170,21 +173,21 @@ private:
SettingsPage *m_settingsPage;
QList<Core::IEditorFactory*> m_editorFactories;
- QAction *m_editAction;
- QAction *m_addAction;
- QAction *m_deleteAction;
+ Core::Utils::ParameterAction *m_editAction;
+ Core::Utils::ParameterAction *m_addAction;
+ Core::Utils::ParameterAction *m_deleteAction;
QAction *m_openedAction;
- QAction *m_revertAction;
- QAction *m_diffCurrentAction;
- QAction *m_diffProjectAction;
+ Core::Utils::ParameterAction *m_revertAction;
+ Core::Utils::ParameterAction *m_diffCurrentAction;
+ Core::Utils::ParameterAction *m_diffProjectAction;
QAction *m_diffAllAction;
QAction *m_resolveAction;
QAction *m_submitAction;
QAction *m_pendingAction;
QAction *m_describeAction;
- QAction *m_annotateCurrentAction;
+ Core::Utils::ParameterAction *m_annotateCurrentAction;
QAction *m_annotateAction;
- QAction *m_filelogCurrentAction;
+ Core::Utils::ParameterAction *m_filelogCurrentAction;
QAction *m_filelogAction;
QAction *m_submitCurrentLogAction;
bool m_submitActionTriggered;
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index cb5edbd6c373cc56ae0715a3c53c231898cef6fa..ee306a041d7f6af681828c390321f8799fdd63e9 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -79,6 +79,7 @@
#include <coreplugin/vcsmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
+#include <utils/parameteraction.h>
#include <QtCore/QtPlugin>
#include <QtCore/QDateTime>
@@ -438,7 +439,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
this, SLOT(updateRecentProjectMenu()));
// unload action
- m_unloadAction = new QAction(tr("Close Project"), this);
+ m_unloadAction = new Core::Utils::ParameterAction(tr("Close Project"), tr("Close Project \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
cmd = am->registerAction(m_unloadAction, Constants::UNLOAD, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_unloadAction->text());
@@ -1273,12 +1274,11 @@ void ProjectExplorerPlugin::updateActions()
if (debug)
qDebug()<<"BuildManager::isBuilding()"<<building;
- m_unloadAction->setEnabled(m_currentProject != 0);
if (m_currentProject == 0) {
- m_unloadAction->setText(tr("Close Project"));
+ m_unloadAction->setParameter(QString());
m_buildProjectOnlyMenu->setTitle(tr("Current Project"));
} else {
- m_unloadAction->setText(tr("Close Project \"%1\"").arg(m_currentProject->name()));
+ m_unloadAction->setParameter(m_currentProject->name());
m_buildProjectOnlyMenu->setTitle(tr("Project \"%1\"").arg(m_currentProject->name()));
}
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 377cbab84c487e3b2681e7cfc56799e0a1117d78..fc60b3129e6045c2ba14affbc76cd6bab234ab2d 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -54,6 +54,9 @@ class IFileFactory;
namespace Internal {
class WelcomeMode;
}
+ namespace Utils {
+ class ParameterAction;
+ }
}
namespace ProjectExplorer {
@@ -225,7 +228,7 @@ private:
#if 0
QAction *m_loadAction;
#endif
- QAction *m_unloadAction;
+ Core::Utils::ParameterAction *m_unloadAction;
QAction *m_clearSession;
QAction *m_buildProjectOnlyAction;
QAction *m_buildAction;
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui
index 1a1b37e16ac1d8f3009e0ccd5294de198ab226d3..d9104f52727ee8fd43b5bb63e3e5d9398f7a8633 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.ui
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui
@@ -11,9 +11,6 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="margin">
- <number>0</number>
- </property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -43,22 +40,22 @@
</property>
</widget>
</item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<resources/>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 6e9f4d0e503a8ade203654adda7bb6885492445f..4c14965077cda6d03a1da613fd056a7659cc8427 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -31,7 +31,7 @@ HEADERS = qt4projectmanagerplugin.h \
deployhelper.h \
embeddedpropertiespage.h \
qt4runconfiguration.h \
- speinfo.h \
+ qtmodulesinfo.h \
qt4projectconfigwidget.h \
qt4buildenvironmentwidget.h \
projectloadwizard.h \
@@ -64,7 +64,7 @@ SOURCES = qt4projectmanagerplugin.cpp \
deployhelper.cpp \
embeddedpropertiespage.cpp \
qt4runconfiguration.cpp \
- speinfo.cpp \
+ qtmodulesinfo.cpp \
qt4projectconfigwidget.cpp \
qt4buildenvironmentwidget.cpp \
projectloadwizard.cpp \
diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..206fa60ca4187532e24d95f9d14cb7ec14368b56
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
@@ -0,0 +1,160 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+
+#include "qtmodulesinfo.h"
+#include "qglobal.h"
+#include <QtCore/QtDebug>
+#include <QtCore/QString>
+#include <QtCore/QHash>
+#include <QtCore/QCoreApplication>
+
+using namespace Qt4ProjectManager::Internal;
+
+struct item
+{
+ const char * const config;
+ const QString name;
+ const QString description;
+ bool isDefault;
+};
+
+typedef QVector<const item*> itemVectorType;
+typedef QHash<QString, const item*> itemHashType;
+
+const itemVectorType itemVector()
+{
+ static const struct item items[] = {
+ {"core",
+ QCoreApplication::translate("QtModulesInfo", "QtCore Module"),
+ QCoreApplication::translate("QtModulesInfo", "Core non-GUI classes used by other modules"),
+ true},
+ {"gui",
+ QCoreApplication::translate("QtModulesInfo", "QtGui Module"),
+ QCoreApplication::translate("QtModulesInfo", "Graphical user interface components"),
+ true},
+ {"network",
+ QCoreApplication::translate("QtModulesInfo", "QtNetwork Module"),
+ QCoreApplication::translate("QtModulesInfo", "Classes for network programming"),
+ false},
+ {"opengl",
+ QCoreApplication::translate("QtModulesInfo", "QtOpenGL Module"),
+ QCoreApplication::translate("QtModulesInfo", "OpenGL support classes"),
+ false},
+ {"sql",
+ QCoreApplication::translate("QtModulesInfo", "QtSql Module"),
+ QCoreApplication::translate("QtModulesInfo", "Classes for database integration using SQL"),
+ false},
+ {"script",
+ QCoreApplication::translate("QtModulesInfo", "QtScript Module"),
+ QCoreApplication::translate("QtModulesInfo", "Classes for evaluating Qt Scripts"),
+ false},
+ {"svg",
+ QCoreApplication::translate("QtModulesInfo", "QtSvg Module"),
+ QCoreApplication::translate("QtModulesInfo", "Classes for displaying the contents of SVG files"),
+ false},
+ {"webkit",
+ QCoreApplication::translate("QtModulesInfo", "QtWebKit Module"),
+ QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"),
+ false},
+ {"xml",
+ QCoreApplication::translate("QtModulesInfo", "QtXml Module"),
+ QCoreApplication::translate("QtModulesInfo", "Classes for handling XML"),
+ false},
+ {"xmlpatterns",
+ QCoreApplication::translate("QtModulesInfo", "QtXmlPatterns Module"),
+ QCoreApplication::translate("QtModulesInfo", "An XQuery/XPath engine for XML and custom data models"),
+ false},
+ {"phonon",
+ QCoreApplication::translate("QtModulesInfo", "Phonon Module"),
+ QCoreApplication::translate("QtModulesInfo", "Multimedia framework classes"),
+ false},
+ {"qt3support",
+ QCoreApplication::translate("QtModulesInfo", "Qt3Support Module"),
+ QCoreApplication::translate("QtModulesInfo", "Classes that ease porting from Qt 3 to Qt 4"),
+ false},
+ {"testlib",
+ QCoreApplication::translate("QtModulesInfo", "QtTest Module"),
+ QCoreApplication::translate("QtModulesInfo", "Tool classes for unit testing"),
+ false},
+ {"dbus",
+ QCoreApplication::translate("QtModulesInfo", "QtDBus Module"),
+ QCoreApplication::translate("QtModulesInfo", "Classes for Inter-Process Communication using the D-Bus",
+ false)}
+ };
+ const uint itemsCount = sizeof items / sizeof items[0];
+ itemVectorType result;
+ result.reserve(itemsCount);
+ for (int i = 0; i < itemsCount; i++)
+ result.append(items + i);
+ return result;
+}
+
+Q_GLOBAL_STATIC_WITH_INITIALIZER(itemVectorType, staticItemVector, {
+ *x = itemVector();
+});
+
+Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, staticModulesList, {
+ const itemVectorType * const itemVector = staticItemVector();
+ for (int i = 0; i < itemVector->count(); i++)
+ x->append(QString::fromLatin1(itemVector->at(i)->config));
+});
+
+Q_GLOBAL_STATIC_WITH_INITIALIZER(itemHashType, staticItemHash, {
+ const itemVectorType * const itemVector = staticItemVector();
+ for (int i = 0; i < itemVector->count(); i++)
+ x->insert(QString::fromLatin1(itemVector->at(i)->config), itemVector->at(i));
+});
+
+QStringList QtModulesInfo::modules()
+{
+ return *staticModulesList();
+}
+
+static inline const item *itemForModule(const QString &module)
+{
+ return staticItemHash()->value(module.toLatin1().data());
+}
+
+QString QtModulesInfo::moduleName(const QString &module)
+{
+ const item * const i = itemForModule(module);
+ return i?i->name:QString();
+}
+
+QString QtModulesInfo::moduleDescription(const QString &module)
+{
+ const item * const i = itemForModule(module);
+ return i?i->description:QString();
+}
+
+bool QtModulesInfo::moduleIsDefault(const QString &module)
+{
+ const item * const i = itemForModule(module);
+ return i?i->isDefault:false;
+}
diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.h b/src/plugins/qt4projectmanager/qtmodulesinfo.h
new file mode 100644
index 0000000000000000000000000000000000000000..f4cc37f9a54a8e85263496ed61bc83caeec27273
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qtmodulesinfo.h
@@ -0,0 +1,49 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+#ifndef QTMODULESINFO_H
+#define QTMODULESINFO_H
+
+#include <QtCore/QStringList>
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+class QtModulesInfo
+{
+public:
+ static QStringList modules();
+ static QString moduleName(const QString &module);
+ static QString moduleDescription(const QString &module);
+ static bool moduleIsDefault(const QString &module);
+};
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
+#endif // QTMODULESINFO_H
diff --git a/src/plugins/qt4projectmanager/speinfo.cpp b/src/plugins/qt4projectmanager/speinfo.cpp
deleted file mode 100644
index 3367eea3137b3e2bd0fc7e3d81f44b00b83673ef..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/speinfo.cpp
+++ /dev/null
@@ -1,803 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-**
-**************************************************************************/
-
-#include "speinfo.h"
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QVariant>
-
-using namespace Qt4ProjectManager::Internal;
-
-bool SPEInfo::m_listsInitialized = false;
-QList<SPEInfoItem*> SPEInfo::m_configurationList;
-QList<SPEInfoItem*> SPEInfo::m_platformList;
-QList<SPEInfoItem*> SPEInfo::m_variableList;
-QList<SPEInfoItem*> SPEInfo::m_qtmoduleList;
-QList<SPEInfoItem*> SPEInfo::m_templateList;
-QList<SPEInfoItem*> SPEInfo::m_operatorList;
-
-QHash<QPair<SPEInfoItem::InfoKind, QString> ,SPEInfoItem*> SPEInfo::m_itemHash;
-
-const QString SPEInfoItem::keyType("valuetype");
-const QString SPEInfoItem::valueFile("file");
-const QString SPEInfoItem::valuePath("path");
-const QString SPEInfoItem::keyIncludedByDefault("includedbydefault");
-const QString SPEInfoItem::keyImageFileName("imagefilename");
-
-// Configurations (Debug, Release, ...)
-class InfoItemConfigurationCross : public SPEInfoItem
-{
-public:
- InfoItemConfigurationCross(): SPEInfoItem("", Configuration) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Debug and Release"); }
-};
-
-class InfoItemConfigurationDebug : public SPEInfoItem
-{
-public:
- InfoItemConfigurationDebug(): SPEInfoItem("debug", Configuration) {}
- QString name() const {return QCoreApplication::translate("SimpleProEditor", "Debug specific");}
-};
-
-class InfoItemConfigurationRelease : public SPEInfoItem
-{
-public:
- InfoItemConfigurationRelease(): SPEInfoItem("release", Configuration) {}
- QString name() const {return QCoreApplication::translate("SimpleProEditor", "Release specific");}
-};
-
-
-// Platforms (Windows, Mac, ...)
-class InfoItemPlatformCross : public SPEInfoItem
-{
-public:
- InfoItemPlatformCross(): SPEInfoItem("", Platform) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "All platforms"); }
-};
-
-class InfoItemPlatformWindows : public SPEInfoItem
-{
-public:
- InfoItemPlatformWindows(): SPEInfoItem("win32", Platform) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "MS Windows specific"); }
-};
-
-class InfoItemPlatformUnix : public SPEInfoItem
-{
-public:
- InfoItemPlatformUnix(): SPEInfoItem("unix", Platform) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Linux/Unix specific"); }
-};
-
-class InfoItemPlatformOSX : public SPEInfoItem
-{
-public:
- InfoItemPlatformOSX(): SPEInfoItem("macx", Platform) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Mac OSX specific"); }
-};
-
-
-// Variables (Target options, Libraries, Defines, ...)
-class InfoItemVariableTargetOptions : public SPEInfoItem
-{
-public:
- InfoItemVariableTargetOptions(): SPEInfoItem("TEMPLATE", Variable)
- {
- m_data.insert(keyImageFileName, ":/variableimages/images/target.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Target Options");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Type and name of the target.");
- }
-};
-
-class InfoItemVariableDefines : public SPEInfoItem
-{
-public:
- InfoItemVariableDefines(): SPEInfoItem("DEFINES", Variable)
- {
- m_data.insert(keyImageFileName, ":/variableimages/images/defines.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Preprocessor Definitions");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Setting of the preprocessor definitions.");
- }
-};
-
-class InfoItemVariableIncludePath : public SPEInfoItem
-{
-public:
- InfoItemVariableIncludePath(): SPEInfoItem("INCLUDEPATH", Variable)
- {
- m_data.insert(keyType, valuePath);
- m_data.insert(keyImageFileName, ":/variableimages/images/includes.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Include path"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Setting of the pathes where the header files are located.");
- }
-};
-
-class InfoItemVariableLibs : public SPEInfoItem
-{
-public:
- InfoItemVariableLibs(): SPEInfoItem("LIBS", Variable)
- {
- m_data.insert(keyImageFileName, ":/variableimages/images/libs.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Libraries");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Defining the libraries to link the target against and the pathes where these are located.");
- }
-};
-
-class InfoItemVariableSources : public SPEInfoItem
-{
-public:
- InfoItemVariableSources(): SPEInfoItem("SOURCES", Variable)
- {
- m_data.insert(keyType, valueFile);
- m_data.insert(keyImageFileName, ":/variableimages/images/sources.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Source Files");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "");
- }
-};
-
-class InfoItemVariableHeaders : public SPEInfoItem
-{
-public:
- InfoItemVariableHeaders(): SPEInfoItem("HEADERS", Variable)
- {
- m_data.insert(keyType, valueFile);
- m_data.insert(keyImageFileName, ":/variableimages/images/headers.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Header Files");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "");
- }
-};
-
-class InfoItemVariableForms : public SPEInfoItem
-{
-public:
- InfoItemVariableForms(): SPEInfoItem("FORMS", Variable)
- {
- m_data.insert(keyType, valueFile);
- m_data.insert(keyImageFileName, ":/variableimages/images/forms.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Forms");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "");
- }
-};
-
-class InfoItemVariableQtModules : public SPEInfoItem
-{
-public:
- InfoItemVariableQtModules(): SPEInfoItem("QT", Variable)
- {
- m_data.insert(keyImageFileName, ":/variableimages/images/qtmodules.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Qt Modules");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Setting up which of the Qt modules will be used in the target application.");
- }
-};
-
-class InfoItemVariableResources : public SPEInfoItem
-{
-public:
- InfoItemVariableResources(): SPEInfoItem("RESOURCES", Variable)
- {
- m_data.insert(keyType, valueFile);
- m_data.insert(keyImageFileName, ":/variableimages/images/resources.png");
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Resource files");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "");
- }
-};
-
-class InfoItemVariableTarget : public SPEInfoItem
-{
-public:
- InfoItemVariableTarget(): SPEInfoItem("TARGET", Variable) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Target name");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "The name of the resulting target.");
- }
-};
-
-class InfoItemVariableConfig : public SPEInfoItem
-{
-public:
- InfoItemVariableConfig(): SPEInfoItem("CONFIG", Variable) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Configuration");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Configuration.");
- }
-};
-
-class InfoItemVariableDestdir : public SPEInfoItem
-{
-public:
- InfoItemVariableDestdir(): SPEInfoItem("DESTDIR", Variable) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Destination directory");}
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Where the resulting target will be created.");
- }
-};
-
-
-// Qt modules
-class InfoItemModulesCore : public SPEInfoItem
-{
-public:
- InfoItemModulesCore(): SPEInfoItem("core", QtModule)
- {
- m_data.insert(keyIncludedByDefault, true);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtCore Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Core non-GUI classes used by other modules");
- }
-};
-
-class InfoItemModulesGui : public SPEInfoItem
-{
-public:
- InfoItemModulesGui(): SPEInfoItem("gui", QtModule)
- {
- m_data.insert(keyIncludedByDefault, true);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtGui Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Graphical user interface components");
- }
-};
-
-class InfoItemModulesNetwork : public SPEInfoItem
-{
-public:
- InfoItemModulesNetwork(): SPEInfoItem("network", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtNetwork Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Classes for network programming");
- }
-};
-
-class InfoItemModulesOpenGL : public SPEInfoItem
-{
-public:
- InfoItemModulesOpenGL(): SPEInfoItem("opengl", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtOpenGL Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "OpenGL support classes");
- }
-};
-
-class InfoItemModulesSql : public SPEInfoItem
-{
-public:
- InfoItemModulesSql(): SPEInfoItem("sql", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtSql Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Classes for database integration using SQL");
- }
-};
-
-class InfoItemModulesScript : public SPEInfoItem
-{
-public:
- InfoItemModulesScript(): SPEInfoItem("script", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtScript Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Classes for evaluating Qt Scripts");
- }
-};
-
-class InfoItemModulesSvg : public SPEInfoItem
-{
-public:
- InfoItemModulesSvg(): SPEInfoItem("svg", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtSvg Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Classes for displaying the contents of SVG files");
- }
-};
-
-class InfoItemModulesWebKit : public SPEInfoItem
-{
-public:
- InfoItemModulesWebKit(): SPEInfoItem("webkit", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtWebKit Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Classes for displaying and editing Web content");
- }
-};
-
-class InfoItemModulesXml : public SPEInfoItem
-{
-public:
- InfoItemModulesXml(): SPEInfoItem("xml", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtXml Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Classes for handling XML");
- }
-};
-
-class InfoItemModulesXmlPatterns : public SPEInfoItem
-{
-public:
- InfoItemModulesXmlPatterns(): SPEInfoItem("xmlpatterns", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtXmlPatterns Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "An XQuery/XPath engine for XML and custom data models");
- }
-};
-
-class InfoItemModulesPhonon : public SPEInfoItem
-{
-public:
- InfoItemModulesPhonon(): SPEInfoItem("phonon", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Phonon Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Multimedia framework classes");
- }
-};
-
-class InfoItemModulesQt3Support : public SPEInfoItem
-{
-public:
- InfoItemModulesQt3Support(): SPEInfoItem("qt3support", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Qt3Support Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Classes that ease porting from Qt 3 to Qt 4");
- }
-};
-
-class InfoItemModulesTest : public SPEInfoItem
-{
-public:
- InfoItemModulesTest(): SPEInfoItem("testlib", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtTest Module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Tool classes for unit testing");
- }
-};
-
-class InfoItemModulesDBus : public SPEInfoItem
-{
-public:
- InfoItemModulesDBus(): SPEInfoItem("dbus", QtModule)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtDBus module"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Classes for Inter-Process Communication using the D-Bus");
- }
-};
-
-
-// Target templates
-class InfoItemTemplatesApp : public SPEInfoItem
-{
-public:
- InfoItemTemplatesApp(): SPEInfoItem("app", Template)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Application"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Create a standalone application");
- }
-};
-
-class InfoItemTemplatesDynamicLib : public SPEInfoItem
-{
-public:
- InfoItemTemplatesDynamicLib(): SPEInfoItem("lib", Template)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Dynamic Library"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Create a dynamic library for usage in other applications");
- }
-};
-
-class InfoItemTemplatesStaticLib : public SPEInfoItem
-{
-public:
- InfoItemTemplatesStaticLib(): SPEInfoItem("staticlib", Template)
- {
- m_data.insert(keyIncludedByDefault, false);
- }
-
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Static Library"); }
- QString description() const
- {
- return QCoreApplication::translate("SimpleProEditor",
- "Create a static library for usage in other applications");
- }
-};
-
-// Variable operators
-class InfoItemOperatorsAdd : public SPEInfoItem
-{
-public:
- InfoItemOperatorsAdd(): SPEInfoItem("+=", Operator) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Add Operator"); }
-};
-
-class InfoItemOperatorsRemove : public SPEInfoItem
-{
-public:
- InfoItemOperatorsRemove(): SPEInfoItem("-=", Operator) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Remove Operator"); }
-};
-
-class InfoItemOperatorsReplace : public SPEInfoItem
-{
-public:
- InfoItemOperatorsReplace(): SPEInfoItem("~=", Operator) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Replace Operator"); }
-};
-
-class InfoItemOperatorsSet : public SPEInfoItem
-{
-public:
- InfoItemOperatorsSet(): SPEInfoItem("=", Operator) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Set Operator"); }
-};
-
-class InfoItemOperatorsUniqueAdd : public SPEInfoItem
-{
-public:
- InfoItemOperatorsUniqueAdd(): SPEInfoItem("*=", Operator) {}
- QString name() const { return QCoreApplication::translate("SimpleProEditor", "Unique Add Operator"); }
-};
-
-
-SPEInfoItem::SPEInfoItem(const QString &id, InfoKind kind)
-: m_id(id)
-, m_infoKind(kind)
-, m_parentItem(0)
-{
-}
-
-QString SPEInfoItem::name() const
-{
- return "";
-}
-
-QString SPEInfoItem::description() const
-{
- return "";
-}
-
-QVariant SPEInfoItem::data(const QString &key) const
-{
- return m_data.value(key);
-}
-
-const SPEInfoItem *SPEInfoItem::parentItem() const
-{
- return m_parentItem;
-}
-
-void SPEInfoItem::setParentItem(const SPEInfoItem *parentItem)
-{
- m_parentItem = parentItem;
-}
-
-bool SPEInfoItem::isAncestorOf(const SPEInfoItem *successor) const
-{
- const SPEInfoItem *ancestorCursor = successor;
-
- while ((ancestorCursor = ancestorCursor->parentItem()) != NULL)
- if (ancestorCursor == this)
- return true;
-
- return false;
-}
-
-QString SPEInfoItem::id() const
-{
- return m_id;
-}
-
-SPEInfoItem::InfoKind SPEInfoItem::infoKind() const
-{
- return m_infoKind;
-}
-
-SPEInfo::~SPEInfo()
-{
- deleteLists();
-}
-
-const QList<SPEInfoItem*> *SPEInfo::list(SPEInfoItem::InfoKind kind)
-{
- if (!m_listsInitialized)
- initializeLists();
- return
- kind == SPEInfoItem::Configuration?&m_configurationList
- :kind == SPEInfoItem::Platform?&m_platformList
- :kind == SPEInfoItem::Variable?&m_variableList
- :kind == SPEInfoItem::QtModule?&m_qtmoduleList
- :kind == SPEInfoItem::Template?&m_templateList
- :/*kind == SPEInfoItem::Operator?*/&m_operatorList
- ;
-}
-
-const SPEInfoItem *SPEInfo::defaultInfoOfKind(SPEInfoItem::InfoKind kind)
-{
- return list(kind)->at(0);
-}
-
-void SPEInfo::addListToHash(const QList<SPEInfoItem*> &list)
-{
- foreach (SPEInfoItem *item, list)
- m_itemHash.insert(qMakePair(item->infoKind(), item->id()), item);
-}
-
-void SPEInfo::initializeLists()
-{
- InfoItemConfigurationCross *infoItemConfigurationCross = new InfoItemConfigurationCross;
- InfoItemConfigurationDebug *infoItemConfigurationDebug = new InfoItemConfigurationDebug;
- infoItemConfigurationDebug->setParentItem(infoItemConfigurationCross);
- InfoItemConfigurationRelease *infoItemConfigurationRelease = new InfoItemConfigurationRelease;
- infoItemConfigurationRelease->setParentItem(infoItemConfigurationCross);
- m_configurationList
- << infoItemConfigurationCross
- << infoItemConfigurationDebug
- << infoItemConfigurationRelease;
- addListToHash(m_configurationList);
-
- InfoItemPlatformCross *infoItemPlatformCross = new InfoItemPlatformCross;
- InfoItemPlatformWindows *infoItemPlatformWindows = new InfoItemPlatformWindows;
- infoItemPlatformWindows->setParentItem(infoItemPlatformCross);
- InfoItemPlatformUnix *infoItemPlatformUnix = new InfoItemPlatformUnix;
- infoItemPlatformUnix->setParentItem(infoItemPlatformCross);
- InfoItemPlatformOSX *infoItemPlatformOSX = new InfoItemPlatformOSX;
- infoItemPlatformOSX->setParentItem(infoItemPlatformUnix);
- m_platformList
- << infoItemPlatformCross
- << infoItemPlatformWindows
- << infoItemPlatformUnix
- << infoItemPlatformOSX;
- addListToHash(m_platformList);
-
- m_variableList
- << new InfoItemVariableTargetOptions
- << new InfoItemVariableDefines
- << new InfoItemVariableLibs
- << new InfoItemVariableIncludePath
- << new InfoItemVariableSources
- << new InfoItemVariableHeaders
- << new InfoItemVariableForms
- << new InfoItemVariableQtModules
- << new InfoItemVariableResources
- << new InfoItemVariableTarget
- << new InfoItemVariableConfig
- << new InfoItemVariableDestdir;
- addListToHash(m_variableList);
-
- m_qtmoduleList
- << new InfoItemModulesCore
- << new InfoItemModulesGui
- << new InfoItemModulesNetwork
- << new InfoItemModulesOpenGL
- << new InfoItemModulesScript
- << new InfoItemModulesSql
- << new InfoItemModulesSvg
- << new InfoItemModulesWebKit
- << new InfoItemModulesXml
- << new InfoItemModulesXmlPatterns
- << new InfoItemModulesPhonon
- << new InfoItemModulesQt3Support
- << new InfoItemModulesTest
- << new InfoItemModulesDBus;
- addListToHash(m_qtmoduleList);
-
- m_templateList
- << new InfoItemTemplatesApp
- << new InfoItemTemplatesDynamicLib
- << new InfoItemTemplatesStaticLib;
- addListToHash(m_templateList);
-
- m_operatorList
- << new InfoItemOperatorsAdd
- << new InfoItemOperatorsRemove
- << new InfoItemOperatorsReplace
- << new InfoItemOperatorsSet
- << new InfoItemOperatorsUniqueAdd;
- addListToHash(m_operatorList);
-
- m_listsInitialized = true;
-}
-
-void SPEInfo::deleteLists()
-{
- m_itemHash.clear();
-
- static QList<SPEInfoItem*> *lists[] = {
- &m_configurationList,
- &m_platformList,
- &m_variableList,
- &m_qtmoduleList,
- &m_templateList,
- &m_operatorList
- };
-
- for (size_t i = 0; i < sizeof(lists)/sizeof(lists[0]); i++) {
- qDeleteAll(*lists[i]);
- lists[i]->clear();
- }
-
- m_listsInitialized = false;
-}
-
-const SPEInfoItem *SPEInfo::infoOfKindForId(SPEInfoItem::InfoKind kind,
- const QString &id, const SPEInfoItem *defaultInfoItem)
-{
- QPair<SPEInfoItem::InfoKind, QString > keyPair = qMakePair(kind, id);
- return m_itemHash.contains(keyPair)?m_itemHash.value(keyPair):defaultInfoItem;
-}
-
-const SPEInfoItem *SPEInfo::platformInfoForId(const QString &id)
-{
- return infoOfKindForId(SPEInfoItem::Platform, id, SPEInfo::defaultInfoOfKind(SPEInfoItem::Platform));
-}
-
-const SPEInfoItem *SPEInfo::configurationInfoForId(const QString &id)
-{
- return infoOfKindForId(SPEInfoItem::Configuration, id, SPEInfo::defaultInfoOfKind(SPEInfoItem::Configuration));
-}
-
-static SPEInfo speInfoInstance; // it's destructor will call deleteLists()
diff --git a/src/plugins/qt4projectmanager/speinfo.h b/src/plugins/qt4projectmanager/speinfo.h
deleted file mode 100644
index a4395212916789b9b2ab6dec7d6e3e8708e9d76b..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/speinfo.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-**
-**************************************************************************/
-
-#ifndef SIMPLEPROEDITORINFO_H
-#define SIMPLEPROEDITORINFO_H
-
-#include <QtCore/QHash>
-#include <QtCore/QVariant>
-#include <QtGui/QPixmap>
-
-namespace Qt4ProjectManager {
-namespace Internal {
-
-class SPEInfoItem
-{
-public:
- enum InfoKind {
- Configuration,
- Platform,
- Variable,
- QtModule,
- Template,
- Operator
- };
-
- SPEInfoItem(const QString &id, InfoKind kind);
- virtual ~SPEInfoItem() {}
-
- QString id() const;
- InfoKind infoKind() const;
- virtual QString name() const;
- virtual QString description() const;
- QVariant data(const QString &key) const;
- const SPEInfoItem *parentItem() const;
- void setParentItem(const SPEInfoItem *parentItem);
-
- bool isAncestorOf(const SPEInfoItem *ancestor) const;
-
- static const QString keyType;
- static const QString valueFile;
- static const QString valuePath;
- static const QString keyIncludedByDefault;
- static const QString keyImageFileName;
-
-protected:
- QHash<QString, QVariant> m_data;
-
-private:
- QString m_id;
- InfoKind m_infoKind;
- QPixmap m_image;
- const class SPEInfoItem *m_parentItem;
-};
-
-class SPEInfo
-{
-public:
- ~SPEInfo();
-
- static const QList<SPEInfoItem*> *list(SPEInfoItem::InfoKind kind);
- static const SPEInfoItem *defaultInfoOfKind(SPEInfoItem::InfoKind kind);
- static const SPEInfoItem *platformInfoForId(const QString &id);
- static const SPEInfoItem *configurationInfoForId(const QString &id);
- static const SPEInfoItem *infoOfKindForId(SPEInfoItem::InfoKind kind,
- const QString &id, const SPEInfoItem *defaultInfoItem = NULL);
-
-private:
- static void addListToHash(const QList<SPEInfoItem*> &list);
- static void initializeLists();
- static void deleteLists();
-
- static QList<SPEInfoItem*> m_configurationList;
- static QList<SPEInfoItem*> m_platformList;
- static QList<SPEInfoItem*> m_variableList;
- static QList<SPEInfoItem*> m_qtmoduleList;
- static QList<SPEInfoItem*> m_templateList;
- static QList<SPEInfoItem*> m_operatorList;
-
- static QHash<QPair<SPEInfoItem::InfoKind, QString> ,SPEInfoItem* > m_itemHash;
-
- static bool m_listsInitialized;
-};
-
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
-#endif // SIMPLEPROEDITORINFO_H
diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
index cc9216f5939c101d0a5213d7eb2526bc0a978eff..639f6c6d7f0c1478d37935a30076c2675f2b7a3f 100644
--- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
@@ -29,11 +29,12 @@
#include "modulespage.h"
-#include "speinfo.h"
+#include "qtmodulesinfo.h"
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
+#include <QtCore/QVariant>
#include <QtGui/QCheckBox>
#include <QtGui/QLabel>
@@ -58,19 +59,19 @@ ModulesPage::ModulesPage(QWidget *parent)
QGridLayout *layout = new QGridLayout;
- const QList<SPEInfoItem*> infoItemsList = *SPEInfo::list(SPEInfoItem::QtModule);
- int itemId = 0;
- int rowsCount = (infoItemsList.count() + 1) / 2;
- foreach (const SPEInfoItem *infoItem, infoItemsList) {
- QCheckBox *moduleCheckBox = new QCheckBox(infoItem->name());
- moduleCheckBox->setToolTip(infoItem->description());
- moduleCheckBox->setWhatsThis(infoItem->description());
- registerField(infoItem->id(), moduleCheckBox);
- int row = itemId % rowsCount;
- int column = itemId / rowsCount;
+ const QStringList &modulesList = QtModulesInfo::modules();
+ int moduleId = 0;
+ int rowsCount = (modulesList.count() + 1) / 2;
+ foreach (const QString &module, modulesList) {
+ QCheckBox *moduleCheckBox = new QCheckBox(QtModulesInfo::moduleName(module));
+ moduleCheckBox->setToolTip(QtModulesInfo::moduleDescription(module));
+ moduleCheckBox->setWhatsThis(QtModulesInfo::moduleDescription(module));
+ registerField(module, moduleCheckBox);
+ int row = moduleId % rowsCount;
+ int column = moduleId / rowsCount;
layout->addWidget(moduleCheckBox, row, column);
- m_moduleCheckBoxMap[infoItem->id()] = moduleCheckBox;
- itemId++;
+ m_moduleCheckBoxMap[module] = moduleCheckBox;
+ moduleId++;
}
vlayout->addLayout(layout);
@@ -80,10 +81,10 @@ ModulesPage::ModulesPage(QWidget *parent)
// Return the key that goes into the Qt config line for a module
QString ModulesPage::idOfModule(const QString &module)
{
- const QList<SPEInfoItem*> infoItemsList = *SPEInfo::list(SPEInfoItem::QtModule);
- foreach (const SPEInfoItem *infoItem, infoItemsList)
- if (infoItem->name().startsWith(module))
- return infoItem->id();
+ const QStringList &moduleIdList = QtModulesInfo::modules();
+ foreach (const QString &id, moduleIdList)
+ if (QtModulesInfo::moduleName(id).startsWith(module))
+ return id;
return QString();
}
@@ -114,13 +115,10 @@ void ModulesPage::setModuleEnabled(const QString &module, bool enabled) const
QString ModulesPage::modules(bool selected) const
{
QStringList modules;
-
- const QList<SPEInfoItem*> infoItemsList = *SPEInfo::list(SPEInfoItem::QtModule);
- foreach (const SPEInfoItem *infoItem, infoItemsList) {
- if (selected != infoItem->data(SPEInfoItem::keyIncludedByDefault).toBool()
- && selected == field(infoItem->id()).toBool())
- modules << infoItem->id();
+ foreach (const QString &module, QtModulesInfo::modules()) {
+ if (selected != QtModulesInfo::moduleIsDefault(module)
+ && selected == field(module).toBool())
+ modules << module;
}
-
return modules.join(QString(QLatin1Char(' ')));
}
diff --git a/src/plugins/quickopen/settingspage.ui b/src/plugins/quickopen/settingspage.ui
index f9145404d236a46de19ba744be98b52ab569e8c5..06d3116f08ac7e2f8111a662258aacdccd56629b 100644
--- a/src/plugins/quickopen/settingspage.ui
+++ b/src/plugins/quickopen/settingspage.ui
@@ -13,59 +13,68 @@
<property name="windowTitle">
<string>Configure Filters</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0">
- <widget class="QListWidget" name="filterList">
- <property name="font">
- <font/>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Configure Filters</string>
</property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QListWidget" name="filterList">
+ <property name="font">
+ <font/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QPushButton" name="addButton">
+ <property name="text">
+ <string>Add</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="removeButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Remove</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="editButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Edit</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
- <item row="0" column="1">
- <layout class="QVBoxLayout">
- <item>
- <widget class="QPushButton" name="addButton">
- <property name="text">
- <string>Add</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="removeButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Remove</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="editButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Edit</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="1" column="0" colspan="2">
+ <item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label">
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 3eae46896bc59aeeb845c4d74fd1d05f9937f1c0..de1e01d26fbd1e131fa6157bc51665edddc8d2da 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -41,6 +41,7 @@
#include <vcsbase/vcsbaseeditor.h>
#include <vcsbase/basevcssubmiteditorfactory.h>
#include <utils/synchronousprocess.h>
+#include <utils/parameteraction.h>
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
@@ -320,7 +321,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
globalcontext << core->uniqueIDManager()->uniqueIdentifier(C_GLOBAL);
Core::Command *command;
- m_addAction = new QAction(tr("Add"), this);
+ m_addAction = new Core::Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = ami->registerAction(m_addAction, SubversionPlugin::ADD,
globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
@@ -330,14 +331,14 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
subversionMenu->addAction(command);
- m_deleteAction = new QAction(tr("Delete"), this);
+ m_deleteAction = new Core::Utils::ParameterAction(tr("Delete"), tr("Delete \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = ami->registerAction(m_deleteAction, SubversionPlugin::DELETE_FILE,
globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(deleteCurrentFile()));
subversionMenu->addAction(command);
- m_revertAction = new QAction(tr("Revert"), this);
+ m_revertAction = new Core::Utils::ParameterAction(tr("Revert"), tr("Revert \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = ami->registerAction(m_revertAction, SubversionPlugin::REVERT,
globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
@@ -352,7 +353,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffProject()));
subversionMenu->addAction(command);
- m_diffCurrentAction = new QAction(tr("Diff Current File"), this);
+ m_diffCurrentAction = new Core::Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = ami->registerAction(m_diffCurrentAction,
SubversionPlugin::DIFF_CURRENT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
@@ -370,7 +371,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
connect(m_commitAllAction, SIGNAL(triggered()), this, SLOT(startCommitAll()));
subversionMenu->addAction(command);
- m_commitCurrentAction = new QAction(tr("Commit Current File"), this);
+ m_commitCurrentAction = new Core::Utils::ParameterAction(tr("Commit Current File"), tr("Commit \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = ami->registerAction(m_commitCurrentAction,
SubversionPlugin::COMMIT_CURRENT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
@@ -382,7 +383,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
subversionMenu->addAction(createSeparator(this, ami, SubversionPlugin::SEPARATOR2, globalcontext));
- m_filelogCurrentAction = new QAction(tr("Filelog Current File"), this);
+ m_filelogCurrentAction = new Core::Utils::ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = ami->registerAction(m_filelogCurrentAction,
SubversionPlugin::FILELOG_CURRENT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
@@ -390,7 +391,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
SLOT(filelogCurrentFile()));
subversionMenu->addAction(command);
- m_annotateCurrentAction = new QAction(tr("Annotate Current File"), this);
+ m_annotateCurrentAction = new Core::Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this);
command = ami->registerAction(m_annotateCurrentAction,
SubversionPlugin::ANNOTATE_CURRENT, globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
@@ -549,32 +550,21 @@ SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QStri
void SubversionPlugin::updateActions()
{
- const QString fileName = currentFileName();
- const bool hasFile = !fileName.isEmpty();
-
- m_addAction->setEnabled(hasFile);
- m_deleteAction->setEnabled(hasFile);
- m_revertAction->setEnabled(hasFile);
m_diffProjectAction->setEnabled(true);
- m_diffCurrentAction->setEnabled(hasFile);
m_commitAllAction->setEnabled(true);
- m_commitCurrentAction->setEnabled(hasFile);
- m_filelogCurrentAction->setEnabled(hasFile);
- m_annotateCurrentAction->setEnabled(hasFile);
m_statusAction->setEnabled(true);
m_describeAction->setEnabled(true);
- QString baseName;
- if (hasFile)
- baseName = QFileInfo(fileName).fileName();
-
- m_addAction->setText(tr("Add %1").arg(baseName));
- m_deleteAction->setText(tr("Delete %1").arg(baseName));
- m_revertAction->setText(tr("Revert %1").arg(baseName));
- m_diffCurrentAction->setText(tr("Diff %1").arg(baseName));
- m_commitCurrentAction->setText(tr("Commit %1").arg(baseName));
- m_filelogCurrentAction->setText(tr("Filelog %1").arg(baseName));
- m_annotateCurrentAction->setText(tr("Annotate %1").arg(baseName));
+ const QString fileName = currentFileName();
+ const QString baseName = fileName.isEmpty() ? fileName : QFileInfo(fileName).fileName();
+
+ m_addAction->setParameter(baseName);
+ m_deleteAction->setParameter(baseName);
+ m_revertAction->setParameter(baseName);
+ m_diffCurrentAction->setParameter(baseName);
+ m_commitCurrentAction->setParameter(baseName);
+ m_filelogCurrentAction->setParameter(baseName);
+ m_annotateCurrentAction->setParameter(baseName);
}
void SubversionPlugin::addCurrentFile()
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 1611db8f2be33054e5ab95dbd166bc01d50e9075..071b2f9f8521a9b5efd139718084230d25d08da1 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -52,6 +52,9 @@ QT_END_NAMESPACE
namespace Core {
class IEditorFactory;
class IVersionControl;
+ namespace Utils {
+ class ParameterAction;
+ }
}
namespace ProjectExplorer {
@@ -151,15 +154,15 @@ private:
SubversionOutputWindow *m_subversionOutputWindow;
ProjectExplorer::ProjectExplorerPlugin *m_projectExplorer;
- QAction *m_addAction;
- QAction *m_deleteAction;
- QAction *m_revertAction;
+ Core::Utils::ParameterAction *m_addAction;
+ Core::Utils::ParameterAction *m_deleteAction;
+ Core::Utils::ParameterAction *m_revertAction;
QAction *m_diffProjectAction;
- QAction *m_diffCurrentAction;
+ Core::Utils::ParameterAction *m_diffCurrentAction;
QAction *m_commitAllAction;
- QAction *m_commitCurrentAction;
- QAction *m_filelogCurrentAction;
- QAction *m_annotateCurrentAction;
+ Core::Utils::ParameterAction *m_commitCurrentAction;
+ Core::Utils::ParameterAction *m_filelogCurrentAction;
+ Core::Utils::ParameterAction *m_annotateCurrentAction;
QAction *m_statusAction;
QAction *m_updateProjectAction;
QAction *m_describeAction;
diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index 55416636d2831f742b2d315adc6adaa84273f097..7dcc046082e864620187efcbccd370c46489c9de 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -135,11 +135,7 @@ bool BaseTextDocument::isReadOnly() const
return true;
if (m_fileName.isEmpty()) //have no corresponding file, so editing is ok
return false;
-
- const QFileInfo fi(m_fileName);
-
return m_fileIsReadOnly;
-
}
bool BaseTextDocument::isModified() const
diff --git a/src/plugins/vcsbase/vcsbasesettingspage.ui b/src/plugins/vcsbase/vcsbasesettingspage.ui
index 0d8b3cd74ab7ccfede9ac0a812b65ef596b25c06..50aa9cf94bd7b8f3f301c0d4909c60af1e181d29 100644
--- a/src/plugins/vcsbase/vcsbasesettingspage.ui
+++ b/src/plugins/vcsbase/vcsbasesettingspage.ui
@@ -12,120 +12,125 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QCheckBox" name="promptForSubmitCheckBox">
- <property name="text">
- <string>Prompt to submit</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QCheckBox" name="lineWrapCheckBox">
- <property name="text">
- <string>Wrap submit message at:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="lineWrapSpinBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="minimum">
- <number>40</number>
- </property>
- <property name="maximum">
- <number>200</number>
- </property>
- <property name="value">
- <number>72</number>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="submitMessageCheckScriptLabel">
- <property name="toolTip">
- <string>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</string>
- </property>
- <property name="text">
- <string>Submit message check script:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="Core::Utils::PathChooser" name="submitMessageCheckScriptChooser" native="true"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="nickNameMailMapLabel">
- <property name="toolTip">
- <string>A file listing user names and email addresses in a 4-column mailmap format:
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Common</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QCheckBox" name="promptForSubmitCheckBox">
+ <property name="text">
+ <string>Prompt to submit</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QCheckBox" name="lineWrapCheckBox">
+ <property name="text">
+ <string>Wrap submit message at:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="lineWrapSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimum">
+ <number>40</number>
+ </property>
+ <property name="maximum">
+ <number>200</number>
+ </property>
+ <property name="value">
+ <number>72</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="submitMessageCheckScriptLabel">
+ <property name="toolTip">
+ <string>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</string>
+ </property>
+ <property name="text">
+ <string>Submit message check script:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="Core::Utils::PathChooser" name="submitMessageCheckScriptChooser" native="true"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="nickNameMailMapLabel">
+ <property name="toolTip">
+ <string>A file listing user names and email addresses in a 4-column mailmap format:
name <email> alias <email></string>
- </property>
- <property name="text">
- <string>User/alias configuration file:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="Core::Utils::PathChooser" name="nickNameMailMapChooser" native="true"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="nickNameFieldsFileLabel">
- <property name="toolTip">
- <string>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</string>
- </property>
- <property name="text">
- <string>User fields configuration file:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="Core::Utils::PathChooser" name="nickNameFieldsFileChooser" native="true"/>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </property>
+ <property name="text">
+ <string>User/alias configuration file:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="Core::Utils::PathChooser" name="nickNameMailMapChooser" native="true"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="nickNameFieldsFileLabel">
+ <property name="toolTip">
+ <string>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</string>
+ </property>
+ <property name="text">
+ <string>User fields configuration file:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="Core::Utils::PathChooser" name="nickNameFieldsFileChooser" native="true"/>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
</item>
<item>
<spacer name="verticalSpacer">