--- a/i18n/eric6_en.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_en.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8534,7 +8534,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation type="unfinished"></translation> </message> @@ -8624,7 +8624,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -8854,7 +8854,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -8969,347 +8969,347 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <source>Modification of Read Only file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <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="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9334,27 +9334,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9379,7 +9379,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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> @@ -10304,16 +10304,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> - <source>Select whether indentation guides should be shown.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> - <source>Show Indentation Guides</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="155"/> <source>Select whether tab characters are used for indentations.</source> <translation type="unfinished"></translation> @@ -10324,12 +10314,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether autoindentation shall be enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation type="unfinished"></translation> </message> @@ -10344,62 +10334,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> <source>Tab key indents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> + <source>Select to allow the cursor to be moved into virtual space</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation type="unfinished"></translation> </message> @@ -12048,7 +12038,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation type="unfinished"></translation> </message> @@ -12063,12 +12053,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation type="unfinished"></translation> </message> @@ -12318,100 +12308,135 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -32545,7 +32570,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation type="unfinished"></translation> </message> @@ -32560,67 +32585,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation type="unfinished"></translation> </message> @@ -35302,27 +35327,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -60235,12 +60260,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1335"/> - <source>Alt+Space</source> - <comment>Edit|Calltip</comment> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="1342"/> <source>Show Calltips</source> <translation type="unfinished"></translation> @@ -62643,6 +62662,12 @@ <source><b>Complete from Document and APIs</b><p>Performs a completion from document and APIs of the word containing the cursor.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1335"/> + <source>Meta+Alt+Space</source> + <comment>Edit|Calltip</comment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name>