--- a/eric6/i18n/eric6_de.ts Fri Jun 14 18:46:44 2019 +0200
+++ b/eric6/i18n/eric6_de.ts Wed Jun 26 19:41:11 2019 +0200
@@ -3257,27 +3257,27 @@
<translation>Gib Dateimuster getrennt durch Komma von Dateien ein, die ignoriert werden sollen</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="777"/>
<source>Press to start the code style check run</source>
<translation>Drücken, um die Quelltextstil-Prüfung zu starten</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="768"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/>
<source>Press to fix the selected issues</source>
<translation>Drücken, um die ausgewählten Probleme zu beheben</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="791"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="810"/>
<source>Press to load the default values</source>
<translation>Drücken, um Standarwerte zu laden</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="801"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="820"/>
<source>Press to store the current values as defaults</source>
<translation>Drücken, um die aktuellen Werte als Standard zu speichern</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="811"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/>
<source>Press to reset the default values</source>
<translation>Drücken, um die Standardeinstellungen zurückzusetzen</translation>
</message>
@@ -3377,7 +3377,7 @@
<translation>Probleme automatisch beheben</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="832"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/>
<source><b>Result List</b>
<p>This list shows the results of the code style check. Double clicking
an entry will open this entry in an editor window and position the cursor at
@@ -3388,17 +3388,17 @@
Zeile und Position.</p></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="848"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="867"/>
<source>File/Line</source>
<translation>Datei/Zeile</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="853"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="872"/>
<source>Code</source>
<translation>Code</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="858"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="877"/>
<source>Message</source>
<translation>Nachricht</translation>
</message>
@@ -3433,7 +3433,7 @@
<translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="603"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="612"/>
<source>Error: {0}</source>
<translation>Fehler: {0}</translation>
</message>
@@ -3443,17 +3443,17 @@
<translation>Lösung: {0}</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="744"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="753"/>
<source>No issues found.</source>
<translation>Keine Probleme gefunden.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="879"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/>
<source>Shows the progress of the code style check</source>
<translation>Zeigt den Fortschritt der Quelltextstil-Prüfung an</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="888"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="907"/>
<source>%v/%m Files</source>
<translation>%v/%m Dateien</translation>
</message>
@@ -3468,17 +3468,17 @@
<translation>Ignorierte anzeigen</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="696"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="705"/>
<source>{0} (ignored)</source>
<translation>{0} (ignoriert)</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="588"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="597"/>
<source>Preparing files...</source>
<translation>Bereite Dateien vor...</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="692"/>
<source>Enter the maximum allowed code complexity (McCabe: 10)</source>
<translation>Gib die maximal erlaubte Codekomplexität ein (McCabe: 10)</translation>
</message>
@@ -3488,7 +3488,7 @@
<translation>Fehler</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="630"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="639"/>
<source>Transferring data...</source>
<translation>Übertrage Daten...</translation>
</message>
@@ -3563,37 +3563,37 @@
<translation>Erwartete Imports:</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="647"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="666"/>
<source>Code Complexity</source>
<translation>Code-Komplexität</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="780"/>
<source>&Start</source>
<translation>&Starten</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="771"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="790"/>
<source>&Fix Selected</source>
<translation>Ausgewählte &beheben</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="813"/>
<source>&Load Defaults</source>
<translation>Standards &laden</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="804"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="823"/>
<source>St&ore Defaults</source>
<translation>Standards s&peichern</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="814"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/>
<source>&Reset Defaults</source>
<translation>Standards lösc&hen</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="747"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="756"/>
<source>No files found (check your ignore list).</source>
<translation>Keine Dateien gefunden (überprüfe die Ignorierliste).</translation>
</message>
@@ -3623,27 +3623,27 @@
<translation>Drücken, um die ausgwählten Einträge zu löschen</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="666"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="685"/>
<source>Max. McCabe Complexity:</source>
<translation>Max. McCabe Komplexität:</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="689"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="708"/>
<source>Max. Line Complexity:</source>
<translation>Max. Komplexität pro Zeile:</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="715"/>
<source>Enter the maximum complexity (number of nodes) for a line of code</source>
<translation>Gib die maximal zulässige Komplexitäte einer Zeile an (Anzahl Instruktionen)</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="712"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="731"/>
<source>Max. Line Complexity Score:</source>
<translation>Max. mittlere Komplexität:</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="738"/>
<source>Enter the maximum allowed median for line complexity</source>
<translation>Gib den maximal zulässigen Wert für die mittlere Zeilenkomplexität ein</translation>
</message>
@@ -3677,6 +3677,21 @@
<source>Max. Documentation Line Length:</source>
<translation>Max. Dokumentationszeilenlänge:</translation>
</message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="647"/>
+ <source>Commented Code</source>
+ <translation>Auskommentierter Code</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="653"/>
+ <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source>
+ <translation>Auswählen, um agressiver nach auskommentiertem Code zu suchen. Dies erhöhte die Rate fehlerhafter Erkennungen.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="656"/>
+ <source>Search aggressively</source>
+ <translation>Agressive Suche</translation>
+ </message>
</context>
<context>
<name>CodeStyleCheckerPlugin</name>
@@ -3742,142 +3757,142 @@
<context>
<name>CodeStyleFixer</name>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="675"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="678"/>
<source>Triple single quotes converted to triple double quotes.</source>
<translation>Dreifache Einfachanführungszeichen in dreifache Doppelanführungszeichen umgewandelt.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="678"/>
- <source>Introductory quotes corrected to be {0}"""</source>
- <translation>Einleitende Anführungszeichen in {0}""" korrigiert</translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="681"/>
- <source>Single line docstring put on one line.</source>
- <translation>Einzeiligen Docstring auf eine Zeile gebracht.</translation>
+ <source>Introductory quotes corrected to be {0}"""</source>
+ <translation>Einleitende Anführungszeichen in {0}""" korrigiert</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="684"/>
+ <source>Single line docstring put on one line.</source>
+ <translation>Einzeiligen Docstring auf eine Zeile gebracht.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="687"/>
<source>Period added to summary line.</source>
<translation>Punkt an die Zusammenfassungszeile angefügt.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="711"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="714"/>
<source>Blank line before function/method docstring removed.</source>
<translation>Leerzeile vor Funktions-/Methodendocstring entfernt.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="690"/>
- <source>Blank line inserted before class docstring.</source>
- <translation>Leerzeile vor Klassendocstring eingefügt.</translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="693"/>
- <source>Blank line inserted after class docstring.</source>
- <translation>Leerzeile nach Klassendocstring eingefügt.</translation>
+ <source>Blank line inserted before class docstring.</source>
+ <translation>Leerzeile vor Klassendocstring eingefügt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="696"/>
- <source>Blank line inserted after docstring summary.</source>
- <translation>Leerzeile nach Docstring Zusammenfassung eingefügt.</translation>
+ <source>Blank line inserted after class docstring.</source>
+ <translation>Leerzeile nach Klassendocstring eingefügt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="699"/>
- <source>Blank line inserted after last paragraph of docstring.</source>
- <translation>Leerzeile nach letztem Abschnitt des Docstring eingefügt.</translation>
+ <source>Blank line inserted after docstring summary.</source>
+ <translation>Leerzeile nach Docstring Zusammenfassung eingefügt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="702"/>
- <source>Leading quotes put on separate line.</source>
- <translation>Einleitende Anführungszeichen auf separate Zeile gesetzt.</translation>
+ <source>Blank line inserted after last paragraph of docstring.</source>
+ <translation>Leerzeile nach letztem Abschnitt des Docstring eingefügt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="705"/>
- <source>Trailing quotes put on separate line.</source>
- <translation>Schließende Anführungszeichen auf separate Zeile gesetzt.</translation>
+ <source>Leading quotes put on separate line.</source>
+ <translation>Einleitende Anführungszeichen auf separate Zeile gesetzt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="708"/>
+ <source>Trailing quotes put on separate line.</source>
+ <translation>Schließende Anführungszeichen auf separate Zeile gesetzt.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="711"/>
<source>Blank line before class docstring removed.</source>
<translation>Leerzeile vor Klassendocstring entfernt.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="714"/>
- <source>Blank line after class docstring removed.</source>
- <translation>Leerzeile nach Klassendocstring entfernt.</translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="717"/>
- <source>Blank line after function/method docstring removed.</source>
- <translation>Leerzeile nach Funktions-/Methodendocstring entfernt.</translation>
+ <source>Blank line after class docstring removed.</source>
+ <translation>Leerzeile nach Klassendocstring entfernt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="720"/>
- <source>Blank line after last paragraph removed.</source>
- <translation>Leerzeile nach letzten Abschnitt entfernt.</translation>
+ <source>Blank line after function/method docstring removed.</source>
+ <translation>Leerzeile nach Funktions-/Methodendocstring entfernt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="723"/>
- <source>Tab converted to 4 spaces.</source>
- <translation>Tabulator in 4 Leerzeichen gewandelt.</translation>
+ <source>Blank line after last paragraph removed.</source>
+ <translation>Leerzeile nach letzten Abschnitt entfernt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="726"/>
- <source>Indentation adjusted to be a multiple of four.</source>
- <translation>Einrückung auf ein Vielfaches von vier korrigiert.</translation>
+ <source>Tab converted to 4 spaces.</source>
+ <translation>Tabulator in 4 Leerzeichen gewandelt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="729"/>
- <source>Indentation of continuation line corrected.</source>
- <translation>Einrückung der Fortsetzungszeile korrigiert.</translation>
+ <source>Indentation adjusted to be a multiple of four.</source>
+ <translation>Einrückung auf ein Vielfaches von vier korrigiert.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="732"/>
- <source>Indentation of closing bracket corrected.</source>
- <translation>Einrückung der schließenden Klammer korrigiert.</translation>
+ <source>Indentation of continuation line corrected.</source>
+ <translation>Einrückung der Fortsetzungszeile korrigiert.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="735"/>
- <source>Missing indentation of continuation line corrected.</source>
- <translation>Fehlende Einrückung der Fortsetzungszeile korrigiert.</translation>
+ <source>Indentation of closing bracket corrected.</source>
+ <translation>Einrückung der schließenden Klammer korrigiert.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="738"/>
- <source>Closing bracket aligned to opening bracket.</source>
- <translation>Schließende Klammer an öffnender Klammer ausgerichtet.</translation>
+ <source>Missing indentation of continuation line corrected.</source>
+ <translation>Fehlende Einrückung der Fortsetzungszeile korrigiert.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="741"/>
- <source>Indentation level changed.</source>
- <translation>Einrückungsebene geändert.</translation>
+ <source>Closing bracket aligned to opening bracket.</source>
+ <translation>Schließende Klammer an öffnender Klammer ausgerichtet.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="744"/>
- <source>Indentation level of hanging indentation changed.</source>
- <translation>Einrückungsebene der hängenden Einrückung geändert.</translation>
+ <source>Indentation level changed.</source>
+ <translation>Einrückungsebene geändert.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="747"/>
+ <source>Indentation level of hanging indentation changed.</source>
+ <translation>Einrückungsebene der hängenden Einrückung geändert.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="750"/>
<source>Visual indentation corrected.</source>
<translation>Visuelle Einrückung korrigiert.</translation>
</message>
<message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="765"/>
+ <source>Extraneous whitespace removed.</source>
+ <translation>Überzählige Leerzeichen gelöscht.</translation>
+ </message>
+ <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="762"/>
- <source>Extraneous whitespace removed.</source>
- <translation>Überzählige Leerzeichen gelöscht.</translation>
- </message>
- <message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="759"/>
<source>Missing whitespace added.</source>
<translation>Fehlende Leerzeichen eingefügt.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="765"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="768"/>
<source>Whitespace around comment sign corrected.</source>
<translation>Leerzeichen um Kommentarzeichen korrigiert.</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="769"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="772"/>
<source>%n blank line(s) inserted.</source>
<translation>
<numerusform>Eine Leerzeile eingefügt.</numerusform>
@@ -3885,7 +3900,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="772"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="775"/>
<source>%n superfluous lines removed</source>
<translation>
<numerusform>Eine überflüssige Zeile gelöscht</numerusform>
@@ -3893,77 +3908,77 @@
</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="776"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="779"/>
<source>Superfluous blank lines removed.</source>
<translation>Überflüssige Leerzeilen gelöscht.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="779"/>
- <source>Superfluous blank lines after function decorator removed.</source>
- <translation>Überflüssige Leerzeilen nach Funktionsdekorator gelöscht.</translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="782"/>
- <source>Imports were put on separate lines.</source>
- <translation>Imports wurden auf separate Zeilen verteilt.</translation>
+ <source>Superfluous blank lines after function decorator removed.</source>
+ <translation>Überflüssige Leerzeilen nach Funktionsdekorator gelöscht.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="785"/>
- <source>Long lines have been shortened.</source>
- <translation>Lange Zeilen wurden gekürzt.</translation>
+ <source>Imports were put on separate lines.</source>
+ <translation>Imports wurden auf separate Zeilen verteilt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="788"/>
+ <source>Long lines have been shortened.</source>
+ <translation>Lange Zeilen wurden gekürzt.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="791"/>
<source>Redundant backslash in brackets removed.</source>
<translation>Redundante Backslashes in Klammern entfernt.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="794"/>
- <source>Compound statement corrected.</source>
- <translation>Compund Statement korrigiert.</translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="797"/>
- <source>Comparison to None/True/False corrected.</source>
- <translation>Vergleich mit None/True/False korrigiert.</translation>
+ <source>Compound statement corrected.</source>
+ <translation>Compund Statement korrigiert.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="800"/>
- <source>'{0}' argument added.</source>
- <translation>'{0}' Argument hinzugefügt.</translation>
+ <source>Comparison to None/True/False corrected.</source>
+ <translation>Vergleich mit None/True/False korrigiert.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="803"/>
- <source>'{0}' argument removed.</source>
- <translation>'{0}' Argument entfernt.</translation>
+ <source>'{0}' argument added.</source>
+ <translation>'{0}' Argument hinzugefügt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="806"/>
- <source>Whitespace stripped from end of line.</source>
- <translation>Leerzeichen am Zeilenende entfernt.</translation>
+ <source>'{0}' argument removed.</source>
+ <translation>'{0}' Argument entfernt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="809"/>
- <source>newline added to end of file.</source>
- <translation>Zeilenvorschub am Dateiende angefügt.</translation>
+ <source>Whitespace stripped from end of line.</source>
+ <translation>Leerzeichen am Zeilenende entfernt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="812"/>
- <source>Superfluous trailing blank lines removed from end of file.</source>
- <translation>Überflüssige Leerzeilen am Dateiende gelöscht.</translation>
+ <source>newline added to end of file.</source>
+ <translation>Zeilenvorschub am Dateiende angefügt.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="815"/>
+ <source>Superfluous trailing blank lines removed from end of file.</source>
+ <translation>Überflüssige Leerzeilen am Dateiende gelöscht.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="818"/>
<source>'<>' replaced by '!='.</source>
<translation>„<>“ durch „!=“ ersetzt.</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="819"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="822"/>
<source>Could not save the file! Skipping it. Reason: {0}</source>
<translation>Datei konnte nicht gespeichert werden! Ursache: {0}</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="908"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="911"/>
<source> no message defined for code '{0}'</source>
<translation> keine Nachricht für '{0}' definiert</translation>
</message>
@@ -4489,27 +4504,27 @@
<translation><p>Das conda Programm hat einen Fehler gemeldet.</p><p>{0}</p></translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="506"/>
+ <location filename="../CondaInterface/Conda.py" line="512"/>
<source>Uninstall Packages</source>
<translation>Pakete deinstallieren</translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="506"/>
+ <location filename="../CondaInterface/Conda.py" line="512"/>
<source>Do you really want to uninstall these packages and their dependencies?</source>
<translation>Wollen sie wirklich diese Pakete und alle ihre Abhängigkeiten deinstallieren?</translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="705"/>
+ <location filename="../CondaInterface/Conda.py" line="711"/>
<source>conda exited with an error ({0}).</source>
<translation>conda endete mit einem Fehler ({0}).</translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="713"/>
+ <location filename="../CondaInterface/Conda.py" line="719"/>
<source>conda did not finish within 30 seconds.</source>
<translation>conda endete nicht innerhalb 30 Sekunden.</translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="716"/>
+ <location filename="../CondaInterface/Conda.py" line="722"/>
<source>conda could not be started.</source>
<translation>conda konnte nicht gestarted werden.</translation>
</message>
@@ -18741,172 +18756,172 @@
<context>
<name>Git</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="208"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/>
<source>The git process finished with the exit code {0}</source>
<translation>Der git-Prozess endete mit dem Code {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1553"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1556"/>
<source>The git process did not finish within 30s.</source>
<translation>Der git-Prozess endete nicht innerhalb von 30s.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="215"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/>
<source>Could not start the git executable.</source>
<translation>Das git Programm konnte nicht gestartet werden.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="243"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/>
<source>Create project repository</source>
<translation>Projektrepository anlegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="243"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/>
<source>The project repository could not be created.</source>
<translation>Das Projektrepository konnte nicht erzeugt werden.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="271"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/>
<source>Creating Git repository</source>
<translation>Erzeuge Git Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="286"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/>
<source>Adding files to Git repository</source>
<translation>Füge Dateien dem Git-Repository hinzu</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="297"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/>
<source>Initial commit to Git repository</source>
<translation>Erstes Commit für das Git-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="327"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/>
<source>Cloning project from a Git repository</source>
<translation>Klone das Projekt aus dem Git-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/>
<source>Commit Changes</source>
<translation>Änderungen einpflegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="475"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/>
<source>Committing changes to Git repository</source>
<translation>Änderungen in Git-Repository einpflegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="529"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/>
<source>Synchronizing with the Git repository</source>
<translation>Gleiche mit dem Git-Repository ab</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="576"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/>
<source>Adding files/directories to the Git repository</source>
<translation>Füge Dateien/Verzeichnisse dem Git-Repository hinzu</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="650"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/>
<source>Removing files/directories from the Git repository</source>
<translation>Lösche Dateien/Verzeichnisse aus dem Git-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="707"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/>
<source>Renaming {0}</source>
<translation>Benenne {0} um</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="830"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/>
<source>Unstage files/directories</source>
<translation>Vormerkung rückgängig machen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="881"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/>
<source>Revert changes</source>
<translation>Änderungen rückgängig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="872"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="881"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/>
<source>Do you really want to revert all changes of the project?</source>
<translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="887"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/>
<source>Reverting changes</source>
<translation>Mache Änderungen rückgängig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="939"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/>
<source>Merging</source>
<translation>Zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="964"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/>
<source>Master branch head</source>
<translation>Kopf des Hauptzweiges</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1195"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1198"/>
<source>Git Command</source>
<translation>Git Befehl</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1281"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1284"/>
<source><tr><td><b>Commit</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Änderungs ID</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1285"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1288"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1289"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1292"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1293"/>
- <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
- <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1296"/>
- <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
- <translation><tr><td><b>Autor</b></td><td>{0} &lt;{1}&gt;</td></tr></translation>
+ <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
+ <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/>
- <source><tr><td><b>Date</b></td><td>{0}</td></tr></source>
- <translation><tr><td><b>Datum</b></td><td>{0}</td></tr></translation>
+ <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
+ <translation><tr><td><b>Autor</b></td><td>{0} &lt;{1}&gt;</td></tr></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/>
- <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
- <translation><tr><td><b>Bereitsteller</b></td><td>{0} &lt;{1}&gt;</td></tr></translation>
+ <source><tr><td><b>Date</b></td><td>{0}</td></tr></source>
+ <translation><tr><td><b>Datum</b></td><td>{0}</td></tr></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/>
- <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source>
- <translation><tr><td><b>Bereitstellungsdatum</b></td><td>{0}</td></tr></translation>
+ <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
+ <translation><tr><td><b>Bereitsteller</b></td><td>{0} &lt;{1}&gt;</td></tr></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/>
+ <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source>
+ <translation><tr><td><b>Bereitstellungsdatum</b></td><td>{0}</td></tr></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/>
<source><tr><td><b>Subject</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Betreff</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1315"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1318"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Git V.</b></td><td>{0}</td></tr>
@@ -18921,442 +18936,442 @@
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1380"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/>
<source>Create {0} file</source>
<translation>Erzeuge {0}-Datei</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1380"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1439"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/>
<source>Git Copy</source>
<translation>Git Kopiere</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1424"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/>
<source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source>
<translation><p>Das Kopieren des Verzeichnisses <b>{0}</b> ist fehlgeschlagen.</p><p>Ursache: {1}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1439"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/>
<source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source>
<translation><p>Das Kopieren der Datei <b>{0}</b> ist fehlgeschlagen.</p><p>Ursache: {1}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2612"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2615"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1622"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1625"/>
<source>Git Side-by-Side Difference</source>
<translation>Git Unterschiede nebeneinander anzeigen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1622"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1625"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1671"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1674"/>
<source>Fetching from a remote Git repository</source>
<translation>Änderungen von einem entfernten Git Repository abholen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1709"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1712"/>
<source>Pulling from a remote Git repository</source>
<translation>Pull von einem entfernten Git-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1750"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1753"/>
<source>Pushing to a remote Git repository</source>
<translation>Push in ein entferntes Git-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1778"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1781"/>
<source>Committing failed merge</source>
<translation>Fehlgeschlagene Zusammenführung abschließen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1805"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1808"/>
<source>Aborting uncommitted/failed merge</source>
<translation>Zusammenführung abbrechen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1955"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1958"/>
<source>Tagging in the Git repository</source>
<translation>Marke im Git-Repository setzen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2181"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2184"/>
<source>Branching in the Git repository</source>
<translation>Zweig im Git-Repository erzeugen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2221"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2224"/>
<source>Delete Remote Branch</source>
<translation>Entfernten Zweig löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2242"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2245"/>
<source>Current Branch</source>
<translation>Aktueller Zweig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2242"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2245"/>
<source><p>The current branch is <b>{0}</b>.</p></source>
<translation><p>Der aktuelle Zweig ist <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2306"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2309"/>
<source>Create Bundle</source>
<translation>Paket erzeugen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2271"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2274"/>
<source>Git Bundle Files (*.bundle)</source>
<translation>Git Paketdateien (*.bundle)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2288"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2291"/>
<source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Die Git Paketdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2336"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2339"/>
<source>Verify Bundle</source>
<translation>Paket verifizieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2465"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2468"/>
<source>Git Bundle Files (*.bundle);;All Files (*)</source>
<translation>Git Paketdateien (*.bundle);;Alle Dateien (*)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2366"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2369"/>
<source>List Bundle Heads</source>
<translation>Köpfe des Pakets anzeigen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2465"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2468"/>
<source>Apply Bundle</source>
<translation>Paket anwenden</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2488"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2491"/>
<source>Applying a bundle file (fetch)</source>
<translation>Paketdatei anwenden (fetch)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2515"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2518"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Ungültiger Bisect Unterbefehl ({0}).</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2716"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/>
<source>Git Bisect ({0})</source>
<translation>Git-Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2612"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2615"/>
<source>Process Generation Error</source>
<translation>Fehler beim Prozessstart</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2656"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2659"/>
<source>Create Bisect Replay File</source>
<translation>Erzeuge Bisect Wiederholungsdatei</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2622"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2625"/>
<source>Git Bisect Replay Files (*.replay)</source>
<translation>Git Bisect Wiederholungsdateien (*.replay)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2639"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2642"/>
<source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Die Git Wiederholungsdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2656"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2659"/>
<source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden.<br/>Grund: {1}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2677"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2680"/>
<source>Edit Bisect Replay File</source>
<translation>Bisect Wiederholungsdatei bearbeiten</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2704"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2707"/>
<source>Git Bisect Replay Files (*.replay);;All Files (*)</source>
<translation>Git Bisect Wiederholungsdateien (*.replay);;Alle Dateien (*)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2704"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2707"/>
<source>Bisect Replay</source>
<translation>Bisect wiederholen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3052"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3055"/>
<source>Show Remote Info</source>
<translation>Zeige entfernte Informationen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2931"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2934"/>
<source>Rename Remote Repository</source>
<translation>Entferntes Repository umbenennen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2931"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2934"/>
<source>Enter new name for remote repository:</source>
<translation>Gib einen Namen für das entfernte Repository ein:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3076"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3079"/>
<source>Show Shortlog</source>
<translation>Kurzbeschreibungen anzeigen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3134"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3137"/>
<source>Cherry-pick</source>
<translation>Aussuchen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3164"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3167"/>
<source>Copy Changesets (Continue)</source>
<translation>Änderungssätze kopieren (Fortsetzung)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3189"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3192"/>
<source>Copy Changesets (Quit)</source>
<translation>Änderungssätze kopieren (Beenden)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3218"/>
<source>Copy Changesets (Cancel)</source>
<translation>Änderungssätze kopieren (Abbrechen)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3294"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3297"/>
<source>Saving stash</source>
<translation>Ablage sichern</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3493"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3496"/>
<source>Show Stash</source>
<translation>Ablage anzeigen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3493"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3496"/>
<source>Select a stash (empty for latest stash):</source>
<translation>Wähle eine Ablage (leer für aktuellste):</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3405"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3408"/>
<source>Restore Stash</source>
<translation>Ablage wiederherstellen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3419"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/>
<source>Restoring stash</source>
<translation>Stelle Ablage wieder her</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3453"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3456"/>
<source>Create Branch</source>
<translation>Zweig erzeugen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3443"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3446"/>
<source>Enter a branch name to restore a stash to:</source>
<translation>Gib einen Zweignamen für die Ablagewiederherstellung ein:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3468"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3471"/>
<source>Creating branch</source>
<translation>Erzeuge Zweig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3502"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3505"/>
<source>Delete Stash</source>
<translation>Ablage löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3502"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3505"/>
<source>Do you really want to delete the stash <b>{0}</b>?</source>
<translation>Soll die Ablage <b>{0}</b> wirklich gelöscht werden?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/>
<source>Deleting stash</source>
<translation>Lösche Ablage</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3536"/>
<source>Delete All Stashes</source>
<translation>Alle Ablagen löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3536"/>
<source>Do you really want to delete all stashes?</source>
<translation>Sollen wirklich alle Ablagen gelöscht werden?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3541"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3544"/>
<source>Deleting all stashes</source>
<translation>Lösche alle Ablagen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3613"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3616"/>
<source>Showing the combined configuration settings</source>
<translation>Zeige die kombinierten Einstellungen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3639"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3642"/>
<source>Verifying the integrity of the Git repository</source>
<translation>Verifiziere die Integrität des Git-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3664"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3667"/>
<source>Performing Repository Housekeeping</source>
<translation>Führe Repository Reorganisation durch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3707"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3710"/>
<source><tr><td><b>Statistics</b></td></tr></source>
<translation><tr><td><b>Statistik</b></td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3708"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3711"/>
<source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source>
<translation><tr><td>Anzahl loser Objekte: </td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3712"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3715"/>
<source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source>
<translation><tr><td>Festplattenverbrauch durch lose Objekte: </td><td>{0} KiB</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3716"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3719"/>
<source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source>
<translation><tr><td>Anzahl gepackter Objekte: </td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3720"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3723"/>
<source><tr><td>Number of packs: </td><td>{0}</td></tr></source>
<translation><tr><td>Anzahl Pakete: </td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3724"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/>
<source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source>
<translation><tr><td>Festplattenverbrauch durch lose Objekte </td><td>{0} KiB</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3731"/>
<source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source>
<translation><tr><td>Gepackte Objekte bereit zum Löschen: </td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3735"/>
<source><tr><td>Garbage files: </td><td>{0}</td></tr></source>
<translation><tr><td>Wertlose Dateien: </td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3739"/>
<source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source>
<translation><tr><td>Festplattenverbrauch durch wertlose Dateien: </td><td>{0} KiB</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3742"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/>
<source><p><b>No statistics available.</b></p></source>
<translation><p><b>Keine Statistik verfügbar.</b></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3807"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3810"/>
<source>Creating Archive</source>
<translation>Erzeuge Archiv</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="498"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/>
<source>Switch</source>
<translation>Umschalten</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="498"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/>
<source><p>Do you really want to switch to <b>{0}</b>?</p></source>
<translation><p>Soll wirklich auf <b>{0}</b> umgeschaltet werden?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1838"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1841"/>
<source>Applying patch</source>
<translation>Patch anwenden</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1870"/>
- <source>Check patch files</source>
- <translation>Patchdateien prüfen</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1873"/>
+ <source>Check patch files</source>
+ <translation>Patchdateien prüfen</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1876"/>
<source>Apply patch files</source>
<translation>Patchdateien anwenden</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3850"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3853"/>
<source>Add Submodule</source>
<translation>Submodul hinzufügen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3918"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3921"/>
<source>List Submodules</source>
<translation>Submodule auflisten</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3918"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3921"/>
<source>No submodules defined for the project.</source>
<translation>Für das Projekt sind keine Submodule definiert.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3933"/>
- <source>All</source>
- <translation>Alle</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3936"/>
+ <source>All</source>
+ <translation>Alle</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3939"/>
<source>Submodule Path</source>
<translation>Submodulpfad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3936"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3939"/>
<source>Select a submodule path:</source>
<translation>Wähle einen Submodulpfad:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3988"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3991"/>
<source>Initialize Submodules</source>
<translation>Submodule initialisieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4025"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/>
<source>Unregister Submodules</source>
<translation>Submodule deregistrieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4105"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4108"/>
<source>Update Submodules</source>
<translation>Submodule aktualisieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4139"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4142"/>
<source>Synchronize Submodules</source>
<translation>Submodule synchronisieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4197"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4200"/>
<source>Submodules Summary</source>
<translation>Submodulüberblick</translation>
</message>
@@ -30928,447 +30943,447 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1771"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/>
<source>The hg process did not finish within 30s.</source>
<translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/>
<source>Create project repository</source>
<translation>Projektrepository anlegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/>
<source>The project repository could not be created.</source>
<translation>Das Projektrepository konnte nicht erzeugt werden.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="315"/>
<source>Creating Mercurial repository</source>
<translation>Lege Mercurial-Repository an</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="329"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/>
<source>Initial commit to Mercurial repository</source>
<translation>Erstes Commit für das Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="372"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="374"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Klone das Projekt aus dem Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="628"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Gleiche mit dem Mercurial-Repository ab</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="678"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="747"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/>
<source>Renaming {0}</source>
<translation>Benenne {0} um</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/>
<source>Reverting changes</source>
<translation>Mache Änderungen rückgängig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1048"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/>
<source>Merging</source>
<translation>Zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1348"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/>
<source>Mercurial command</source>
<translation>Mercurial-Befehl</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1532"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/>
<source>Copying {0}</source>
<translation>Kopiere {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Pull von einem entfernten Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Push in ein entferntes Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Erzeuge Zweig im Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Verifiziere die Integrität des Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/>
<source>Showing the combined configuration settings</source>
<translation>Zeige die kombinierten Einstellungen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/>
<source>Showing aliases for remote repositories</source>
<translation>Zeige Namen für entfernte Repositorys</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/>
<source>Recovering from interrupted transaction</source>
<translation>Setze abgebrochene Transaktion zurück</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/>
<source>Shall the working directory be updated?</source>
<translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/>
<source>Showing current branch</source>
<translation>Zeige aktuellen Zweig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/>
<source>Create changegroup</source>
<translation>Änderungsgruppe erzeugen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2655"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/>
<source>Apply changegroups</source>
<translation>Änderungsgruppen anwenden</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Ungültiger Bisect Unterbefehl ({0}).</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial-Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/>
<source>Preview changegroup</source>
<translation>Änderungsgruppe ansehen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/>
<source>Identifying project directory</source>
<translation>Projektverzeichnis identifizieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
<source>Create .hgignore file</source>
<translation>.hgignore-Datei erstellen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Lösche Dateien nur aus dem Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial-Änderungsgruppendateien (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2634"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/>
<source>Backing out changeset</source>
<translation>Änderungssatz umkehren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
<source>No revision given. Aborting...</source>
<translation>Keine Revision angegeben. Abbruch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2816"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/>
<source>Rollback last transaction</source>
<translation>Letzte Transaktion zurücksetzen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="542"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
<source>Committing changes to Mercurial repository</source>
<translation>Pflege Änderungen in das Mercurial-Repository ein</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3521"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/>
<source>Mercurial Command Server</source>
<translation>Mercurial-Befehlsserver</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3376"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/>
<source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
<translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3521"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/>
<source>Import Patch</source>
<translation>Patch importieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2936"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/>
<source>Export Patches</source>
<translation>Patches exportieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/>
<source>Change Phase</source>
<translation>Phase ändern</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/>
<source>Copy Changesets</source>
<translation>Änderungssätze kopieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3088"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/>
<source>Copy Changesets (Continue)</source>
<translation>Änderungssätze kopieren (Fortsetzung)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/>
<source>Add Sub-repository</source>
<translation>Unterrepository hinzufügen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3227"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3298"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/>
<source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
<translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3298"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/>
<source>Remove Sub-repositories</source>
<translation>Unterrepositorys löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3267"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
<source>Commit Changes</source>
<translation>Änderungen einpflegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/>
<source>Revert changes</source>
<translation>Änderungen rückgängig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="982"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/>
<source>Do you really want to revert all changes of the project?</source>
<translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3143"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
<source>Create Unversioned Archive</source>
<translation>Erzeuge nicht versioniertes Archiv</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
<source>Mercurial Side-by-Side Difference</source>
<translation>Mercurial Unterschiede nebeneinander anzeigen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="941"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="943"/>
<source>Tagging in the Mercurial repository</source>
<translation>Marke im Mercurial-Repository setzen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/>
<source>Created new branch <{0}>.</source>
<translation>Neuer Zweig <{0}> wurde angelegt.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/>
<source>Current branch tip</source>
<translation>Spitze des aktuellen Zweigs</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3639"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/>
<source>Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3661"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
<source>Delete Bookmark</source>
<translation>Lesezeichen löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3661"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
<source>Select the bookmark to be deleted:</source>
<translation>Wähle das zu löschende Lesezeichen aus:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
<source>Delete Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
<source>Rename Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen umbenennen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/>
<source>Move Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen verschieben</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3841"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/>
<source>Pull Bookmark</source>
<translation>Lesezeichen herunterladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3841"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/>
<source>Select the bookmark to be pulled:</source>
<translation>Wähle das herunterzuladende Lesezeichen:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/>
<source>Push Bookmark</source>
<translation>Lesezeichen hochladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/>
<source>Select the bookmark to be push:</source>
<translation>Wähle das hochzuladende Lesezeichen:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3897"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/>
<source>Re-Merge</source>
<translation>Neu zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1085"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/>
<source>Do you really want to re-merge these files or directories?</source>
<translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/>
<source>Do you really want to re-merge the project?</source>
<translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/>
<source>Re-Merging</source>
<translation>Neu zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/>
- <source>Marking as 'unresolved'</source>
- <translation>Markiere als 'nicht aufgelöst'</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/>
+ <source>Marking as 'unresolved'</source>
+ <translation>Markiere als 'nicht aufgelöst'</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
<source>Marking as 'resolved'</source>
<translation>Markiere als 'aufgelöst'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
<source>Delete All Backups</source>
<translation>Alle Backups löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
<source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source>
<translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/>
<source>Canceling uncommitted merge</source>
<translation>Breche Zusammenführung ab</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/>
<source>Copy Changesets (Stop)</source>
<translation>Änderungssätze kopieren (Stopp)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/>
<source>Copy Changesets (Abort)</source>
<translation>Änderungssätze kopieren (Abbruch)</translation>
</message>
@@ -33979,12 +33994,12 @@
<translation>Phase ändern</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2230"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2231"/>
<source>Copy Changesets</source>
<translation>Änderungssätze kopieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2571"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/>
<source>The project should be reread. Do this now?</source>
<translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation>
</message>
@@ -34009,7 +34024,7 @@
<translation>Ausgewählte Revision mit einer Marke versehen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2302"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303"/>
<source>Switch</source>
<translation>Umschalten</translation>
</message>
@@ -34074,12 +34089,12 @@
<translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
<source>Find Commit</source>
<translation>Revision finden</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
<source>'{0}' was not found.</source>
<translation>„{0}“ wurde nicht gefunden.</translation>
</message>
@@ -34104,7 +34119,7 @@
<translation>Geheim</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2433"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2434"/>
<source>Pull Changes</source>
<translation>Änderungen herunterladen</translation>
</message>
@@ -34134,12 +34149,12 @@
<translation>Alle Änderungen an ein entferntes Repository hochladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2398"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399"/>
<source>Fetch Changes</source>
<translation>Änderungen abholen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2479"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2480"/>
<source>Strip Changesets</source>
<translation>Änderungssätze löschen</translation>
</message>
@@ -34174,27 +34189,27 @@
<translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2324"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2325"/>
<source>Define Bookmark</source>
<translation>Lesezeichen hinzufügen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2324"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2325"/>
<source>Enter bookmark name for changeset "{0}":</source>
<translation>Gib einen Lesezeichennamen für den Änderungssatz "{0}" ein:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2347"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
<source>Move Bookmark</source>
<translation>Lesezeichen verschieben</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2347"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
<source>Select the bookmark to be moved to changeset "{0}":</source>
<translation>Wähle ein Lesezeichen aus, das zum Änderungssatz "{0}" verschoben werden soll:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2288"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2289"/>
<source>Select bookmark to switch to (leave empty to use revision):</source>
<translation>Wähle das Lesezeichen aus, auf das umgeschaltet werden soll (leer lassen, um Revision zu verwenden):</translation>
</message>
@@ -34256,7 +34271,7 @@
<p>Dies erzeugt eine Änderungsgruppendatei für die ausgewählten Änderungssätze. Ist keine Änderung ausgewählt, werden alle in die Datei geschrieben. Ist ein Änderungssatz ausgewählt, so wird er als Basis verwendet. Ansonsten wird die kleinste, ausgewählte Revision als Basis verwendet und alle anderen werden in die Datei geschrieben. Zeigt der Dialog ausgehende Änderungssätze an, so werden alle ausgewählten in die Datei geschrieben.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2571"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/>
<source>Apply Changegroup</source>
<translation>Änderungsgruppe anwenden</translation>
</message>
@@ -34306,52 +34321,52 @@
<translation><a href="sbsdiff:{0}_{1}">Unterschiede nebeneinander</a></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1704"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1705"/>
<source>Pull Selected Changes</source>
<translation>Ausgewählte Änderungen herunterladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1705"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/>
<source>Fetch Selected Changes</source>
<translation>Ausgewählte Änderungen herunterladen und zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2757"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/>
<source>Differences</source>
<translation>Unterschiede</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2767"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
<source>Differences to Parent {0}</source>
<translation>Unterschiede zu Vorgänger {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2784"/>
<source>Diff to Parent {0}{1}</source>
<translation>Diff zu Vorgänger {0}{1}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2809"/>
<source>There is no difference.</source>
<translation>Es gibt keinen Unterschied.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2951"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/>
<source>Save Diff</source>
<translation>Diff speichern</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2918"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2919"/>
<source>Patch Files (*.diff)</source>
<translation>Patchdateien (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2935"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2951"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation>
</message>
@@ -34361,7 +34376,7 @@
<translation><a href="save:me">Speichern</a></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2756"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2757"/>
<source>Generating differences ...</source>
<translation>Erzeuge Unterschiede ...</translation>
</message>
@@ -47654,7 +47669,7 @@
<translation>Tuple mit einem Element gefunden</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="670"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="673"/>
<source>{0}: {1}</source>
<translation>{0}: {1}</translation>
</message>
@@ -47853,6 +47868,11 @@
<source>do not call setattr with a constant attribute value</source>
<translation>verwende setattr nicht mit einem konstanten Attribut</translation>
</message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="670"/>
+ <source>commented code lines should be removed</source>
+ <translation>auskommentierte Codezeilen sollten entfernt werden</translation>
+ </message>
</context>
<context>
<name>MouseClickDialog</name>
@@ -89103,24 +89123,24 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1414"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr>
<tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr></source>
@@ -89129,24 +89149,24 @@
<tr><td><b>Committed um</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation><tr><td><b>Spitze</b></td><td></td></tr>
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2073"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr>
@@ -89157,12 +89177,12 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -89173,14 +89193,14 @@
<translation></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/>
<source><tr><td><b>Head #{0}</b></td><td></td></tr>
</source>
<translation><tr><td><b>Kopf #{0}</b></td><td></td></tr>
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
</source>
<translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr>
