--- a/eric6/i18n/eric6_de.ts Fri Aug 30 18:54:30 2019 +0200
+++ b/eric6/i18n/eric6_de.ts Fri Aug 30 18:56:45 2019 +0200
@@ -11047,427 +11047,427 @@
<context>
<name>Editor</name>
<message>
- <location filename="../QScintilla/Editor.py" line="2944"/>
+ <location filename="../QScintilla/Editor.py" line="2945"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3117"/>
+ <location filename="../QScintilla/Editor.py" line="3118"/>
<source>Save File</source>
<translation>Datei sichern</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="743"/>
+ <location filename="../QScintilla/Editor.py" line="744"/>
<source>Undo</source>
<translation>Rückgängig</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="746"/>
+ <location filename="../QScintilla/Editor.py" line="747"/>
<source>Redo</source>
<translation>Wiederherstellen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="753"/>
+ <location filename="../QScintilla/Editor.py" line="754"/>
<source>Cut</source>
<translation>Ausschneiden</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="756"/>
+ <location filename="../QScintilla/Editor.py" line="757"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="759"/>
+ <location filename="../QScintilla/Editor.py" line="760"/>
<source>Paste</source>
<translation>Einfügen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="767"/>
+ <location filename="../QScintilla/Editor.py" line="768"/>
<source>Indent</source>
<translation>Einrücken</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="770"/>
+ <location filename="../QScintilla/Editor.py" line="771"/>
<source>Unindent</source>
<translation>Einrücken rückgängig</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="773"/>
+ <location filename="../QScintilla/Editor.py" line="774"/>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="776"/>
+ <location filename="../QScintilla/Editor.py" line="777"/>
<source>Uncomment</source>
<translation>Kommentar entfernen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="860"/>
+ <location filename="../QScintilla/Editor.py" line="861"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="866"/>
+ <location filename="../QScintilla/Editor.py" line="867"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="869"/>
+ <location filename="../QScintilla/Editor.py" line="870"/>
<source>Save As...</source>
<translation>Speichern unter...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="788"/>
- <source>Select all</source>
- <translation>Alles auswählen</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="789"/>
+ <source>Select all</source>
+ <translation>Alles auswählen</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="790"/>
<source>Deselect all</source>
<translation>Auswahl aufheben</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="786"/>
+ <location filename="../QScintilla/Editor.py" line="787"/>
<source>Select to brace</source>
<translation>Zur Klammer auswählen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="885"/>
+ <location filename="../QScintilla/Editor.py" line="886"/>
<source>Print</source>
<translation>Drucken</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2501"/>
+ <location filename="../QScintilla/Editor.py" line="2502"/>
<source>Printing...</source>
<translation>Drucke...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2518"/>
+ <location filename="../QScintilla/Editor.py" line="2519"/>
<source>Printing completed</source>
<translation>Drucken beendet</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2520"/>
+ <location filename="../QScintilla/Editor.py" line="2521"/>
<source>Error while printing</source>
<translation>Fehler beim Drucken</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2523"/>
+ <location filename="../QScintilla/Editor.py" line="2524"/>
<source>Printing aborted</source>
<translation>Drucken abgebrochen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6753"/>
+ <location filename="../QScintilla/Editor.py" line="6754"/>
<source>File changed</source>
<translation>Datei geändert</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="932"/>
+ <location filename="../QScintilla/Editor.py" line="933"/>
<source>Check</source>
<translation>Prüfen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2884"/>
+ <location filename="../QScintilla/Editor.py" line="2885"/>
<source>File Modified</source>
<translation>Datei geändert</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="954"/>
- <source>Code metrics...</source>
- <translation>Quelltextmetriken...</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="955"/>
+ <source>Code metrics...</source>
+ <translation>Quelltextmetriken...</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="956"/>
<source>Code coverage...</source>
<translation>Quelltext Abdeckung...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="963"/>
+ <location filename="../QScintilla/Editor.py" line="964"/>
<source>Profile data...</source>
<translation>Profildaten...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="952"/>
+ <location filename="../QScintilla/Editor.py" line="953"/>
<source>Show</source>
<translation>Zeige</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="779"/>
+ <location filename="../QScintilla/Editor.py" line="780"/>
<source>Stream Comment</source>
<translation>Stream Kommentar</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="782"/>
+ <location filename="../QScintilla/Editor.py" line="783"/>
<source>Box Comment</source>
<translation>Box Kommentar</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1805"/>
+ <location filename="../QScintilla/Editor.py" line="1806"/>
<source>Modification of Read Only file</source>
<translation>Änderungsversuch für eine schreibgeschützte Datei</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1805"/>
+ <location filename="../QScintilla/Editor.py" line="1806"/>
<source>You are attempting to change a read only file. Please save to a different file first.</source>
<translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern Sie sie zuerst in eine andere Datei.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1002"/>
+ <location filename="../QScintilla/Editor.py" line="1003"/>
<source>Languages</source>
<translation>Sprachen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="749"/>
+ <location filename="../QScintilla/Editor.py" line="750"/>
<source>Revert to last saved state</source>
<translation>Zurück zum letzten gesichert Zustand</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6472"/>
+ <location filename="../QScintilla/Editor.py" line="6473"/>
<source>Macro Name</source>
<translation>Makro Name</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6472"/>
+ <location filename="../QScintilla/Editor.py" line="6473"/>
<source>Select a macro name:</source>
<translation>Wähle einen Makro Namen:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6543"/>
+ <location filename="../QScintilla/Editor.py" line="6544"/>
<source>Macro files (*.macro)</source>
<translation>Makrodateien (*.macro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6500"/>
+ <location filename="../QScintilla/Editor.py" line="6501"/>
<source>Load macro file</source>
<translation>Lade Makrodatei</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6523"/>
+ <location filename="../QScintilla/Editor.py" line="6524"/>
<source>Error loading macro</source>
<translation>Fehler beim Makro Laden</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6543"/>
+ <location filename="../QScintilla/Editor.py" line="6544"/>
<source>Save macro file</source>
<translation>Makrodatei schreiben</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6560"/>
+ <location filename="../QScintilla/Editor.py" line="6561"/>
<source>Save macro</source>
<translation>Makro speichern</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6576"/>
+ <location filename="../QScintilla/Editor.py" line="6577"/>
<source>Error saving macro</source>
<translation>Fehler beim Makro speichern</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6589"/>
+ <location filename="../QScintilla/Editor.py" line="6590"/>
<source>Start Macro Recording</source>
<translation>Makroaufzeichnung starten</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6615"/>
+ <location filename="../QScintilla/Editor.py" line="6616"/>
<source>Macro Recording</source>
<translation>Makroaufzeichnung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6615"/>
+ <location filename="../QScintilla/Editor.py" line="6616"/>
<source>Enter name of the macro:</source>
<translation>Gib einen Namen für das Makro ein:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1149"/>
+ <location filename="../QScintilla/Editor.py" line="1150"/>
<source>Toggle bookmark</source>
<translation>Lesezeichen setzen/löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1151"/>
+ <location filename="../QScintilla/Editor.py" line="1152"/>
<source>Next bookmark</source>
<translation>Nächstes Lesezeichen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1153"/>
+ <location filename="../QScintilla/Editor.py" line="1154"/>
<source>Previous bookmark</source>
<translation>Vorheriges Lesezeichen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1155"/>
+ <location filename="../QScintilla/Editor.py" line="1156"/>
<source>Clear all bookmarks</source>
<translation>Alle Lesezeichen löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1164"/>
+ <location filename="../QScintilla/Editor.py" line="1165"/>
<source>Toggle breakpoint</source>
<translation>Haltepunkt setzen/löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1174"/>
+ <location filename="../QScintilla/Editor.py" line="1175"/>
<source>Next breakpoint</source>
<translation>Nächster Haltepunkt</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1177"/>
+ <location filename="../QScintilla/Editor.py" line="1178"/>
<source>Previous breakpoint</source>
<translation>Vorheriger Haltepunkt</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1180"/>
+ <location filename="../QScintilla/Editor.py" line="1181"/>
<source>Clear all breakpoints</source>
<translation>Alle Haltepunkte löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1169"/>
+ <location filename="../QScintilla/Editor.py" line="1170"/>
<source>Edit breakpoint...</source>
<translation>Haltepunkt bearbeiten...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5383"/>
+ <location filename="../QScintilla/Editor.py" line="5384"/>
<source>Enable breakpoint</source>
<translation>Haltepunkt aktivieren</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5386"/>
+ <location filename="../QScintilla/Editor.py" line="5387"/>
<source>Disable breakpoint</source>
<translation>Haltepunkt deaktivieren</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5748"/>
+ <location filename="../QScintilla/Editor.py" line="5749"/>
<source>Code Coverage</source>
<translation>Quelltext Abdeckung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5748"/>
+ <location filename="../QScintilla/Editor.py" line="5749"/>
<source>Please select a coverage file</source>
<translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5926"/>
+ <location filename="../QScintilla/Editor.py" line="5927"/>
<source>Profile Data</source>
<translation>Profildaten</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5926"/>
+ <location filename="../QScintilla/Editor.py" line="5927"/>
<source>Please select a profile file</source>
<translation>Bitte wählen Sie eine Datei mit Profildaten</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4573"/>
+ <location filename="../QScintilla/Editor.py" line="4574"/>
<source>Autocompletion</source>
<translation>Automatische Vervollständigung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4573"/>
+ <location filename="../QScintilla/Editor.py" line="4574"/>
<source>Autocompletion is not available because there is no autocompletion source set.</source>
<translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="812"/>
+ <location filename="../QScintilla/Editor.py" line="813"/>
<source>Use Monospaced Font</source>
<translation>Benutze Monospace Font</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="805"/>
+ <location filename="../QScintilla/Editor.py" line="806"/>
<source>Shorten empty lines</source>
<translation>Leere Zeilen verkürzen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1223"/>
+ <location filename="../QScintilla/Editor.py" line="1224"/>
<source>Goto syntax error</source>
<translation>Zu Syntaxfehler gehen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1230"/>
+ <location filename="../QScintilla/Editor.py" line="1231"/>
<source>Clear syntax error</source>
<translation>Syntaxfehler löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="817"/>
+ <location filename="../QScintilla/Editor.py" line="818"/>
<source>Autosave enabled</source>
<translation>Autom. Speicherung aktiv</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7057"/>
+ <location filename="../QScintilla/Editor.py" line="7058"/>
<source>Drop Error</source>
<translation>Drop Fehler</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1226"/>
+ <location filename="../QScintilla/Editor.py" line="1227"/>
<source>Show syntax error message</source>
<translation>Zeige Syntaxfehlermeldung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6086"/>
+ <location filename="../QScintilla/Editor.py" line="6087"/>
<source>Syntax Error</source>
<translation>Syntaxfehler</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6086"/>
+ <location filename="../QScintilla/Editor.py" line="6087"/>
<source>No syntax error message available.</source>
<translation>Keine Syntaxfehlermeldung verfügbar.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1166"/>
+ <location filename="../QScintilla/Editor.py" line="1167"/>
<source>Toggle temporary breakpoint</source>
<translation>Temporären Haltepunkt setzen/löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="957"/>
+ <location filename="../QScintilla/Editor.py" line="958"/>
<source>Show code coverage annotations</source>
<translation>Markiere Zeilen ohne Abdeckung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="960"/>
+ <location filename="../QScintilla/Editor.py" line="961"/>
<source>Hide code coverage annotations</source>
<translation>Lösche Abdeckungsmarkierungen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1247"/>
+ <location filename="../QScintilla/Editor.py" line="1248"/>
<source>Next uncovered line</source>
<translation>Nächste nichtabgedeckte Zeile</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1250"/>
+ <location filename="../QScintilla/Editor.py" line="1251"/>
<source>Previous uncovered line</source>
<translation>Vorige nichtabgedeckte Zeile</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5811"/>
+ <location filename="../QScintilla/Editor.py" line="5812"/>
<source>Show Code Coverage Annotations</source>
<translation>Zeilen ohne Abdeckung Markieren</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5804"/>
+ <location filename="../QScintilla/Editor.py" line="5805"/>
<source>All lines have been covered.</source>
<translation>Alle Zeilen sind abgedeckt.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5811"/>
+ <location filename="../QScintilla/Editor.py" line="5812"/>
<source>There is no coverage file available.</source>
<translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2884"/>
+ <location filename="../QScintilla/Editor.py" line="2885"/>
<source><p>The file <b>{0}</b> has unsaved changes.</p></source>
<translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6514"/>
+ <location filename="../QScintilla/Editor.py" line="6515"/>
<source><p>The macro file <b>{0}</b> could not be read.</p></source>
<translation><p>Die Makrodatei <b>{0}</b> kann nicht gelesen werden.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6523"/>
+ <location filename="../QScintilla/Editor.py" line="6524"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation><p>Die Makrodatei <b>{0}</b> ist zerstört.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6576"/>
+ <location filename="../QScintilla/Editor.py" line="6577"/>
<source><p>The macro file <b>{0}</b> could not be written.</p></source>
<translation><p>Die Makrodatei <b>{0}</b> kann nicht geschrieben werden.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7057"/>
+ <location filename="../QScintilla/Editor.py" line="7058"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation><p><b>{0}</b> ist keine Datei.</p></translation>
</message>
@@ -11477,177 +11477,177 @@
<translation><p>Die Größe der Datei <b>{0}</b> ist <b>{1} KB<7B>. Soll sie wirklich geladen werden?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="976"/>
+ <location filename="../QScintilla/Editor.py" line="977"/>
<source>Diagrams</source>
<translation>Diagramme</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="978"/>
+ <location filename="../QScintilla/Editor.py" line="979"/>
<source>Class Diagram...</source>
<translation>Klassendiagramm...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="980"/>
+ <location filename="../QScintilla/Editor.py" line="981"/>
<source>Package Diagram...</source>
<translation>Package Diagramm...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="982"/>
+ <location filename="../QScintilla/Editor.py" line="983"/>
<source>Imports Diagram...</source>
<translation>Imports-Diagramm...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="984"/>
+ <location filename="../QScintilla/Editor.py" line="985"/>
<source>Application Diagram...</source>
<translation>Applikations-Diagramm...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1005"/>
+ <location filename="../QScintilla/Editor.py" line="1006"/>
<source>No Language</source>
<translation>Keine Sprache</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6917"/>
+ <location filename="../QScintilla/Editor.py" line="6918"/>
<source>{0} (ro)</source>
<translation>{0} (ro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7078"/>
+ <location filename="../QScintilla/Editor.py" line="7079"/>
<source>Resources</source>
<translation>Ressourcen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7080"/>
+ <location filename="../QScintilla/Editor.py" line="7081"/>
<source>Add file...</source>
<translation>Datei hinzufügen...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7082"/>
+ <location filename="../QScintilla/Editor.py" line="7083"/>
<source>Add files...</source>
<translation>Dateien hinzufügen...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7084"/>
+ <location filename="../QScintilla/Editor.py" line="7085"/>
<source>Add aliased file...</source>
<translation>Aliased-Datei hinzufügen...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7087"/>
+ <location filename="../QScintilla/Editor.py" line="7088"/>
<source>Add localized resource...</source>
<translation>Lokalisierte Ressource hinzufügen...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7110"/>
+ <location filename="../QScintilla/Editor.py" line="7111"/>
<source>Add file resource</source>
<translation>Dateiressource hinzufügen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7126"/>
+ <location filename="../QScintilla/Editor.py" line="7127"/>
<source>Add file resources</source>
<translation>Dateiressourcen hinzufügen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7153"/>
+ <location filename="../QScintilla/Editor.py" line="7154"/>
<source>Add aliased file resource</source>
<translation>Aliased-Dateiressourcen hinzufügen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7153"/>
+ <location filename="../QScintilla/Editor.py" line="7154"/>
<source>Alias for file <b>{0}</b>:</source>
<translation>Alias für Datei <b>{0}</b>:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7217"/>
+ <location filename="../QScintilla/Editor.py" line="7218"/>
<source>Package Diagram</source>
<translation>Package-Diagramm</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7217"/>
+ <location filename="../QScintilla/Editor.py" line="7218"/>
<source>Include class attributes?</source>
<translation>Klassenattribute anzeigen?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7251"/>
+ <location filename="../QScintilla/Editor.py" line="7252"/>
<source>Application Diagram</source>
<translation>Applikations-Diagramm</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7251"/>
+ <location filename="../QScintilla/Editor.py" line="7252"/>
<source>Include module names?</source>
<translation>Modulnamen anzeigen?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7091"/>
+ <location filename="../QScintilla/Editor.py" line="7092"/>
<source>Add resource frame</source>
<translation>Ressourcenrahmen hinzufügen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6589"/>
+ <location filename="../QScintilla/Editor.py" line="6590"/>
<source>Macro recording is already active. Start new?</source>
<translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1254"/>
+ <location filename="../QScintilla/Editor.py" line="1255"/>
<source>Next task</source>
<translation>Nächste Aufgabe</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1257"/>
+ <location filename="../QScintilla/Editor.py" line="1258"/>
<source>Previous task</source>
<translation>Vorherige Aufgabe</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="914"/>
+ <location filename="../QScintilla/Editor.py" line="915"/>
<source>Complete from Document</source>
<translation>Vervollständigung vom Dokument</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="916"/>
+ <location filename="../QScintilla/Editor.py" line="917"/>
<source>Complete from APIs</source>
<translation>Vervollständigung von APIs</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="918"/>
+ <location filename="../QScintilla/Editor.py" line="919"/>
<source>Complete from Document and APIs</source>
<translation>Vervollständigung vom Dokument und von APIs</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1127"/>
+ <location filename="../QScintilla/Editor.py" line="1128"/>
<source>Export as</source>
<translation>Exportieren als</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1302"/>
+ <location filename="../QScintilla/Editor.py" line="1303"/>
<source>Export source</source>
<translation>Quelltext exportieren</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1294"/>
+ <location filename="../QScintilla/Editor.py" line="1295"/>
<source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source>
<translation><p>Für das Exportformat <b>{0}</b> steht kein Exporter zur Verfügung. Abbruch...</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1302"/>
+ <location filename="../QScintilla/Editor.py" line="1303"/>
<source>No export format given. Aborting...</source>
<translation>Kein Exportformat angegeben. Abbruch...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7237"/>
+ <location filename="../QScintilla/Editor.py" line="7238"/>
<source>Imports Diagram</source>
<translation>Imports Diagramm</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7237"/>
+ <location filename="../QScintilla/Editor.py" line="7238"/>
<source>Include imports from external modules?</source>
<translation>Imports externer Module anzeigen?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="836"/>
+ <location filename="../QScintilla/Editor.py" line="837"/>
<source>Calltip</source>
<translation>Calltip</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="882"/>
+ <location filename="../QScintilla/Editor.py" line="883"/>
<source>Print Preview</source>
<translation>Druckvorschau</translation>
</message>
@@ -11657,312 +11657,312 @@
<translation><b>Quelltexteditorfenster</b><p>Dieses Fenster wird zum Bearbeiten von Quelltexten benutzt. Sie können beliebig viele dieser Fenster öffnen. Der Name der Datei wird im Titel des Fensters dargestellt.</p><p>Um Haltepunkte zu setzen, klicken sie in den Raum zwischen den Zeilennummern und der Faltungsspalte. Über das Kontextmenü des Bereiches links des Editors können Haltepunkte bearbeitet werden.</p><p>Um Lesezeichen zu setzen, drücken Sie die Shift-Taste und klicken in den Raum zwischen den Zeilennummern und der Faltungsspalte.</p><p>Diese Aktionen können über das Kontextmenü umgedreht werden.</p><p>Ein Klick auf einen Syntaxfehler-Marker mit gedrückter Strg-Taste zeigt die zugehörige Fehlermeldung an.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="821"/>
+ <location filename="../QScintilla/Editor.py" line="822"/>
<source>Typing aids enabled</source>
<translation>Eingabehilfen aktiv</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1091"/>
+ <location filename="../QScintilla/Editor.py" line="1092"/>
<source>End-of-Line Type</source>
<translation>Zeilenendemarkierung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1095"/>
+ <location filename="../QScintilla/Editor.py" line="1096"/>
<source>Unix</source>
<translation>Unix</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1102"/>
+ <location filename="../QScintilla/Editor.py" line="1103"/>
<source>Windows</source>
<translation>Windows</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1109"/>
+ <location filename="../QScintilla/Editor.py" line="1110"/>
<source>Macintosh</source>
<translation>Macintosh</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1050"/>
+ <location filename="../QScintilla/Editor.py" line="1051"/>
<source>Encodings</source>
<translation>Kodierungen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1030"/>
+ <location filename="../QScintilla/Editor.py" line="1031"/>
<source>Guessed</source>
<translation>Ermittelt</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1317"/>
+ <location filename="../QScintilla/Editor.py" line="1318"/>
<source>Alternatives</source>
<translation>Alternativen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1313"/>
+ <location filename="../QScintilla/Editor.py" line="1314"/>
<source>Alternatives ({0})</source>
<translation>Alternativen ({0})</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1333"/>
+ <location filename="../QScintilla/Editor.py" line="1334"/>
<source>Pygments Lexer</source>
<translation>Pygments Lexer</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1333"/>
+ <location filename="../QScintilla/Editor.py" line="1334"/>
<source>Select the Pygments lexer to apply.</source>
<translation>Wähle den anzuwendenden Pygments Lexer.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7544"/>
+ <location filename="../QScintilla/Editor.py" line="7545"/>
<source>Check spelling...</source>
<translation>Rechtschreibprüfung...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="797"/>
+ <location filename="../QScintilla/Editor.py" line="798"/>
<source>Check spelling of selection...</source>
<translation>Rechtschreibprüfung für Auswahl...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7547"/>
+ <location filename="../QScintilla/Editor.py" line="7548"/>
<source>Add to dictionary</source>
<translation>Zum Wörterbuch hinzufügen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7549"/>
+ <location filename="../QScintilla/Editor.py" line="7550"/>
<source>Ignore All</source>
<translation>Alle ignorieren</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="801"/>
+ <location filename="../QScintilla/Editor.py" line="802"/>
<source>Remove from dictionary</source>
<translation>Aus dem Wörterbuch entfernen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2944"/>
+ <location filename="../QScintilla/Editor.py" line="2945"/>
<source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht geöffnet werden.<br />Ursache: {1}</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3058"/>
+ <location filename="../QScintilla/Editor.py" line="3059"/>
<source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1234"/>
+ <location filename="../QScintilla/Editor.py" line="1235"/>
<source>Next warning</source>
<translation>Nächste Warnung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1237"/>
+ <location filename="../QScintilla/Editor.py" line="1238"/>
<source>Previous warning</source>
<translation>Vorherige Warnung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1240"/>
+ <location filename="../QScintilla/Editor.py" line="1241"/>
<source>Show warning message</source>
<translation>Zeige Warnung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1243"/>
+ <location filename="../QScintilla/Editor.py" line="1244"/>
<source>Clear warnings</source>
<translation>Warnungen löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3117"/>
+ <location filename="../QScintilla/Editor.py" line="3118"/>
<source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6560"/>
+ <location filename="../QScintilla/Editor.py" line="6561"/>
<source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Die Makrodatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6362"/>
+ <location filename="../QScintilla/Editor.py" line="6363"/>
<source>Warning: {0}</source>
<translation>Warnung: {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6369"/>
+ <location filename="../QScintilla/Editor.py" line="6370"/>
<source>Error: {0}</source>
<translation>Fehler: {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6749"/>
+ <location filename="../QScintilla/Editor.py" line="6750"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="878"/>
+ <location filename="../QScintilla/Editor.py" line="879"/>
<source>Open 'rejection' file</source>
<translation>Öffne „Ablehnungs“-Datei</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="988"/>
+ <location filename="../QScintilla/Editor.py" line="989"/>
<source>Load Diagram...</source>
<translation>Diagramm laden...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1261"/>
+ <location filename="../QScintilla/Editor.py" line="1262"/>
<source>Next change</source>
<translation>Nächste Änderung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1264"/>
+ <location filename="../QScintilla/Editor.py" line="1265"/>
<source>Previous change</source>
<translation>Vorherige Änderung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7958"/>
+ <location filename="../QScintilla/Editor.py" line="7959"/>
<source>Sort Lines</source>
<translation>Zeilen sortieren</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7958"/>
+ <location filename="../QScintilla/Editor.py" line="7959"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6298"/>
+ <location filename="../QScintilla/Editor.py" line="6299"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6298"/>
+ <location filename="../QScintilla/Editor.py" line="6299"/>
<source>No warning messages available.</source>
<translation>Keine Warnmeldungen verfügbar.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6359"/>
+ <location filename="../QScintilla/Editor.py" line="6360"/>
<source>Style: {0}</source>
<translation>Stil: {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="852"/>
+ <location filename="../QScintilla/Editor.py" line="853"/>
<source>New Document View</source>
<translation>Neue Dokumentenansicht</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="855"/>
+ <location filename="../QScintilla/Editor.py" line="856"/>
<source>New Document View (with new split)</source>
<translation>Neue Dokumentenansicht (in neuem Abschnitt)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="942"/>
+ <location filename="../QScintilla/Editor.py" line="943"/>
<source>Tools</source>
<translation>Werkzeuge</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1072"/>
+ <location filename="../QScintilla/Editor.py" line="1073"/>
<source>Re-Open With Encoding</source>
<translation>Öffnen mit Kodierung</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6743"/>
+ <location filename="../QScintilla/Editor.py" line="6744"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source>
<translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="828"/>
+ <location filename="../QScintilla/Editor.py" line="829"/>
<source>Automatic Completion enabled</source>
<translation>Automatische Vervollständigung aktiv</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="908"/>
+ <location filename="../QScintilla/Editor.py" line="909"/>
<source>Complete</source>
<translation>Vervollständigen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4697"/>
+ <location filename="../QScintilla/Editor.py" line="4698"/>
<source>Auto-Completion Provider</source>
<translation>Provider für automatische Vervollständigungen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4697"/>
+ <location filename="../QScintilla/Editor.py" line="4698"/>
<source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source>
<translation>Der Provider für automatische Vervollständigungen namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4968"/>
+ <location filename="../QScintilla/Editor.py" line="4969"/>
<source>Call-Tips Provider</source>
<translation>Calltipps-Provider</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4968"/>
+ <location filename="../QScintilla/Editor.py" line="4969"/>
<source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source>
<translation>Der Calltipps-Provider namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8045"/>
+ <location filename="../QScintilla/Editor.py" line="8046"/>
<source>Register Mouse Click Handler</source>
<translation>Maus Klick Handler registrieren</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8045"/>
+ <location filename="../QScintilla/Editor.py" line="8046"/>
<source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source>
<translation>Ein Maus Klick Handler für "{0}" wurde bereits durch "{1}" registriert. Die Anfrage durch "{2}" wird abgebrochen...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="872"/>
+ <location filename="../QScintilla/Editor.py" line="873"/>
<source>Save Copy...</source>
<translation>Kopie speichern...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="911"/>
+ <location filename="../QScintilla/Editor.py" line="912"/>
<source>Clear Completions Cache</source>
<translation>Vervollständigungsspeicher löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="838"/>
+ <location filename="../QScintilla/Editor.py" line="839"/>
<source>Code Info</source>
<translation>Code Info</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1267"/>
+ <location filename="../QScintilla/Editor.py" line="1268"/>
<source>Clear changes</source>
<translation>Änderungsmarker löschen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="763"/>
+ <location filename="../QScintilla/Editor.py" line="764"/>
<source>Execute Selection In Console</source>
<translation>Auswahl in Konsole ausführen</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8166"/>
+ <location filename="../QScintilla/Editor.py" line="8167"/>
<source>EditorConfig Properties</source>
<translation>EditorConfig Eigenschaften</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8166"/>
+ <location filename="../QScintilla/Editor.py" line="8167"/>
<source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source>
<translation><p>Die EditorConfig Eigenschaften für die Datei <b>{0}</b> konnten nicht geladen werden.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1190"/>
+ <location filename="../QScintilla/Editor.py" line="1191"/>
<source>Toggle all folds</source>
<translation>Alle Faltungen umschalten</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1194"/>
+ <location filename="../QScintilla/Editor.py" line="1195"/>
<source>Toggle all folds (including children)</source>
<translation>Alle Faltungen umschalten (inkl. Unterfaltungen)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1198"/>
+ <location filename="../QScintilla/Editor.py" line="1199"/>
<source>Toggle current fold</source>
<translation>Aktuelle Faltung umschalten</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1203"/>
+ <location filename="../QScintilla/Editor.py" line="1204"/>
<source>Expand (including children)</source>
<translation>Ausklappen (inkl. Unterfaltungen)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1207"/>
+ <location filename="../QScintilla/Editor.py" line="1208"/>
<source>Collapse (including children)</source>
<translation>Einklappen (inkl. Unterfaltungen)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1212"/>
+ <location filename="../QScintilla/Editor.py" line="1213"/>
<source>Clear all folds</source>
<translation>Alle Faltungen aufklappen</translation>
</message>
@@ -17457,7 +17457,7 @@
<context>
<name>FeaturePermissionBar</name>
<message>
- <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionBar.py" line="48"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="73"/>
<source>{0} wants to use desktop notifications.</source>
<translation>{0} möchte Desktopmitteilungen nutzen.</translation>
</message>
@@ -17467,22 +17467,22 @@
<translation>{0} möchte die Position nutzen.</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="99"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="111"/>
<source>Allow</source>
<translation>Erlauben</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="100"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="112"/>
<source>Deny</source>
<translation>Ablehnen</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="134"/>
<source>{0} wants to use an unknown feature.</source>
<translation>{0} möchte ein unbekanntes Feature nutzen.</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="109"/>
<source>Remember</source>
<translation>Merken</translation>
</message>
@@ -17525,17 +17525,17 @@
<translation>HTML5 Feature Berechtigungen</translation>
</message>
<message>
- <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="27"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54"/>
<source>Notifications</source>
<translation>Benachrichtigungen</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162"/>
<source>Host</source>
<translation>Rechner</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="145"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="163"/>
<source>Permission</source>
<translation>Berechtigung</translation>
</message>
@@ -17550,17 +17550,17 @@
<translation>Alle entfernen</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="69"/>
<source>Geolocation</source>
<translation>Geolokalisierung</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="165"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="187"/>
<source>Allow</source>
<translation>Erlauben</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="188"/>
<source>Deny</source>
<translation>Ablehnen</translation>
</message>
@@ -17575,32 +17575,32 @@
<translation>&Alle entfernen</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="84"/>
<source>Microphone</source>
<translation>Mikrofon</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="81"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="99"/>
<source>Camera</source>
<translation>Kamera</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114"/>
<source>Microphone && Camera</source>
<translation>Mikrofon && Kamera</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="112"/>
- <source>Mouse Lock</source>
- <translation>Maussperre</translation>
- </message>
- <message>
<location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130"/>
+ <source>Mouse Lock</source>
+ <translation>Maussperre</translation>
+ </message>
+ <message>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148"/>
<source>Desktop Video</source>
<translation>Bildschirminhalt</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="146"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="164"/>
<source>Desktop Audio && Video</source>
<translation>Bildschirmaudio && -inhalt</translation>
</message>
@@ -34210,27 +34210,27 @@
<translation>Modifiziert</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/>
<source>Process Generation Error</source>
<translation>Fehler beim Prozessstart</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/>
<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/HgLogBrowserDialog.py" line="959"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/>
<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/HgLogBrowserDialog.py" line="962"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/>
<source>Could not start the hg executable.</source>
<translation>Das hg Programm konnte nicht gestartet werden.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/>
<source>Mercurial Error</source>
<translation>Mercurial-Fehler</translation>
</message>
@@ -34301,12 +34301,12 @@
<translation>Phase ändern</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2231"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/>
<source>Copy Changesets</source>
<translation>Änderungssätze kopieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/>
<source>The project should be reread. Do this now?</source>
<translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation>
</message>
@@ -34331,7 +34331,7 @@
<translation>Ausgewählte Revision mit einer Marke versehen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/>
<source>Switch</source>
<translation>Umschalten</translation>
</message>
@@ -34351,7 +34351,7 @@
<translation>Binärriesen der ausgewählten Revisionen herunterladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1301"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/>
<source>{0} (large file)</source>
<translation>{0} (Binärriese)</translation>
</message>
@@ -34396,12 +34396,12 @@
<translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/>
<source>Find Commit</source>
<translation>Revision finden</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/>
<source>'{0}' was not found.</source>
<translation>„{0}“ wurde nicht gefunden.</translation>
</message>
@@ -34426,7 +34426,7 @@
<translation>Geheim</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2434"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/>
<source>Pull Changes</source>
<translation>Änderungen herunterladen</translation>
</message>
@@ -34456,12 +34456,12 @@
<translation>Alle Änderungen an ein entferntes Repository hochladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/>
<source>Fetch Changes</source>
<translation>Änderungen abholen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2480"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/>
<source>Strip Changesets</source>
<translation>Änderungssätze löschen</translation>
</message>
@@ -34496,27 +34496,27 @@
<translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2325"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/>
<source>Define Bookmark</source>
<translation>Lesezeichen hinzufügen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2325"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/>
<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="2348"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/>
<source>Move Bookmark</source>
<translation>Lesezeichen verschieben</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/>
<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="2289"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/>
<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>
@@ -34578,7 +34578,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="2572"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/>
<source>Apply Changegroup</source>
<translation>Änderungsgruppe anwenden</translation>
</message>
@@ -34618,62 +34618,62 @@
<translation>Alle Einträge abwählen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1555"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/>
<source>Side-by-Side Diff to Parent {0}</source>
<translation>Unterschiede nebeneinander zu Vorgänger {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1566"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/>
<source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source>
<translation><a href="sbsdiff:{0}_{1}">Unterschiede nebeneinander</a></translation>
</message>
<message>
- <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="1706"/>
+ <source>Pull Selected Changes</source>
+ <translation>Ausgewählte Änderungen herunterladen</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/>
<source>Fetch Selected Changes</source>
<translation>Ausgewählte Änderungen herunterladen und zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/>
<source>Differences</source>
<translation>Unterschiede</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
<source>Differences to Parent {0}</source>
<translation>Unterschiede zu Vorgänger {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2784"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/>
<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="2809"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/>
<source>There is no difference.</source>
<translation>Es gibt keinen Unterschied.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/>
<source>Save Diff</source>
<translation>Diff speichern</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2919"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/>
<source>Patch Files (*.diff)</source>
<translation>Patchdateien (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/>
<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="2952"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/>
<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>
@@ -34683,7 +34683,7 @@
<translation><a href="save:me">Speichern</a></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2757"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/>
<source>Generating differences ...</source>
<translation>Erzeuge Unterschiede ...</translation>
</message>
@@ -36611,11 +36611,6 @@
<translation>Zusammengeführte Änderungen einpflegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/>
- <source>Commit a merge.</source>
- <translation>Zusammengeführte Änderungen einpflegen.</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
<source><b>Commit a merge</b><p>This commits a merge working directory</p></source>
<translation><b>Zusammengeführte Änderungen einpflegen</b><p>Dies pflegt ein Arbeitsverzeichnis mit zusammengeführten Änderungen ein.</p></translation>
@@ -36635,6 +36630,11 @@
<source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source>
<translation><b>Zusammenführung abbrechen</b><p>Dies bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab.</p></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/>
+ <source>Commit all the merged changes.</source>
+ <translation>Alle zusammengeführten Änderungen einpflegen.</translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -38022,7 +38022,7 @@
<context>
<name>HgStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="334"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="345"/>
<source>Mercurial Status</source>
<translation>Mercurial-Status</translation>
</message>
@@ -38104,7 +38104,7 @@
<translation>Ausgewählte Änderungen einpflegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="207"/>
<source>Adjust column sizes</source>
<translation>Spaltengrößen anpassen</translation>
</message>
@@ -38144,47 +38144,47 @@
<translation>fehlt</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="386"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/>
<source>Process Generation Error</source>
<translation>Fehler beim Prozessstart</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="386"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/>
<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/HgStatusDialog.py" line="637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/>
<source>Commit</source>
<translation>Einpflegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="803"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/>
<source>There are no uncommitted changes available/selected.</source>
<translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="701"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="701"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/>
<source>There are no unversioned entries available/selected.</source>
<translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="765"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/>
<source>Revert</source>
<translation>Rückgängig machen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="724"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="765"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/>
<source>There are no missing entries available/selected.</source>
<translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation>
</message>
@@ -38204,17 +38204,17 @@
<translation>Fehlende wiederherstellen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="580"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/>
<source>all</source>
<translation>alle</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/>
<source>Differences</source>
<translation>Unterschiede</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/>
<source>There are no entries selected to be committed.</source>
<translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation>
</message>
@@ -38224,17 +38224,17 @@
<translation>Alle zum Einpflegen auswählen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="331"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="342"/>
<source>Mercurial Queue Repository Status</source>
<translation>Mercurial Status des Queue-Repositories</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/>
<source>Side-by-Side Diff</source>
<translation>Unterschiede nebeneinander</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/>
<source>Only one file with uncommitted changes must be selected.</source>
<translation>Es darf nur eine Datei ausgewählt werden.</translation>
</message>
@@ -38309,10 +38309,30 @@
<translation>Stellt die ausgewählten, fehlenden Dateien wieder her</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="198"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="209"/>
<source>Adjusts the width of all columns to their contents</source>
<translation>Passt die Spaltenbreiten aller Spalten an ihren Inhalt an</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/>
+ <source>Commit Merge</source>
+ <translation>Merge einpflegen</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="198"/>
+ <source>Commit all the merged changes.</source>
+ <translation>Alle zusammengeführten Änderungen einpflegen.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/>
+ <source>Abort Merge</source>
+ <translation>Zusammenführung abbrechen</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/>
+ <source>Abort an uncommitted merge and lose all changes</source>
+ <translation>Bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab</translation>
+ </message>
</context>
<context>
<name>HgStatusMonitorThread</name>
@@ -48770,12 +48790,12 @@
<translation><b>Kopie speichern</b><p>Speichern einer Kopie des Inhalts des aktuellen Editorfensters. Die Datei kann mit einem Dateiauswahldialog eingegeben werden.</p></translation>
</message>
<message>
- <location filename="../QScintilla/MiniEditor.py" line="3412"/>
+ <location filename="../QScintilla/MiniEditor.py" line="3413"/>
<source>EditorConfig Properties</source>
<translation>EditorConfig Eigenschaften</translation>
</message>
<message>
- <location filename="../QScintilla/MiniEditor.py" line="3412"/>
+ <location filename="../QScintilla/MiniEditor.py" line="3413"/>
<source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source>
<translation><p>Die EditorConfig Eigenschaften für die Datei <b>{0}</b> konnten nicht geladen werden.</p></translation>
</message>
@@ -55216,7 +55236,7 @@
<translation>Dateien entfernt</translation>
</message>
<message>
- <location filename="../Project/ProjectBrowser.py" line="398"/>
+ <location filename="../Project/ProjectBrowser.py" line="400"/>
<source>unknown status</source>
<translation>unbekannter Status</translation>
</message>
