--- a/i18n/eric6_en.ts Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_en.ts Sat Feb 03 18:41:49 2018 +0100
@@ -9745,902 +9745,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 type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="359"/>
+ <location filename="../QScintilla/Editor.py" line="367"/>
<source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="441"/>
+ <location filename="../QScintilla/Editor.py" line="449"/>
<source><b>A Source Editor Window</b><p>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's titlebar.</p><p>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.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="747"/>
+ <location filename="../QScintilla/Editor.py" line="755"/>
<source>Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="750"/>
+ <location filename="../QScintilla/Editor.py" line="758"/>
<source>Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="753"/>
+ <location filename="../QScintilla/Editor.py" line="761"/>
<source>Revert to last saved state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="757"/>
+ <location filename="../QScintilla/Editor.py" line="765"/>
<source>Cut</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="760"/>
+ <location filename="../QScintilla/Editor.py" line="768"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="763"/>
- <source>Paste</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="771"/>
+ <source>Paste</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="779"/>
<source>Indent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="774"/>
+ <location filename="../QScintilla/Editor.py" line="782"/>
<source>Unindent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="777"/>
+ <location filename="../QScintilla/Editor.py" line="785"/>
<source>Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="780"/>
+ <location filename="../QScintilla/Editor.py" line="788"/>
<source>Uncomment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="783"/>
+ <location filename="../QScintilla/Editor.py" line="791"/>
<source>Stream Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="786"/>
+ <location filename="../QScintilla/Editor.py" line="794"/>
<source>Box Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="790"/>
+ <location filename="../QScintilla/Editor.py" line="798"/>
<source>Select to brace</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="792"/>
+ <location filename="../QScintilla/Editor.py" line="800"/>
<source>Select all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="793"/>
- <source>Deselect all</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7501"/>
- <source>Check spelling...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="801"/>
- <source>Check spelling of selection...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="805"/>
- <source>Remove from dictionary</source>
+ <source>Deselect all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7533"/>
+ <source>Check spelling...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="809"/>
+ <source>Check spelling of selection...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="813"/>
+ <source>Remove from dictionary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="817"/>
<source>Shorten empty lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="816"/>
+ <location filename="../QScintilla/Editor.py" line="824"/>
<source>Use Monospaced Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="821"/>
+ <location filename="../QScintilla/Editor.py" line="829"/>
<source>Autosave enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="825"/>
+ <location filename="../QScintilla/Editor.py" line="833"/>
<source>Typing aids enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="864"/>
+ <location filename="../QScintilla/Editor.py" line="872"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="870"/>
+ <location filename="../QScintilla/Editor.py" line="878"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="873"/>
+ <location filename="../QScintilla/Editor.py" line="881"/>
<source>Save As...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="886"/>
+ <location filename="../QScintilla/Editor.py" line="894"/>
<source>Print Preview</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="889"/>
+ <location filename="../QScintilla/Editor.py" line="897"/>
<source>Print</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="918"/>
+ <location filename="../QScintilla/Editor.py" line="926"/>
<source>Complete from Document</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="920"/>
+ <location filename="../QScintilla/Editor.py" line="928"/>
<source>Complete from APIs</source>
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="840"/>
+ <location filename="../QScintilla/Editor.py" line="848"/>
<source>Calltip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="936"/>
+ <location filename="../QScintilla/Editor.py" line="944"/>
<source>Check</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="956"/>
- <source>Show</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="958"/>
- <source>Code metrics...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="959"/>
- <source>Code coverage...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="961"/>
- <source>Show code coverage annotations</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="964"/>
- <source>Hide code coverage annotations</source>
+ <source>Show</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="966"/>
+ <source>Code metrics...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="967"/>
+ <source>Code coverage...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="969"/>
+ <source>Show code coverage annotations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="972"/>
+ <source>Hide code coverage annotations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="975"/>
<source>Profile data...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="980"/>
- <source>Diagrams</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="982"/>
- <source>Class Diagram...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="984"/>
- <source>Package Diagram...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="986"/>
- <source>Imports Diagram...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="988"/>
+ <source>Diagrams</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="990"/>
+ <source>Class Diagram...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="992"/>
+ <source>Package Diagram...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="994"/>
+ <source>Imports Diagram...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="996"/>
<source>Application Diagram...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1006"/>
+ <location filename="../QScintilla/Editor.py" line="1014"/>
<source>Languages</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1009"/>
+ <location filename="../QScintilla/Editor.py" line="1017"/>
<source>No Language</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1032"/>
+ <location filename="../QScintilla/Editor.py" line="1040"/>
<source>Guessed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1373"/>
+ <location filename="../QScintilla/Editor.py" line="1381"/>
<source>Alternatives</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1052"/>
+ <location filename="../QScintilla/Editor.py" line="1060"/>
<source>Encodings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1093"/>
+ <location filename="../QScintilla/Editor.py" line="1101"/>
<source>End-of-Line Type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1097"/>
+ <location filename="../QScintilla/Editor.py" line="1105"/>
<source>Unix</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1104"/>
+ <location filename="../QScintilla/Editor.py" line="1112"/>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1111"/>
+ <location filename="../QScintilla/Editor.py" line="1119"/>
<source>Macintosh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1129"/>
+ <location filename="../QScintilla/Editor.py" line="1137"/>
<source>Export as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1255"/>
+ <location filename="../QScintilla/Editor.py" line="1263"/>
<source>Toggle bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1257"/>
+ <location filename="../QScintilla/Editor.py" line="1265"/>
<source>Next bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1259"/>
+ <location filename="../QScintilla/Editor.py" line="1267"/>
<source>Previous bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1261"/>
+ <location filename="../QScintilla/Editor.py" line="1269"/>
<source>Clear all bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1281"/>
+ <location filename="../QScintilla/Editor.py" line="1289"/>
<source>Toggle breakpoint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1283"/>
+ <location filename="../QScintilla/Editor.py" line="1291"/>
<source>Toggle temporary breakpoint</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../QScintilla/Editor.py" line="1294"/>
+ <source>Edit breakpoint...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5414"/>
+ <source>Enable breakpoint</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1299"/>
+ <source>Next breakpoint</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1301"/>
+ <source>Previous breakpoint</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1303"/>
+ <source>Clear all breakpoints</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1272"/>
+ <source>Goto syntax error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1274"/>
+ <source>Show syntax error message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1276"/>
+ <source>Clear syntax error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1279"/>
+ <source>Next warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1282"/>
+ <source>Previous warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1284"/>
+ <source>Show warning message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../QScintilla/Editor.py" line="1286"/>
- <source>Edit breakpoint...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5406"/>
- <source>Enable breakpoint</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1291"/>
- <source>Next breakpoint</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1293"/>
- <source>Previous breakpoint</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1295"/>
- <source>Clear all breakpoints</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1264"/>
- <source>Goto syntax error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1266"/>
- <source>Show syntax error message</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1268"/>
- <source>Clear syntax error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1271"/>
- <source>Next warning</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1274"/>
- <source>Previous warning</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1276"/>
- <source>Show warning message</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1278"/>
<source>Clear warnings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1298"/>
- <source>Next uncovered line</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1301"/>
- <source>Previous uncovered line</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1304"/>
- <source>Next task</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="1306"/>
+ <source>Next uncovered line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1309"/>
+ <source>Previous uncovered line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1312"/>
+ <source>Next task</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1314"/>
<source>Previous task</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1318"/>
+ <location filename="../QScintilla/Editor.py" line="1326"/>
<source>LMB toggles bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1322"/>
+ <location filename="../QScintilla/Editor.py" line="1330"/>
<source>LMB toggles breakpoints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1358"/>
+ <location filename="../QScintilla/Editor.py" line="1366"/>
<source>Export source</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1350"/>
- <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="1358"/>
+ <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1366"/>
<source>No export format given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1369"/>
+ <location filename="../QScintilla/Editor.py" line="1377"/>
<source>Alternatives ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1389"/>
+ <location filename="../QScintilla/Editor.py" line="1397"/>
<source>Pygments Lexer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1389"/>
+ <location filename="../QScintilla/Editor.py" line="1397"/>
<source>Select the Pygments lexer to apply.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1865"/>
+ <location filename="../QScintilla/Editor.py" line="1873"/>
<source>Modification of Read Only file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1865"/>
+ <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 type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2556"/>
+ <location filename="../QScintilla/Editor.py" line="2564"/>
<source>Printing...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2573"/>
+ <location filename="../QScintilla/Editor.py" line="2581"/>
<source>Printing completed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2575"/>
+ <location filename="../QScintilla/Editor.py" line="2583"/>
<source>Error while printing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2578"/>
+ <location filename="../QScintilla/Editor.py" line="2586"/>
<source>Printing aborted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2936"/>
+ <location filename="../QScintilla/Editor.py" line="2944"/>
<source>File Modified</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2936"/>
+ <location filename="../QScintilla/Editor.py" line="2944"/>
<source><p>The file <b>{0}</b> has unsaved changes.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2996"/>
+ <location filename="../QScintilla/Editor.py" line="3004"/>
<source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3169"/>
+ <location filename="../QScintilla/Editor.py" line="3177"/>
<source>Save File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3110"/>
+ <location filename="../QScintilla/Editor.py" line="3118"/>
<source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3169"/>
+ <location filename="../QScintilla/Editor.py" line="3177"/>
<source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4602"/>
+ <location filename="../QScintilla/Editor.py" line="4610"/>
<source>Autocompletion</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4602"/>
+ <location filename="../QScintilla/Editor.py" line="4610"/>
<source>Autocompletion is not available because there is no autocompletion source set.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5409"/>
+ <location filename="../QScintilla/Editor.py" line="5417"/>
<source>Disable breakpoint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5786"/>
+ <location filename="../QScintilla/Editor.py" line="5794"/>
<source>Code Coverage</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5786"/>
+ <location filename="../QScintilla/Editor.py" line="5794"/>
<source>Please select a coverage file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5849"/>
+ <location filename="../QScintilla/Editor.py" line="5857"/>
<source>Show Code Coverage Annotations</source>
<translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5964"/>
+ <location filename="../QScintilla/Editor.py" line="5972"/>
<source>Profile Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5964"/>
+ <location filename="../QScintilla/Editor.py" line="5972"/>
<source>Please select a profile file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6124"/>
+ <location filename="../QScintilla/Editor.py" line="6132"/>
<source>Syntax Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6124"/>
+ <location filename="../QScintilla/Editor.py" line="6132"/>
<source>No syntax error message available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6439"/>
+ <location filename="../QScintilla/Editor.py" line="6471"/>
<source>Macro Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6439"/>
+ <location filename="../QScintilla/Editor.py" line="6471"/>
<source>Select a macro name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6467"/>
+ <location filename="../QScintilla/Editor.py" line="6499"/>
<source>Load macro file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6510"/>
+ <location filename="../QScintilla/Editor.py" line="6542"/>
<source>Macro files (*.macro)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6490"/>
+ <location filename="../QScintilla/Editor.py" line="6522"/>
<source>Error loading macro</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6481"/>
+ <location filename="../QScintilla/Editor.py" line="6513"/>
<source><p>The macro file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6490"/>
+ <location filename="../QScintilla/Editor.py" line="6522"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6510"/>
+ <location filename="../QScintilla/Editor.py" line="6542"/>
<source>Save macro file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6527"/>
+ <location filename="../QScintilla/Editor.py" line="6559"/>
<source>Save macro</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6527"/>
+ <location filename="../QScintilla/Editor.py" line="6559"/>
<source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6543"/>
+ <location filename="../QScintilla/Editor.py" line="6575"/>
<source>Error saving macro</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6543"/>
+ <location filename="../QScintilla/Editor.py" line="6575"/>
<source><p>The macro file <b>{0}</b> could not be written.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6556"/>
+ <location filename="../QScintilla/Editor.py" line="6588"/>
<source>Start Macro Recording</source>
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6582"/>
+ <location filename="../QScintilla/Editor.py" line="6614"/>
<source>Macro Recording</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6582"/>
+ <location filename="../QScintilla/Editor.py" line="6614"/>
<source>Enter name of the macro:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6720"/>
+ <location filename="../QScintilla/Editor.py" line="6752"/>
<source>File changed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6884"/>
+ <location filename="../QScintilla/Editor.py" line="6916"/>
<source>{0} (ro)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7024"/>
+ <location filename="../QScintilla/Editor.py" line="7056"/>
<source>Drop Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7024"/>
+ <location filename="../QScintilla/Editor.py" line="7056"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7045"/>
- <source>Resources</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7047"/>
- <source>Add file...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7049"/>
- <source>Add files...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7051"/>
- <source>Add aliased file...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7054"/>
- <source>Add localized resource...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7058"/>
- <source>Add resource frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="7077"/>
+ <source>Resources</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7079"/>
+ <source>Add file...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7081"/>
+ <source>Add files...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7083"/>
+ <source>Add aliased file...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7086"/>
+ <source>Add localized resource...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7090"/>
+ <source>Add resource frame</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7109"/>
<source>Add file resource</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7093"/>
+ <location filename="../QScintilla/Editor.py" line="7125"/>
<source>Add file resources</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7121"/>
+ <location filename="../QScintilla/Editor.py" line="7153"/>
<source>Add aliased file resource</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7121"/>
+ <location filename="../QScintilla/Editor.py" line="7153"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7185"/>
+ <location filename="../QScintilla/Editor.py" line="7217"/>
<source>Package Diagram</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7185"/>
+ <location filename="../QScintilla/Editor.py" line="7217"/>
<source>Include class attributes?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7205"/>
+ <location filename="../QScintilla/Editor.py" line="7237"/>
<source>Imports Diagram</source>
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7219"/>
+ <location filename="../QScintilla/Editor.py" line="7251"/>
<source>Application Diagram</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7219"/>
+ <location filename="../QScintilla/Editor.py" line="7251"/>
<source>Include module names?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7504"/>
+ <location filename="../QScintilla/Editor.py" line="7536"/>
<source>Add to dictionary</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7506"/>
+ <location filename="../QScintilla/Editor.py" line="7538"/>
<source>Ignore All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6378"/>
+ <location filename="../QScintilla/Editor.py" line="6410"/>
<source>Warning: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6385"/>
+ <location filename="../QScintilla/Editor.py" line="6417"/>
<source>Error: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6716"/>
+ <location filename="../QScintilla/Editor.py" line="6748"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="882"/>
+ <location filename="../QScintilla/Editor.py" line="890"/>
<source>Open 'rejection' file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="992"/>
+ <location filename="../QScintilla/Editor.py" line="1000"/>
<source>Load Diagram...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1309"/>
+ <location filename="../QScintilla/Editor.py" line="1317"/>
<source>Next change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1312"/>
+ <location filename="../QScintilla/Editor.py" line="1320"/>
<source>Previous change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7918"/>
+ <location filename="../QScintilla/Editor.py" line="7950"/>
<source>Sort Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7918"/>
+ <location filename="../QScintilla/Editor.py" line="7950"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6314"/>
+ <location filename="../QScintilla/Editor.py" line="6346"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6314"/>
+ <location filename="../QScintilla/Editor.py" line="6346"/>
<source>No warning messages available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6375"/>
+ <location filename="../QScintilla/Editor.py" line="6407"/>
<source>Style: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="856"/>
+ <location filename="../QScintilla/Editor.py" line="864"/>
<source>New Document View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="859"/>
+ <location filename="../QScintilla/Editor.py" line="867"/>
<source>New Document View (with new split)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="946"/>
+ <location filename="../QScintilla/Editor.py" line="954"/>
<source>Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1074"/>
+ <location filename="../QScintilla/Editor.py" line="1082"/>
<source>Re-Open With Encoding</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6710"/>
+ <location filename="../QScintilla/Editor.py" line="6742"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="832"/>
+ <location filename="../QScintilla/Editor.py" line="840"/>
<source>Automatic Completion enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="912"/>
+ <location filename="../QScintilla/Editor.py" line="920"/>
<source>Complete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4727"/>
+ <location filename="../QScintilla/Editor.py" line="4735"/>
<source>Auto-Completion Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4727"/>
+ <location filename="../QScintilla/Editor.py" line="4735"/>
<source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4989"/>
+ <location filename="../QScintilla/Editor.py" line="4997"/>
<source>Call-Tips Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4989"/>
+ <location filename="../QScintilla/Editor.py" line="4997"/>
<source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8005"/>
+ <location filename="../QScintilla/Editor.py" line="8037"/>
<source>Register Mouse Click Handler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8005"/>
+ <location filename="../QScintilla/Editor.py" line="8037"/>
<source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="876"/>
+ <location filename="../QScintilla/Editor.py" line="884"/>
<source>Save Copy...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="915"/>
+ <location filename="../QScintilla/Editor.py" line="923"/>
<source>Clear Completions Cache</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="842"/>
+ <location filename="../QScintilla/Editor.py" line="850"/>
<source>Code Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1315"/>
+ <location filename="../QScintilla/Editor.py" line="1323"/>
<source>Clear changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="767"/>
+ <location filename="../QScintilla/Editor.py" line="775"/>
<source>Execute Selection In Console</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8126"/>
+ <location filename="../QScintilla/Editor.py" line="8158"/>
<source>EditorConfig Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8126"/>
+ <location filename="../QScintilla/Editor.py" line="8158"/>
<source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -13578,7 +13578,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1860"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1883"/>
<source>Various</source>
<translation type="unfinished"></translation>
</message>
@@ -13593,12 +13593,12 @@
<translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -13933,12 +13933,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/>
<source>Background:</source>
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -13988,12 +13988,12 @@
<translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -14032,6 +14032,16 @@
<source>Select the colour for the error line marker.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+ <source>Conflict Marker Line:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+ <source>Select the colour for the conflict marker line marker</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EditorSyntaxPage</name>
@@ -49147,27 +49157,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 type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1678"/>
+ <location filename="../Preferences/__init__.py" line="1679"/>
<source>Import Preferences</source>
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1780"/>
+ <location filename="../Preferences/__init__.py" line="1781"/>
<source>Select Python{0} Interpreter</source>
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
