--- a/eric6/i18n/eric6_empty.ts Mon Apr 13 16:57:44 2020 +0200 +++ b/eric6/i18n/eric6_empty.ts Mon Apr 13 17:35:49 2020 +0200 @@ -4126,11 +4126,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/> - <source>Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="42"/> <source>Select to generate a QColorDialog.getRgba dialog</source> <translation type="unfinished"></translation> @@ -4201,11 +4196,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/> - <source>Enter a variable name or a colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/> <source>Qt.red</source> <translation type="unfinished"></translation> @@ -4311,11 +4301,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/> - <source>Colour Variable</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="299"/> <source>Enter the alpha value</source> <translation type="unfinished"></translation> @@ -4366,8 +4351,23 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/> + <source>Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/> + <source>Enter a variable name or a color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/> + <source>Color Variable</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="72"/> - <source><p>The colour <b>{0}</b> is not valid.</p></source> + <source><p>The color <b>{0}</b> is not valid.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -7452,21 +7452,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/> - <source>Background Colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/> - <source>Select the background colour for changed items.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/> - <source>Select the background colour for elements which are loaded for the first time.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="669"/> <source>Changed elements:</source> <translation type="unfinished"></translation> @@ -7476,6 +7461,21 @@ <source>First time opened elements:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="630"/> + <source>Background Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="659"/> + <source>Select the background color for changed items.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="695"/> + <source>Select the background color for elements which are loaded for the first time.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebuggerInterfacePython</name> @@ -7958,110 +7958,110 @@ <context> <name>DiffColoursPage</name> <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/> - <source><b>Configure Diff colours</b></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/> - <source>Select the background colour for header lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/> - <source>Header Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/> <source>Header Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/> - <source>Select the background colour for bad whitespace</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/> - <source>Whitespace Colour</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/> - <source>Select the text foreground colour</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/> - <source>Text Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/> <source>Normal Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/> - <source>Select the background colour for additions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/> - <source>Added Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/> <source>Added Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/> - <source>Select the background colour for removed text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/> - <source>Removed Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/> <source>Removed Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/> - <source>Select the background colour for replaced text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/> - <source>Replaced Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/> <source>Replaced Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/> - <source>Select the background colour for context lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/> - <source>Context Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/> <source>Context Line</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/> + <source><b>Configure Diff colors</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/> + <source>Select the background color for header lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/> + <source>Header Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/> + <source>Select the background color for bad whitespace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/> + <source>Whitespace Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/> + <source>Select the text foreground color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/> + <source>Text Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/> + <source>Select the background color for additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/> + <source>Added Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/> + <source>Select the background color for removed text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/> + <source>Removed Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/> + <source>Select the background color for replaced text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/> + <source>Replaced Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/> + <source>Select the background color for context lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/> + <source>Context Color</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DiffDialog</name> @@ -10735,7 +10735,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7839"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -11005,7 +11005,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5608"/> + <location filename="../QScintilla/Editor.py" line="5612"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -11180,327 +11180,327 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4773"/> + <location filename="../QScintilla/Editor.py" line="4777"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4773"/> + <location filename="../QScintilla/Editor.py" line="4777"/> <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="4903"/> + <location filename="../QScintilla/Editor.py" line="4907"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4903"/> + <location filename="../QScintilla/Editor.py" line="4907"/> <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="5178"/> + <location filename="../QScintilla/Editor.py" line="5182"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5178"/> + <location filename="../QScintilla/Editor.py" line="5182"/> <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="5611"/> + <location filename="../QScintilla/Editor.py" line="5615"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5986"/> + <location filename="../QScintilla/Editor.py" line="5990"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5986"/> + <location filename="../QScintilla/Editor.py" line="5990"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6053"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6042"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6053"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6166"/> + <location filename="../QScintilla/Editor.py" line="6170"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6166"/> + <location filename="../QScintilla/Editor.py" line="6170"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6328"/> + <location filename="../QScintilla/Editor.py" line="6332"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6328"/> + <location filename="../QScintilla/Editor.py" line="6332"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6542"/> + <location filename="../QScintilla/Editor.py" line="6546"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6542"/> + <location filename="../QScintilla/Editor.py" line="6546"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6604"/> + <location filename="../QScintilla/Editor.py" line="6608"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6607"/> + <location filename="../QScintilla/Editor.py" line="6611"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6618"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6719"/> + <location filename="../QScintilla/Editor.py" line="6723"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6719"/> + <location filename="../QScintilla/Editor.py" line="6723"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6747"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6794"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6770"/> + <location filename="../QScintilla/Editor.py" line="6774"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <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="6770"/> + <location filename="../QScintilla/Editor.py" line="6774"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6794"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6807"/> + <location filename="../QScintilla/Editor.py" line="6811"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6807"/> + <location filename="../QScintilla/Editor.py" line="6811"/> <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="6823"/> + <location filename="../QScintilla/Editor.py" line="6827"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6823"/> + <location filename="../QScintilla/Editor.py" line="6827"/> <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="6836"/> + <location filename="../QScintilla/Editor.py" line="6840"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6836"/> + <location filename="../QScintilla/Editor.py" line="6840"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6862"/> + <location filename="../QScintilla/Editor.py" line="6866"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6862"/> + <location filename="../QScintilla/Editor.py" line="6866"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6992"/> + <location filename="../QScintilla/Editor.py" line="6996"/> <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="6998"/> - <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="7002"/> + <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="7006"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7167"/> + <location filename="../QScintilla/Editor.py" line="7171"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7308"/> + <location filename="../QScintilla/Editor.py" line="7312"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7308"/> + <location filename="../QScintilla/Editor.py" line="7312"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7329"/> - <source>Resources</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7331"/> - <source>Add file...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7333"/> - <source>Add files...</source> + <source>Resources</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7337"/> + <source>Add files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7339"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7338"/> - <source>Add localized resource...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7342"/> + <source>Add localized resource...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7361"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7377"/> + <location filename="../QScintilla/Editor.py" line="7381"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7404"/> + <location filename="../QScintilla/Editor.py" line="7408"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7404"/> + <location filename="../QScintilla/Editor.py" line="7408"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7470"/> + <location filename="../QScintilla/Editor.py" line="7474"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7470"/> + <location filename="../QScintilla/Editor.py" line="7474"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7492"/> + <location filename="../QScintilla/Editor.py" line="7496"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7492"/> + <location filename="../QScintilla/Editor.py" line="7496"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7506"/> + <location filename="../QScintilla/Editor.py" line="7510"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7506"/> + <location filename="../QScintilla/Editor.py" line="7510"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7838"/> + <location filename="../QScintilla/Editor.py" line="7842"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7840"/> + <location filename="../QScintilla/Editor.py" line="7844"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8256"/> + <location filename="../QScintilla/Editor.py" line="8260"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8256"/> + <location filename="../QScintilla/Editor.py" line="8260"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8345"/> + <location filename="../QScintilla/Editor.py" line="8349"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8345"/> + <location filename="../QScintilla/Editor.py" line="8349"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11525,12 +11525,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8466"/> + <location filename="../QScintilla/Editor.py" line="8470"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8466"/> + <location filename="../QScintilla/Editor.py" line="8470"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -12080,37 +12080,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/> - <source>Colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/> - <source>Background colour:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/> - <source>Select the background colour for calltips.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="167"/> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="213"/> <source>Plug-In Behavior</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="219"/> <source>Select to show QScintilla provided calltips, if the selected plug-ins fail</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="176"/> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="222"/> <source>Qscintilla provided calltips are shown, if this option is enabled and calltips shall be provided by plug-ins (see calltips sub-page of the plug-in) and the plugin-ins don't deliver any calltips.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="179"/> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="225"/> <source>Show QScintilla calltips, if plug-ins fail</source> <translation type="unfinished"></translation> </message> @@ -12124,6 +12109,41 @@ <source>Above Text</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="122"/> + <source>Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="128"/> + <source>Background color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="141"/> + <source>Select the background color for calltips.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="164"/> + <source>Foreground color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="177"/> + <source>Select the foreground color for calltips.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="187"/> + <source>Highlight color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="200"/> + <source>Select the highlight color for calltips.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorCalltipsQScintillaPage</name> @@ -13058,26 +13078,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/> - <source>Select the foreground colour.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/> - <source>Foreground Colour</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/> - <source>Select the background colour.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> - <source>Background Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="194"/> <source>Select the font.</source> <translation type="unfinished"></translation> @@ -13118,16 +13118,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/> - <source>Select the background colour for all styles</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/> - <source>All Background Colours</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="283"/> <source>Select the font for all styles.</source> <translation type="unfinished"></translation> @@ -13317,6 +13307,36 @@ <source>Press to set all sub-styles to default values</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="174"/> + <source>Select the foreground color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/> + <source>Foreground Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="184"/> + <source>Select the background color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> + <source>Background Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/> + <source>Select the background color for all styles</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/> + <source>All Background Colors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -14151,16 +14171,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/> - <source>Marker Colour:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/> - <source>Select the colour for the search markers.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/> <source>Regular Expression Type</source> <translation type="unfinished"></translation> @@ -14185,6 +14195,16 @@ <source>QScintilla Extended Mode (C++11)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/> + <source>Marker Color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/> + <source>Select the color for the search markers.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSpellCheckingPage</name> @@ -14254,21 +14274,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/> - <source>Colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/> - <source>Marker Colour:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/> - <source>Select the colour for the spelling markers.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="260"/> <source>Personal lists</source> <translation type="unfinished"></translation> @@ -14349,6 +14354,21 @@ <p>Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/> + <source>Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/> + <source>Marker Color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="234"/> + <source>Select the color for the spelling markers.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorStylesPage</name> @@ -14363,41 +14383,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> - <source>Colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> - <source>Select to set the colour of the edit area different to the default style</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> - <source>Override edit area colours</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="68"/> <source>Edit area foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/> - <source>Select the foreground colour for the edit area.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="91"/> <source>Edit area background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/> - <source>Select the background colour for the edit area.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="163"/> <source>Fonts</source> <translation type="unfinished"></translation> @@ -14533,51 +14528,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/> - <source>Select the foreground colour for the margins</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="361"/> <source>Margins background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/> - <source>Select the background colour for the margins</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="384"/> <source>Foldmargin background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/> - <source>Select the background colour for the foldmargin</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="407"/> <source>Foldmarkers foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="430"/> <source>Foldmarkers background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> - <source>Select the background colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> <source>Press to select the font for the editor line numbers</source> <translation type="unfinished"></translation> @@ -14598,31 +14568,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/> - <source>Select to use custom selection colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> - <source>Use custom selection colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/> - <source>Select, if selected text should be colourized by the lexer.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/> - <source>Colourize selected text</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="538"/> <source>Select to extend selection to end of line</source> <translation type="unfinished"></translation> @@ -14638,21 +14583,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/> - <source>Select the foreground colour for the selection.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/> <source>Selection background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/> - <source>Select the background colour for the selection.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/> <source>Caret</source> <translation type="unfinished"></translation> @@ -14668,16 +14603,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> - <source>Select the colour for the caret.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/> - <source>Select the background colour for the line containing the caret.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/> <source>Braces</source> <translation type="unfinished"></translation> @@ -14698,41 +14623,21 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/> - <source>Select the colour for highlighting matching braces.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="896"/> <source>Matched braces background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/> - <source>Select the background colour for highlighting matching braces.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="925"/> <source>Unmatched brace:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/> - <source>Select the colour for highlighting nonmatching braces.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/> <source>Unmatched brace background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> - <source>Select the background colour for highlighting nonmatching braces.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="968"/> <source>End of Line</source> <translation type="unfinished"></translation> @@ -14778,16 +14683,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/> - <source>Select the colour for the edge marker.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/> - <source>Background colour:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1147"/> <source>Move to set the edge column.</source> <translation type="unfinished"></translation> @@ -14813,11 +14708,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/> - <source>Change Background Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1236"/> <source>Zoom</source> <translation type="unfinished"></translation> @@ -14858,21 +14748,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/> - <source>Press to select the foreground colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/> <source>Foreground</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/> - <source>Press to select the background colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1415"/> <source>Background</source> <translation type="unfinished"></translation> @@ -14933,26 +14813,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/> - <source>Unsaved changes colour:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/> - <source>Select the colour for the change marker for unsaved changes.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/> - <source>Saved changes colour:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/> - <source>Select the colour for the change marker for saved changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1565"/> <source>Whitespace</source> <translation type="unfinished"></translation> @@ -14983,21 +14843,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> - <source>Select the foreground colour for visible whitespace</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1646"/> <source>Whitespace background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> - <source>Select the background colour for visible whitespace</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1674"/> <source>Indentation Guides</source> <translation type="unfinished"></translation> @@ -15018,21 +14868,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> - <source>Select the foreground colour for indentation guides</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1715"/> <source>Indentation Guides background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> - <source>Select the background colour for indentation guides</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1743"/> <source>Marker Map</source> <translation type="unfinished"></translation> @@ -15043,101 +14883,51 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/> - <source>Select the colour for error markers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1792"/> <source>Warnings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/> - <source>Select the colour for warning markers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1815"/> <source>Bookmarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/> - <source>Select the colour for bookmark markers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1838"/> <source>Breakpoints:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/> - <source>Select the colour for breakpoint markers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1861"/> <source>Tasks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/> - <source>Select the colour for task markers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1884"/> <source>Changes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/> - <source>Select the colour for change markers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1907"/> <source>Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/> - <source>Select the colour for coverage markers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1930"/> <source>Current Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/> - <source>Select the colour for the current line marker</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1953"/> <source>Search Markers:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/> - <source>Select the colour for the search marker</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1999"/> <source>Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/> - <source>Select the background colour for the marker map</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2077"/> <source>Various</source> <translation type="unfinished"></translation> @@ -15198,11 +14988,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> - <source>Use background colours</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="808"/> <source>Current line marker:</source> <translation type="unfinished"></translation> @@ -15213,31 +14998,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/> - <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/> - <source>Select the colour for the current line marker.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> - <source>Select the colour for the error line marker.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1976"/> <source>Conflict Marker Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/> - <source>Select the colour for the conflict marker line marker</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1749"/> <source>Select to show the marker map right of the editor</source> <translation type="unfinished"></translation> @@ -15384,8 +15149,263 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> + <source>Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> + <source>Select to set the color of the edit area different to the default style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Override edit area colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="81"/> + <source>Select the foreground color for the edit area.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="104"/> + <source>Select the background color for the edit area.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <source>Select the color for the caret.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="351"/> + <source>Select the foreground color for the margins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="374"/> + <source>Select the background color for the margins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="397"/> + <source>Select the background color for the foldmargin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="420"/> + <source>Select the foreground color of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <source>Select the background color of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="515"/> + <source>Select to use custom selection colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="518"/> + <source><b>Use custom selection colors</b><p>Select this entry in order to use custom selection colors in the editor and shell windows. The colors for the selection foreground and background are defined on the colors page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> + <source>Use custom selection colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="528"/> + <source>Select, if selected text should be colorized by the lexer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="531"/> + <source>Colorize selected text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="565"/> + <source>Select the foreground color for the selection.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="588"/> + <source>Select the background color for the selection.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="761"/> + <source>Select the background color for the line containing the caret.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="798"/> + <source>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <source>Use background colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="821"/> + <source>Select the color for the current line marker.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <source>Select the color for the error line marker.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/> + <source>Select the color for highlighting matching braces.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/> + <source>Select the background color for highlighting matching braces.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="932"/> + <source>Select the color for highlighting nonmatching braces.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <source>Select the background color for highlighting nonmatching braces.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1124"/> + <source>Select the color for the edge marker.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1134"/> + <source>Background color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1222"/> + <source>Change Background Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1402"/> + <source>Press to select the foreground color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1412"/> + <source>Press to select the background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/> + <source>Unsaved changes color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/> + <source>Select the color for the change marker for unsaved changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1537"/> + <source>Saved changes color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1550"/> + <source>Select the color for the change marker for saved changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <source>Select the foreground color for visible whitespace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <source>Select the background color for visible whitespace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <source>Select the foreground color for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <source>Select the background color for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1763"/> - <source>Marker Colours</source> + <source>Marker Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1782"/> + <source>Select the color for error markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1805"/> + <source>Select the color for warning markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1828"/> + <source>Select the color for bookmark markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1851"/> + <source>Select the color for breakpoint markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1874"/> + <source>Select the color for task markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1897"/> + <source>Select the color for change markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1920"/> + <source>Select the color for coverage markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1943"/> + <source>Select the color for the current line marker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1966"/> + <source>Select the color for the search marker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1989"/> + <source>Select the color for the conflict marker line marker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/> + <source>Select the background color for the marker map</source> <translation type="unfinished"></translation> </message> </context> @@ -16480,111 +16500,51 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/> - <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/> - <source>Colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/> - <source>Press to select the class and function header background colour.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="271"/> <source>Class/Function Header Background</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/> - <source>Press to select the class and function header foreground colour.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="281"/> <source>Class/Function Header Foreground</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/> - <source>Press to select the level 2 header background colour.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="291"/> <source>Level 2 Header Background</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/> - <source>Press to select the level 2 header foreground colour.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="301"/> <source>Level 2 Header Foreground</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/> - <source>Press to select the level 1 header background colour.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="311"/> <source>Level 1 Header Background</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/> - <source>Press to select the level 1 header foreground colour.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="321"/> <source>Level 1 Header Foreground</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/> - <source>Press to select the body background colour.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="331"/> <source>Body Background</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/> - <source>Press to select the body foreground colour.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="341"/> <source>Body Foreground</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/> - <source>Press to select the foreground colour of links.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="351"/> <source>Links</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/> - <source>This shows an example of the selected colours.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="372"/> <source>QtHelp</source> <translation type="unfinished"></translation> @@ -16664,6 +16624,66 @@ <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="252"/> + <source>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/> + <source>Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="268"/> + <source>Press to select the class and function header background color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="278"/> + <source>Press to select the class and function header foreground color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="288"/> + <source>Press to select the level 2 header background color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="298"/> + <source>Press to select the level 2 header foreground color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="308"/> + <source>Press to select the level 1 header background color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="318"/> + <source>Press to select the level 1 header foreground color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="328"/> + <source>Press to select the body background color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="338"/> + <source>Press to select the body foreground color.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="348"/> + <source>Press to select the foreground color of links.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="358"/> + <source>This shows an example of the selected colors.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -27556,21 +27576,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/> - <source>Select the foreground colour of the address area</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="291"/> <source>Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/> - <source>Select the background colour of the address area</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="178"/> <source>ASCII Area</source> <translation type="unfinished"></translation> @@ -27601,31 +27611,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/> - <source>Select the foreground colour for highlighted data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/> - <source>Select the background colour for highlighted data</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="262"/> <source>Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/> - <source>Select the foreground colour of the selection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/> - <source>Select the background colour of the selection</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="317"/> <source>Font</source> <translation type="unfinished"></translation> @@ -27655,6 +27645,36 @@ <source>Enter the number of recent files to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="142"/> + <source>Select the foreground color of the address area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="165"/> + <source>Select the background color of the address area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="226"/> + <source>Select the foreground color for highlighted data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="249"/> + <source>Select the background color for highlighted data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="281"/> + <source>Select the foreground color of the selection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HexEditorPage.ui" line="304"/> + <source>Select the background color of the selection</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Hg</name> @@ -37187,11 +37207,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/> - <source>Select to invert the background colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="74"/> <source>Invert Background</source> <translation type="unfinished"></translation> @@ -37206,6 +37221,11 @@ <source>Select to refresh the icons display</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/IconsPreviewDialog.ui" line="71"/> + <source>Select to invert the background color</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>IdlCompilerDefineNameDialog</name> @@ -39328,126 +39348,61 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/> - <source>Colours</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="108"/> <source>Network Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/> - <source>Select the colour for network messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="131"/> <source>Nick Names:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/> - <source>Select the colour for nick names</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="154"/> <source>Server Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/> - <source>Select the colour for server messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="177"/> <source>Own Nick Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/> - <source>Select the colour for own nick name</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="200"/> <source>Channel Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/> - <source>Select the colour for channel messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="223"/> <source>Join Channel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/> - <source>Select the colour for join channel messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="246"/> <source>Error Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/> - <source>Select the colour for error messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="269"/> <source>Leave Channel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/> - <source>Select the colour for leave channel messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="292"/> <source>Timestamp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/> - <source>Select the colour for timestamps</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="315"/> <source>Channel Info:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/> - <source>Select the colour for channel info messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="338"/> <source>Hyperlink:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/> - <source>Select the colour for hyperlinks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/> - <source>Enable to allow coloured text in IRC messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="367"/> <source>Allow Colored Text in IRC Messages</source> <translation type="unfinished"></translation> @@ -39553,21 +39508,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/> - <source>Select the foreground colour for the marker</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="834"/> <source>Marker Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/> - <source>Select the background colour for the marker</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="862"/> <source>Shutdown</source> <translation type="unfinished"></translation> @@ -39582,6 +39527,81 @@ <source>Confirm Shutdown When Connected</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="102"/> + <source>Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="121"/> + <source>Select the color for network messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="144"/> + <source>Select the color for nick names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="167"/> + <source>Select the color for server messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="190"/> + <source>Select the color for own nick name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="213"/> + <source>Select the color for channel messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="236"/> + <source>Select the color for join channel messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="259"/> + <source>Select the color for error messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="282"/> + <source>Select the color for leave channel messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="305"/> + <source>Select the color for timestamps</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="328"/> + <source>Select the color for channel info messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="351"/> + <source>Select the color for hyperlinks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="364"/> + <source>Enable to allow colored text in IRC messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="824"/> + <source>Select the foreground color for the marker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IrcPage.ui" line="847"/> + <source>Select the background color for the marker</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>IrcServerEditDialog</name> @@ -42273,16 +42293,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/> - <source>Error Colour:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/> - <source>Select the colour for text sent to stderr</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="87"/> <source>Message Filters:</source> <translation type="unfinished"></translation> @@ -42317,6 +42327,16 @@ <source><b>Message Filters for both</b><p>This list shows the configured message filters used to suppress messages received via stdout or stderr.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="49"/> + <source>Error Color:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/LogViewerPage.ui" line="62"/> + <source>Select the color for text sent to stderr</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MakePropertiesDialog</name> @@ -43386,27 +43406,27 @@ <context> <name>MicroPythonGraphWidget</name> <message> - <location filename="../MicroPython/MicroPythonGraphWidget.py" line="63"/> + <location filename="../MicroPython/MicroPythonGraphWidget.py" line="64"/> <source>Press to save the raw data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonGraphWidget.py" line="72"/> + <location filename="../MicroPython/MicroPythonGraphWidget.py" line="73"/> <source>max. X:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonGraphWidget.py" line="81"/> + <location filename="../MicroPython/MicroPythonGraphWidget.py" line="82"/> <source>Enter the maximum number of data points to be plotted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/> + <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/> <source>Save Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonGraphWidget.py" line="311"/> + <location filename="../MicroPython/MicroPythonGraphWidget.py" line="329"/> <source><p>The chart data could not be saved into file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -43474,93 +43494,153 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="169"/> + <source>MPY Cross Compiler</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="175"/> + <source>Program:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="191"/> + <source>Enter the path of the cross compiler executable</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="67"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="284"/> + <source>Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="290"/> + <source>MicroPython:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="297"/> + <source>Enter the URL for the MicroPython documentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="304"/> + <source>CircuitPython:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="311"/> + <source>Enter the URL for the CircuitPython documentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="318"/> + <source>BBC micro:bit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="325"/> + <source>Enter the URL for the BBC micro:bit MicroPython documentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="201"/> + <source>PyBoard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="207"/> + <source>dfu-util Path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="223"/> + <source>Enter the path of the dfu-util flashing executable</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="233"/> + <source>Firmware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="246"/> + <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="260"/> + <source>Enter the URL for the CircuitPython firmware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="274"/> + <source>Enter the URL for the BBC micro:bit Firmware</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/> - <source>MPY Cross Compiler</source> + <source>Chart Pane</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="146"/> - <source>Program:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="162"/> - <source>Enter the path of the cross compiler executable</source> + <source>Color Theme:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="159"/> + <source>Select the color scheme of the chart</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="42"/> - <source>All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="255"/> - <source>Documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="261"/> - <source>MicroPython:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="268"/> - <source>Enter the URL for the MicroPython documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="275"/> - <source>CircuitPython:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="282"/> - <source>Enter the URL for the CircuitPython documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="289"/> - <source>BBC micro:bit:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="296"/> - <source>Enter the URL for the BBC micro:bit MicroPython documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="172"/> - <source>PyBoard</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="178"/> - <source>dfu-util Path:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="194"/> - <source>Enter the path of the dfu-util flashing executable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="204"/> - <source>Firmware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="217"/> - <source>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="231"/> - <source>Enter the URL for the CircuitPython firmware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="245"/> - <source>Enter the URL for the BBC micro:bit Firmware</source> + <source>Automatic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="44"/> + <source>Light</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="46"/> + <source>Dark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="48"/> + <source>Blue Cerulean</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="50"/> + <source>Brown Sand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="52"/> + <source>Blue NCS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="54"/> + <source>High Contrast</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="56"/> + <source>Blue Icy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/MicroPythonPage.py" line="58"/> + <source>Qt</source> <translation type="unfinished"></translation> </message> </context> @@ -43605,59 +43685,59 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="420"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="442"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="245"/> <source><h3>The QtSerialPort package is not available.<br/>MicroPython support is deactivated.</h3></source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../MicroPython/MicroPythonWidget.py" line="263"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="282"/> <source>%n supported device(s) detected.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="269"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="288"/> <source>{0} at {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="277"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="296"/> <source>No supported devices detected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="390"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="412"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="392"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="414"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="393"/> - <source>Paste</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../MicroPython/MicroPythonWidget.py" line="415"/> + <source>Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="437"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="436"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="458"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="436"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="458"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -43666,217 +43746,217 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="485"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="485"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="875"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="875"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="920"/> <source>Run Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="903"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="911"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="920"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="943"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="943"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="987"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="987"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1016"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1016"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1121"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/> - <source>Synchronize Time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> - <source>Show Device Time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> - <source>Show Local Time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/> - <source>Compile Python File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> - <source>Compile Current Editor</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/> - <source><h3>Device Version Information</h3></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1157"/> - <source>No version information available.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1159"/> - <source>Device Version Information</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1182"/> - <source>unknown</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> - <source>Device Implementation Information</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> - <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/> - <source><p>The time of the connected device was synchronized with the local time.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/> - <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1240"/> - <source><h3>Device Date and Time</h3><p>{0}</p></source> + <source>Synchronize Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1129"/> + <source>Show Device Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <source>Show Local Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1443"/> + <source>Compile Python File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1463"/> + <source>Compile Current Editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <source><h3>Device Version Information</h3></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1179"/> + <source>No version information available.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1181"/> + <source>Device Version Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1204"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1208"/> + <source>Device Implementation Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1208"/> + <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/> + <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> + <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> + <source><h3>Device Date and Time</h3><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1276"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1289"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1267"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1289"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1356"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1334"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1356"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1373"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1395"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1391"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1401"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1423"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1411"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1433"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1434"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1456"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="175"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="193"/> <source>MicroPython Menu</source> <translation type="unfinished"></translation> </message> @@ -43886,47 +43966,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1000"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1080"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1134"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1156"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1138"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1160"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1113"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1152"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1332"/> <source>Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1293"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1315"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1332"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> @@ -49160,17 +49240,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1630"/> + <location filename="../Preferences/__init__.py" line="1634"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1658"/> + <location filename="../Preferences/__init__.py" line="1662"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1658"/> + <location filename="../Preferences/__init__.py" line="1662"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> @@ -49380,16 +49460,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/> - <source>Colour Mode:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/> - <source>Colour</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="84"/> <source>Gray Scale</source> <translation type="unfinished"></translation> @@ -49469,6 +49539,16 @@ <source>Enter the bottom margin in cm.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="49"/> + <source>Color Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PrinterPage.ui" line="77"/> + <source>Color</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProgramsDialog</name> @@ -51081,21 +51161,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/> - <source>Colours</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="43"/> <source>Highlighted entries (Others):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/> - <source>Select the colour for highlighted entries in the Others viewer.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="82"/> <source>Visible Project Browsers</source> <translation type="unfinished"></translation> @@ -51220,6 +51290,16 @@ <source>Protocols (protobuf) Browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="37"/> + <source>Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/ProjectBrowserPage.ui" line="56"/> + <source>Select the color for highlighted entries in the Others viewer.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectFormsBrowser</name> @@ -60849,38 +60929,38 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="767"/> + <location filename="../QScintilla/Shell.py" line="771"/> <source>Select History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="767"/> + <location filename="../QScintilla/Shell.py" line="771"/> <source>Select the history entry to execute (most recent shown last).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="835"/> - <source>Passive Debug Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="836"/> - <source> -Not connected</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="839"/> + <source>Passive Debug Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="840"/> + <source> +Not connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="843"/> <source>No.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="841"/> + <location filename="../QScintilla/Shell.py" line="845"/> <source>{0} on {1}, {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="888"/> + <location filename="../QScintilla/Shell.py" line="892"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -60888,52 +60968,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="898"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="923"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="925"/> + <location filename="../QScintilla/Shell.py" line="929"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="948"/> + <location filename="../QScintilla/Shell.py" line="952"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1030"/> + <location filename="../QScintilla/Shell.py" line="1034"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1038"/> + <location filename="../QScintilla/Shell.py" line="1042"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2157"/> + <location filename="../QScintilla/Shell.py" line="2161"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2157"/> + <location filename="../QScintilla/Shell.py" line="2161"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2015"/> + <location filename="../QScintilla/Shell.py" line="2019"/> <source>Project</source> <translation type="unfinished"></translation> </message> @@ -60963,14 +61043,14 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1835"/> + <location filename="../QScintilla/Shell.py" line="1839"/> <source>Available Virtual Environments: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1876"/> + <location filename="../QScintilla/Shell.py" line="1880"/> <source>Current Virtual Environment: '{0}' </source> <translation type="unfinished"></translation> @@ -70694,16 +70774,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/> - <source>Tasks Background Colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/> - <source>Select the background colour for these tasks.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="219"/> <source>Tasks Handling</source> <translation type="unfinished"></translation> @@ -70718,6 +70788,16 @@ <source>Clear global file task when file is closed</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="105"/> + <source>Tasks Background Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="206"/> + <source>Select the background color for these tasks.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TemplateGroup</name> @@ -76743,68 +76823,68 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/> - <source>Colours</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="134"/> <source>VCS status "added":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/> - <source>Select the background colour for entries with VCS status "added".</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="157"/> <source>VCS status "conflict":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/> - <source>Select the background colour for entries with VCS status "conflict".</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="193"/> <source>VCS status "modified":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/> - <source>Select the background colour for entries with VCS status "modified".</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="216"/> <source>VCS status "replaced":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/> - <source>Select the background colour for entries with VCS status "replaced".</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="239"/> <source>VCS status "needs update":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/> - <source>Select the background colour for entries with VCS status "needs update".</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="262"/> <source>VCS status "removed":</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="128"/> + <source>Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="147"/> + <source>Select the background color for entries with VCS status "added".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="170"/> + <source>Select the background color for entries with VCS status "conflict".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="206"/> + <source>Select the background color for entries with VCS status "modified".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="229"/> + <source>Select the background color for entries with VCS status "replaced".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="252"/> + <source>Select the background color for entries with VCS status "needs update".</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/VcsPage.ui" line="275"/> - <source>Select the background colour for entries with VCS status "removed".</source> + <source>Select the background color for entries with VCS status "removed".</source> <translation type="unfinished"></translation> </message> </context> @@ -81739,21 +81819,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/> - <source>Colours</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background colour of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background colour for secure URLs.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> <source>Images</source> <translation type="unfinished"></translation> @@ -81838,6 +81903,21 @@ <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="279"/> + <source>Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> + <source>Background color of secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>WebBrowserClearPrivateDataDialog</name>