i18n/eric6_de.ts

changeset 6111
d38b38117d83
parent 6106
921d070cec82
child 6152
a98925d5a214
--- a/i18n/eric6_de.ts	Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_de.ts	Sat Feb 03 18:41:49 2018 +0100
@@ -9840,902 +9840,902 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
         <source>Save File</source>
         <translation>Datei sichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="747"/>
+        <location filename="../QScintilla/Editor.py" line="755"/>
         <source>Undo</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="750"/>
+        <location filename="../QScintilla/Editor.py" line="758"/>
         <source>Redo</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="757"/>
+        <location filename="../QScintilla/Editor.py" line="765"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="760"/>
+        <location filename="../QScintilla/Editor.py" line="768"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="763"/>
-        <source>Paste</source>
-        <translation>Einfügen</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="771"/>
+        <source>Paste</source>
+        <translation>Einfügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="779"/>
         <source>Indent</source>
         <translation>Einrücken</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="774"/>
+        <location filename="../QScintilla/Editor.py" line="782"/>
         <source>Unindent</source>
         <translation>Einrücken rückgängig</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="777"/>
+        <location filename="../QScintilla/Editor.py" line="785"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="780"/>
+        <location filename="../QScintilla/Editor.py" line="788"/>
         <source>Uncomment</source>
         <translation>Kommentar entfernen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="864"/>
+        <location filename="../QScintilla/Editor.py" line="872"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="870"/>
+        <location filename="../QScintilla/Editor.py" line="878"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="873"/>
+        <location filename="../QScintilla/Editor.py" line="881"/>
         <source>Save As...</source>
         <translation>Speichern unter...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="792"/>
+        <location filename="../QScintilla/Editor.py" line="800"/>
         <source>Select all</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="793"/>
+        <location filename="../QScintilla/Editor.py" line="801"/>
         <source>Deselect all</source>
         <translation>Auswahl aufheben</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="790"/>
+        <location filename="../QScintilla/Editor.py" line="798"/>
         <source>Select to brace</source>
         <translation>Zur Klammer auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="889"/>
+        <location filename="../QScintilla/Editor.py" line="897"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2556"/>
+        <location filename="../QScintilla/Editor.py" line="2564"/>
         <source>Printing...</source>
         <translation>Drucke...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2573"/>
+        <location filename="../QScintilla/Editor.py" line="2581"/>
         <source>Printing completed</source>
         <translation>Drucken beendet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2575"/>
+        <location filename="../QScintilla/Editor.py" line="2583"/>
         <source>Error while printing</source>
         <translation>Fehler beim Drucken</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2578"/>
+        <location filename="../QScintilla/Editor.py" line="2586"/>
         <source>Printing aborted</source>
         <translation>Drucken abgebrochen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6720"/>
+        <location filename="../QScintilla/Editor.py" line="6752"/>
         <source>File changed</source>
         <translation>Datei geändert</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="936"/>
+        <location filename="../QScintilla/Editor.py" line="944"/>
         <source>Check</source>
         <translation>Prüfen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <source>File Modified</source>
         <translation>Datei geändert</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="958"/>
+        <location filename="../QScintilla/Editor.py" line="966"/>
         <source>Code metrics...</source>
         <translation>Quelltextmetriken...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="959"/>
-        <source>Code coverage...</source>
-        <translation>Quelltext Abdeckung...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="967"/>
+        <source>Code coverage...</source>
+        <translation>Quelltext Abdeckung...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="975"/>
         <source>Profile data...</source>
         <translation>Profildaten...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="956"/>
-        <source>Show</source>
-        <translation>Zeige</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="783"/>
-        <source>Stream Comment</source>
-        <translation>Stream Kommentar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="786"/>
-        <source>Box Comment</source>
-        <translation>Box Kommentar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
-        <source>Modification of Read Only file</source>
-        <translation>Änderungsversuch für eine schreibgeschützte Datei</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
-        <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="1006"/>
-        <source>Languages</source>
-        <translation>Sprachen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="753"/>
-        <source>Revert to last saved state</source>
-        <translation>Zurück zum letzten gesichert Zustand</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
-        <source>Macro Name</source>
-        <translation>Makro Name</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
-        <source>Select a macro name:</source>
-        <translation>Wähle einen Makro Namen:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
-        <source>Macro files (*.macro)</source>
-        <translation>Makrodateien (*.macro)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6467"/>
-        <source>Load macro file</source>
-        <translation>Lade Makrodatei</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
-        <source>Error loading macro</source>
-        <translation>Fehler beim Makro Laden</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
-        <source>Save macro file</source>
-        <translation>Makrodatei schreiben</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
-        <source>Save macro</source>
-        <translation>Makro speichern</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
-        <source>Error saving macro</source>
-        <translation>Fehler beim Makro speichern</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
-        <source>Start Macro Recording</source>
-        <translation>Makroaufzeichnung starten</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
-        <source>Macro Recording</source>
-        <translation>Makroaufzeichnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
-        <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="1255"/>
-        <source>Toggle bookmark</source>
-        <translation>Lesezeichen setzen/löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1257"/>
-        <source>Next bookmark</source>
-        <translation>Nächstes Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1259"/>
-        <source>Previous bookmark</source>
-        <translation>Vorheriges Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1261"/>
-        <source>Clear all bookmarks</source>
-        <translation>Alle Lesezeichen löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1281"/>
-        <source>Toggle breakpoint</source>
-        <translation>Haltepunkt setzen/löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1318"/>
-        <source>LMB toggles bookmarks</source>
-        <translation>LMK schaltet Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1322"/>
-        <source>LMB toggles breakpoints</source>
-        <translation>LMK schaltet Haltepunkte</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1291"/>
-        <source>Next breakpoint</source>
-        <translation>Nächster Haltepunkt</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1293"/>
-        <source>Previous breakpoint</source>
-        <translation>Vorheriger Haltepunkt</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1295"/>
-        <source>Clear all breakpoints</source>
-        <translation>Alle Haltepunkte löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1286"/>
-        <source>Edit breakpoint...</source>
-        <translation>Haltepunkt bearbeiten...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5406"/>
-        <source>Enable breakpoint</source>
-        <translation>Haltepunkt aktivieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5409"/>
-        <source>Disable breakpoint</source>
-        <translation>Haltepunkt deaktivieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
-        <source>Code Coverage</source>
-        <translation>Quelltext Abdeckung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
-        <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="5964"/>
-        <source>Profile Data</source>
-        <translation>Profildaten</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
-        <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="4602"/>
-        <source>Autocompletion</source>
-        <translation>Automatische Vervollständigung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
-        <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="816"/>
-        <source>Use Monospaced Font</source>
-        <translation>Benutze Monospace Font</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="809"/>
-        <source>Shorten empty lines</source>
-        <translation>Leere Zeilen verkürzen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1264"/>
-        <source>Goto syntax error</source>
-        <translation>Zu Syntaxfehler gehen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1268"/>
-        <source>Clear syntax error</source>
-        <translation>Syntaxfehler löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="821"/>
-        <source>Autosave enabled</source>
-        <translation>Autom. Speicherung aktiv</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
-        <source>Drop Error</source>
-        <translation>Drop Fehler</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1266"/>
-        <source>Show syntax error message</source>
-        <translation>Zeige Syntaxfehlermeldung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
-        <source>Syntax Error</source>
-        <translation>Syntaxfehler</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
-        <source>No syntax error message available.</source>
-        <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1283"/>
-        <source>Toggle temporary breakpoint</source>
-        <translation>Temporären Haltepunkt setzen/löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="961"/>
-        <source>Show code coverage annotations</source>
-        <translation>Markiere Zeilen ohne Abdeckung</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="964"/>
-        <source>Hide code coverage annotations</source>
-        <translation>Lösche Abdeckungsmarkierungen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1298"/>
-        <source>Next uncovered line</source>
-        <translation>Nächste nichtabgedeckte Zeile</translation>
+        <source>Show</source>
+        <translation>Zeige</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="791"/>
+        <source>Stream Comment</source>
+        <translation>Stream Kommentar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="794"/>
+        <source>Box Comment</source>
+        <translation>Box Kommentar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
+        <source>Modification of Read Only file</source>
+        <translation>Änderungsversuch für eine schreibgeschützte Datei</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
+        <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="1014"/>
+        <source>Languages</source>
+        <translation>Sprachen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="761"/>
+        <source>Revert to last saved state</source>
+        <translation>Zurück zum letzten gesichert Zustand</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
+        <source>Macro Name</source>
+        <translation>Makro Name</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
+        <source>Select a macro name:</source>
+        <translation>Wähle einen Makro Namen:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
+        <source>Macro files (*.macro)</source>
+        <translation>Makrodateien (*.macro)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6499"/>
+        <source>Load macro file</source>
+        <translation>Lade Makrodatei</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
+        <source>Error loading macro</source>
+        <translation>Fehler beim Makro Laden</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
+        <source>Save macro file</source>
+        <translation>Makrodatei schreiben</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
+        <source>Save macro</source>
+        <translation>Makro speichern</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
+        <source>Error saving macro</source>
+        <translation>Fehler beim Makro speichern</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
+        <source>Start Macro Recording</source>
+        <translation>Makroaufzeichnung starten</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
+        <source>Macro Recording</source>
+        <translation>Makroaufzeichnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
+        <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="1263"/>
+        <source>Toggle bookmark</source>
+        <translation>Lesezeichen setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1265"/>
+        <source>Next bookmark</source>
+        <translation>Nächstes Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1267"/>
+        <source>Previous bookmark</source>
+        <translation>Vorheriges Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1269"/>
+        <source>Clear all bookmarks</source>
+        <translation>Alle Lesezeichen löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1289"/>
+        <source>Toggle breakpoint</source>
+        <translation>Haltepunkt setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1326"/>
+        <source>LMB toggles bookmarks</source>
+        <translation>LMK schaltet Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1330"/>
+        <source>LMB toggles breakpoints</source>
+        <translation>LMK schaltet Haltepunkte</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1299"/>
+        <source>Next breakpoint</source>
+        <translation>Nächster Haltepunkt</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="1301"/>
+        <source>Previous breakpoint</source>
+        <translation>Vorheriger Haltepunkt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1303"/>
+        <source>Clear all breakpoints</source>
+        <translation>Alle Haltepunkte löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1294"/>
+        <source>Edit breakpoint...</source>
+        <translation>Haltepunkt bearbeiten...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5414"/>
+        <source>Enable breakpoint</source>
+        <translation>Haltepunkt aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5417"/>
+        <source>Disable breakpoint</source>
+        <translation>Haltepunkt deaktivieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
+        <source>Code Coverage</source>
+        <translation>Quelltext Abdeckung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
+        <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="5972"/>
+        <source>Profile Data</source>
+        <translation>Profildaten</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
+        <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="4610"/>
+        <source>Autocompletion</source>
+        <translation>Automatische Vervollständigung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
+        <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="824"/>
+        <source>Use Monospaced Font</source>
+        <translation>Benutze Monospace Font</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="817"/>
+        <source>Shorten empty lines</source>
+        <translation>Leere Zeilen verkürzen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1272"/>
+        <source>Goto syntax error</source>
+        <translation>Zu Syntaxfehler gehen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1276"/>
+        <source>Clear syntax error</source>
+        <translation>Syntaxfehler löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="829"/>
+        <source>Autosave enabled</source>
+        <translation>Autom. Speicherung aktiv</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
+        <source>Drop Error</source>
+        <translation>Drop Fehler</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1274"/>
+        <source>Show syntax error message</source>
+        <translation>Zeige Syntaxfehlermeldung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
+        <source>Syntax Error</source>
+        <translation>Syntaxfehler</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
+        <source>No syntax error message available.</source>
+        <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1291"/>
+        <source>Toggle temporary breakpoint</source>
+        <translation>Temporären Haltepunkt setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="969"/>
+        <source>Show code coverage annotations</source>
+        <translation>Markiere Zeilen ohne Abdeckung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="972"/>
+        <source>Hide code coverage annotations</source>
+        <translation>Lösche Abdeckungsmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1306"/>
+        <source>Next uncovered line</source>
+        <translation>Nächste nichtabgedeckte Zeile</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1309"/>
         <source>Previous uncovered line</source>
         <translation>Vorige nichtabgedeckte Zeile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zeilen ohne Abdeckung Markieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5842"/>
+        <location filename="../QScintilla/Editor.py" line="5850"/>
         <source>All lines have been covered.</source>
         <translation>Alle Zeilen sind abgedeckt.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>There is no coverage file available.</source>
         <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; enthält ungesicherte Änderungen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6481"/>
+        <location filename="../QScintilla/Editor.py" line="6513"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; ist zerstört.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="359"/>
+        <location filename="../QScintilla/Editor.py" line="367"/>
         <source>&lt;p&gt;The size of the file &lt;b&gt;{0}&lt;/b&gt; is &lt;b&gt;{1} KB&lt;/b&gt;. Do you really want to load it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Größe der Datei &lt;b&gt;{0}&lt;/b&gt; ist &lt;b&gt;{1} KB&lt;7B&gt;. Soll sie wirklich geladen werden?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="980"/>
-        <source>Diagrams</source>
-        <translation>Diagramme</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="982"/>
-        <source>Class Diagram...</source>
-        <translation>Klassendiagramm...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="984"/>
-        <source>Package Diagram...</source>
-        <translation>Package Diagramm...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="986"/>
-        <source>Imports Diagram...</source>
-        <translation>Imports-Diagramm...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="988"/>
+        <source>Diagrams</source>
+        <translation>Diagramme</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="990"/>
+        <source>Class Diagram...</source>
+        <translation>Klassendiagramm...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="992"/>
+        <source>Package Diagram...</source>
+        <translation>Package Diagramm...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="994"/>
+        <source>Imports Diagram...</source>
+        <translation>Imports-Diagramm...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="996"/>
         <source>Application Diagram...</source>
         <translation>Applikations-Diagramm...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1009"/>
+        <location filename="../QScintilla/Editor.py" line="1017"/>
         <source>No Language</source>
         <translation>Keine Sprache</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6884"/>
+        <location filename="../QScintilla/Editor.py" line="6916"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7045"/>
-        <source>Resources</source>
-        <translation>Ressourcen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7047"/>
-        <source>Add file...</source>
-        <translation>Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7049"/>
-        <source>Add files...</source>
-        <translation>Dateien hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7051"/>
-        <source>Add aliased file...</source>
-        <translation>Aliased-Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7054"/>
-        <source>Add localized resource...</source>
-        <translation>Lokalisierte Ressource hinzufügen...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7077"/>
+        <source>Resources</source>
+        <translation>Ressourcen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7079"/>
+        <source>Add file...</source>
+        <translation>Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7081"/>
+        <source>Add files...</source>
+        <translation>Dateien hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7083"/>
+        <source>Add aliased file...</source>
+        <translation>Aliased-Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
+        <source>Add localized resource...</source>
+        <translation>Lokalisierte Ressource hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7109"/>
         <source>Add file resource</source>
         <translation>Dateiressource hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7093"/>
+        <location filename="../QScintilla/Editor.py" line="7125"/>
         <source>Add file resources</source>
         <translation>Dateiressourcen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Add aliased file resource</source>
         <translation>Aliased-Dateiressourcen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Alias für Datei &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Package Diagram</source>
         <translation>Package-Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Include class attributes?</source>
         <translation>Klassenattribute anzeigen?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Application Diagram</source>
         <translation>Applikations-Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Include module names?</source>
         <translation>Modulnamen anzeigen?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7058"/>
+        <location filename="../QScintilla/Editor.py" line="7090"/>
         <source>Add resource frame</source>
         <translation>Ressourcenrahmen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
         <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="1304"/>
+        <location filename="../QScintilla/Editor.py" line="1312"/>
         <source>Next task</source>
         <translation>Nächste Aufgabe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1306"/>
+        <location filename="../QScintilla/Editor.py" line="1314"/>
         <source>Previous task</source>
         <translation>Vorherige Aufgabe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="918"/>
+        <location filename="../QScintilla/Editor.py" line="926"/>
         <source>Complete from Document</source>
         <translation>Vervollständigung vom Dokument</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="920"/>
+        <location filename="../QScintilla/Editor.py" line="928"/>
         <source>Complete from APIs</source>
         <translation>Vervollständigung von APIs</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="922"/>
+        <location filename="../QScintilla/Editor.py" line="930"/>
         <source>Complete from Document and APIs</source>
         <translation>Vervollständigung vom Dokument und von APIs</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1129"/>
+        <location filename="../QScintilla/Editor.py" line="1137"/>
         <source>Export as</source>
         <translation>Exportieren als</translation>
     </message>
     <message>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
+        <source>Export source</source>
+        <translation>Quelltext exportieren</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Editor.py" line="1358"/>
-        <source>Export source</source>
-        <translation>Quelltext exportieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1350"/>
         <source>&lt;p&gt;No exporter available for the export format &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Für das Exportformat &lt;b&gt;{0}&lt;/b&gt; steht kein Exporter zur Verfügung. Abbruch...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1358"/>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
         <source>No export format given. Aborting...</source>
         <translation>Kein Exportformat angegeben. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Imports Diagram</source>
         <translation>Imports Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Include imports from external modules?</source>
         <translation>Imports externer Module anzeigen?</translation>
     </message>
     <message>
+        <location filename="../QScintilla/Editor.py" line="848"/>
+        <source>Calltip</source>
+        <translation>Calltip</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="894"/>
+        <source>Print Preview</source>
+        <translation>Druckvorschau</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="449"/>
+        <source>&lt;b&gt;A Source Editor Window&lt;/b&gt;&lt;p&gt;This window is used to display and edit a source file.  You can open as many of these as you like. The name of the file is displayed in the window&apos;s titlebar.&lt;/p&gt;&lt;p&gt;In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.&lt;/p&gt;&lt;p&gt;In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.&lt;/p&gt;&lt;p&gt;These actions can be reversed via the context menu.&lt;/p&gt;&lt;p&gt;Ctrl clicking on a syntax error marker shows some info about this error.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Quelltexteditorfenster&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Um Lesezeichen zu setzen, drücken Sie die Shift-Taste und klicken in den Raum zwischen den Zeilennummern und der Faltungsspalte.&lt;/p&gt;&lt;p&gt;Diese Aktionen können über das Kontextmenü umgedreht werden.&lt;/p&gt;&lt;p&gt;Ein Klick auf einen Syntaxfehler-Marker mit gedrückter Strg-Taste zeigt die zugehörige Fehlermeldung an.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="833"/>
+        <source>Typing aids enabled</source>
+        <translation>Eingabehilfen aktiv</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1101"/>
+        <source>End-of-Line Type</source>
+        <translation>Zeilenendemarkierung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1105"/>
+        <source>Unix</source>
+        <translation>Unix</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1112"/>
+        <source>Windows</source>
+        <translation>Windows</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1119"/>
+        <source>Macintosh</source>
+        <translation>Macintosh</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1060"/>
+        <source>Encodings</source>
+        <translation>Kodierungen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1040"/>
+        <source>Guessed</source>
+        <translation>Ermittelt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1381"/>
+        <source>Alternatives</source>
+        <translation>Alternativen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1377"/>
+        <source>Alternatives ({0})</source>
+        <translation>Alternativen ({0})</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
+        <source>Pygments Lexer</source>
+        <translation>Pygments Lexer</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
+        <source>Select the Pygments lexer to apply.</source>
+        <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7533"/>
+        <source>Check spelling...</source>
+        <translation>Rechtschreibprüfung...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="809"/>
+        <source>Check spelling of selection...</source>
+        <translation>Rechtschreibprüfung für Auswahl...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7536"/>
+        <source>Add to dictionary</source>
+        <translation>Zum Wörterbuch hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7538"/>
+        <source>Ignore All</source>
+        <translation>Alle ignorieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="813"/>
+        <source>Remove from dictionary</source>
+        <translation>Aus dem Wörterbuch entfernen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geöffnet werden.&lt;br /&gt;Ursache: {1}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3118"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gesichert werden.&lt;br/&gt;Grund: {1}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1279"/>
+        <source>Next warning</source>
+        <translation>Nächste Warnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1282"/>
+        <source>Previous warning</source>
+        <translation>Vorherige Warnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1284"/>
+        <source>Show warning message</source>
+        <translation>Zeige Warnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1286"/>
+        <source>Clear warnings</source>
+        <translation>Warnungen löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
+        <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6410"/>
+        <source>Warning: {0}</source>
+        <translation>Warnung: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6417"/>
+        <source>Error: {0}</source>
+        <translation>Fehler: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6748"/>
+        <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
+        <translation>&lt;br&gt;&lt;b&gt;Warnung:&lt;/b&gt; Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="890"/>
+        <source>Open &apos;rejection&apos; file</source>
+        <translation>Öffne „Ablehnungs“-Datei</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1000"/>
+        <source>Load Diagram...</source>
+        <translation>Diagramm laden...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1317"/>
+        <source>Next change</source>
+        <translation>Nächste Änderung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1320"/>
+        <source>Previous change</source>
+        <translation>Vorherige Änderung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
+        <source>Sort Lines</source>
+        <translation>Zeilen sortieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
+        <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="6346"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
+        <source>No warning messages available.</source>
+        <translation>Keine Warnmeldungen verfügbar.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
+        <source>Style: {0}</source>
+        <translation>Stil: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="864"/>
+        <source>New Document View</source>
+        <translation>Neue Dokumentenansicht</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="867"/>
+        <source>New Document View (with new split)</source>
+        <translation>Neue Dokumentenansicht (in neuem Abschnitt)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="954"/>
+        <source>Tools</source>
+        <translation>Werkzeuge</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1082"/>
+        <source>Re-Open With Encoding</source>
+        <translation>Öffnen mit Kodierung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6742"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Editor.py" line="840"/>
-        <source>Calltip</source>
-        <translation>Calltip</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="886"/>
-        <source>Print Preview</source>
-        <translation>Druckvorschau</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="441"/>
-        <source>&lt;b&gt;A Source Editor Window&lt;/b&gt;&lt;p&gt;This window is used to display and edit a source file.  You can open as many of these as you like. The name of the file is displayed in the window&apos;s titlebar.&lt;/p&gt;&lt;p&gt;In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.&lt;/p&gt;&lt;p&gt;In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.&lt;/p&gt;&lt;p&gt;These actions can be reversed via the context menu.&lt;/p&gt;&lt;p&gt;Ctrl clicking on a syntax error marker shows some info about this error.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Quelltexteditorfenster&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Um Lesezeichen zu setzen, drücken Sie die Shift-Taste und klicken in den Raum zwischen den Zeilennummern und der Faltungsspalte.&lt;/p&gt;&lt;p&gt;Diese Aktionen können über das Kontextmenü umgedreht werden.&lt;/p&gt;&lt;p&gt;Ein Klick auf einen Syntaxfehler-Marker mit gedrückter Strg-Taste zeigt die zugehörige Fehlermeldung an.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="825"/>
-        <source>Typing aids enabled</source>
-        <translation>Eingabehilfen aktiv</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1093"/>
-        <source>End-of-Line Type</source>
-        <translation>Zeilenendemarkierung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1097"/>
-        <source>Unix</source>
-        <translation>Unix</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1104"/>
-        <source>Windows</source>
-        <translation>Windows</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1111"/>
-        <source>Macintosh</source>
-        <translation>Macintosh</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1052"/>
-        <source>Encodings</source>
-        <translation>Kodierungen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1032"/>
-        <source>Guessed</source>
-        <translation>Ermittelt</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1373"/>
-        <source>Alternatives</source>
-        <translation>Alternativen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1369"/>
-        <source>Alternatives ({0})</source>
-        <translation>Alternativen ({0})</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
-        <source>Pygments Lexer</source>
-        <translation>Pygments Lexer</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
-        <source>Select the Pygments lexer to apply.</source>
-        <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7501"/>
-        <source>Check spelling...</source>
-        <translation>Rechtschreibprüfung...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="801"/>
-        <source>Check spelling of selection...</source>
-        <translation>Rechtschreibprüfung für Auswahl...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7504"/>
-        <source>Add to dictionary</source>
-        <translation>Zum Wörterbuch hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7506"/>
-        <source>Ignore All</source>
-        <translation>Alle ignorieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="805"/>
-        <source>Remove from dictionary</source>
-        <translation>Aus dem Wörterbuch entfernen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geöffnet werden.&lt;br /&gt;Ursache: {1}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="3110"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gesichert werden.&lt;br/&gt;Grund: {1}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1271"/>
-        <source>Next warning</source>
-        <translation>Nächste Warnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1274"/>
-        <source>Previous warning</source>
-        <translation>Vorherige Warnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1276"/>
-        <source>Show warning message</source>
-        <translation>Zeige Warnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1278"/>
-        <source>Clear warnings</source>
-        <translation>Warnungen löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
-        <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6378"/>
-        <source>Warning: {0}</source>
-        <translation>Warnung: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
-        <source>Error: {0}</source>
-        <translation>Fehler: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6716"/>
-        <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
-        <translation>&lt;br&gt;&lt;b&gt;Warnung:&lt;/b&gt; Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="882"/>
-        <source>Open &apos;rejection&apos; file</source>
-        <translation>Öffne „Ablehnungs“-Datei</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="992"/>
-        <source>Load Diagram...</source>
-        <translation>Diagramm laden...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1309"/>
-        <source>Next change</source>
-        <translation>Nächste Änderung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1312"/>
-        <source>Previous change</source>
-        <translation>Vorherige Änderung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
-        <source>Sort Lines</source>
-        <translation>Zeilen sortieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
-        <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="6314"/>
-        <source>Warning</source>
-        <translation>Warnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
-        <source>No warning messages available.</source>
-        <translation>Keine Warnmeldungen verfügbar.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6375"/>
-        <source>Style: {0}</source>
-        <translation>Stil: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="856"/>
-        <source>New Document View</source>
-        <translation>Neue Dokumentenansicht</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="859"/>
-        <source>New Document View (with new split)</source>
-        <translation>Neue Dokumentenansicht (in neuem Abschnitt)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="946"/>
-        <source>Tools</source>
-        <translation>Werkzeuge</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1074"/>
-        <source>Re-Open With Encoding</source>
-        <translation>Öffnen mit Kodierung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6710"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="832"/>
         <source>Automatic Completion enabled</source>
         <translation>Automatische Vervollständigung aktiv</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="912"/>
+        <location filename="../QScintilla/Editor.py" line="920"/>
         <source>Complete</source>
         <translation>Vervollständigen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>Auto-Completion Provider</source>
         <translation>Provider für automatische Vervollständigungen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Provider für automatische Vervollständigungen namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>Call-Tips Provider</source>
         <translation>Calltipps-Provider</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Calltipps-Provider namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>Register Mouse Click Handler</source>
         <translation>Maus Klick Handler registrieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Ein Maus Klick Handler für &quot;{0}&quot; wurde bereits durch &quot;{1}&quot; registriert. Die Anfrage durch &quot;{2}&quot; wird abgebrochen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="876"/>
+        <location filename="../QScintilla/Editor.py" line="884"/>
         <source>Save Copy...</source>
         <translation>Kopie speichern...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="915"/>
+        <location filename="../QScintilla/Editor.py" line="923"/>
         <source>Clear Completions Cache</source>
         <translation>Vervollständigungsspeicher löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="842"/>
+        <location filename="../QScintilla/Editor.py" line="850"/>
         <source>Code Info</source>
         <translation>Code Info</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1315"/>
+        <location filename="../QScintilla/Editor.py" line="1323"/>
         <source>Clear changes</source>
         <translation>Änderungsmarker löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="767"/>
+        <location filename="../QScintilla/Editor.py" line="775"/>
         <source>Execute Selection In Console</source>
         <translation>Auswahl in Konsole ausführen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>EditorConfig Properties</source>
         <translation>EditorConfig Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die EditorConfig Eigenschaften für die Datei &lt;b&gt;{0}&lt;/b&gt; konnten nicht geladen werden.&lt;/p&gt;</translation>
     </message>
@@ -13584,7 +13584,7 @@
         <translation>Ändere Hintergrundfarbe</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1860"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1883"/>
         <source>Various</source>
         <translation>Verschiedenes</translation>
     </message>
@@ -13599,12 +13599,12 @@
         <translation>Zeige Leerzeichen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1889"/>
         <source>Select to show a minimalistic context menu</source>
         <translation>Auswählen, um ein minimales Kontextmenü anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1892"/>
         <source>Show minimal context menu</source>
         <translation>Zeige minimales Kontextmenü</translation>
     </message>
@@ -14029,12 +14029,12 @@
         <translation>Wähle die Farbe der Markierung für die aktuelle Zeile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/>
         <source>Background:</source>
         <translation>Hintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1870"/>
         <source>Select the background colour for the marker map</source>
         <translation>Wähle die Hintergrundfarbe der Markierungsübersicht</translation>
     </message>
@@ -14084,12 +14084,12 @@
         <translation>Wähle die Farbe der Suchmarkierung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation>Auswählen, um die Formatbuttonsleiste auszublenden, wenn dies nicht unterstützt wird</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1879"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation>Formatbuttonsleiste ausblenden, wenn nicht unterstützt</translation>
     </message>
@@ -14128,6 +14128,16 @@
         <source>Select the colour for the error line marker.</source>
         <translation>Wähle die Farbe der Markierung für die Fehlerzeile.</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <source>Conflict Marker Line:</source>
+        <translation>Konfliktmarkierungen:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <source>Select the colour for the conflict marker line marker</source>
+        <translation>Wähle die Farbe der Markierung für Zeilen mit Konfliktmarkierungen</translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -49351,27 +49361,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1650"/>
+        <location filename="../Preferences/__init__.py" line="1651"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>

eric ide

mercurial