diff -r 861e46f99d65 -r 4e2d6b12f67c eric6/Preferences/ConfigurationPages/EditorStylesPage.ui
--- a/eric6/Preferences/ConfigurationPages/EditorStylesPage.ui Mon Apr 13 16:57:44 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorStylesPage.ui Mon Apr 13 17:35:49 2020 +0200
@@ -44,16 +44,16 @@
<item>
<widget class="QGroupBox" name="groupBox_12">
<property name="title">
- <string>Colours</string>
+ <string>Colors</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<widget class="QGroupBox" name="editAreaOverrideCheckBox">
<property name="toolTip">
- <string>Select to set the colour of the edit area different to the default style</string>
+ <string>Select to set the color of the edit area different to the default style</string>
</property>
<property name="title">
- <string>Override edit area colours</string>
+ <string>Override edit area colors</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -78,7 +78,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the foreground colour for the edit area.</string>
+ <string>Select the foreground color for the edit area.</string>
</property>
<property name="text">
<string/>
@@ -101,7 +101,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for the edit area.</string>
+ <string>Select the background color for the edit area.</string>
</property>
<property name="text">
<string/>
@@ -129,7 +129,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the caret.</string>
+ <string>Select the color for the caret.</string>
</property>
<property name="text">
<string/>
@@ -348,7 +348,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the foreground colour for the margins</string>
+ <string>Select the foreground color for the margins</string>
</property>
<property name="text">
<string/>
@@ -371,7 +371,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for the margins</string>
+ <string>Select the background color for the margins</string>
</property>
<property name="text">
<string/>
@@ -394,7 +394,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for the foldmargin</string>
+ <string>Select the background color for the foldmargin</string>
</property>
<property name="text">
<string/>
@@ -417,7 +417,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the foreground colour of the foldmarkers</string>
+ <string>Select the foreground color of the foldmarkers</string>
</property>
<property name="text">
<string/>
@@ -440,7 +440,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour of the foldmarkers</string>
+ <string>Select the background color of the foldmarkers</string>
</property>
<property name="text">
<string/>
@@ -512,23 +512,23 @@
<item row="0" column="0">
<widget class="QCheckBox" name="customSelColourCheckBox">
<property name="toolTip">
- <string>Select to use custom selection colours</string>
+ <string>Select to use custom selection colors</string>
</property>
<property name="whatsThis">
- <string><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></string>
+ <string><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></string>
</property>
<property name="text">
- <string>Use custom selection colours</string>
+ <string>Use custom selection colors</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="colourizeSelTextCheckBox">
<property name="toolTip">
- <string>Select, if selected text should be colourized by the lexer.</string>
+ <string>Select, if selected text should be colorized by the lexer.</string>
</property>
<property name="text">
- <string>Colourize selected text</string>
+ <string>Colorize selected text</string>
</property>
</widget>
</item>
@@ -562,7 +562,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the foreground colour for the selection.</string>
+ <string>Select the foreground color for the selection.</string>
</property>
<property name="text">
<string/>
@@ -585,7 +585,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for the selection.</string>
+ <string>Select the background color for the selection.</string>
</property>
<property name="text">
<string/>
@@ -645,7 +645,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the caret.</string>
+ <string>Select the color for the caret.</string>
</property>
<property name="text">
<string/>
@@ -758,7 +758,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for the line containing the caret.</string>
+ <string>Select the background color for the line containing the caret.</string>
</property>
<property name="text">
<string/>
@@ -795,10 +795,10 @@
<item row="0" column="0" colspan="4">
<widget class="QCheckBox" name="debugMarkerBackgroundCheckBox">
<property name="toolTip">
- <string>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</string>
+ <string>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</string>
</property>
<property name="text">
- <string>Use background colours</string>
+ <string>Use background colors</string>
</property>
</widget>
</item>
@@ -818,7 +818,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the current line marker.</string>
+ <string>Select the color for the current line marker.</string>
</property>
<property name="text">
<string/>
@@ -841,7 +841,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the error line marker.</string>
+ <string>Select the color for the error line marker.</string>
</property>
<property name="text">
<string/>
@@ -883,7 +883,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for highlighting matching braces.</string>
+ <string>Select the color for highlighting matching braces.</string>
</property>
<property name="text">
<string/>
@@ -906,7 +906,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for highlighting matching braces.</string>
+ <string>Select the background color for highlighting matching braces.</string>
</property>
<property name="text">
<string/>
@@ -929,7 +929,7 @@
<item row="2" column="1">
<widget class="QPushButton" name="nonmatchingBracesButton">
<property name="toolTip">
- <string>Select the colour for highlighting nonmatching braces.</string>
+ <string>Select the color for highlighting nonmatching braces.</string>
</property>
<property name="text">
<string/>
@@ -952,7 +952,7 @@
<item row="2" column="3">
<widget class="QPushButton" name="nonmatchingBracesBackButton">
<property name="toolTip">
- <string>Select the background colour for highlighting nonmatching braces.</string>
+ <string>Select the background color for highlighting nonmatching braces.</string>
</property>
<property name="text">
<string/>
@@ -1121,7 +1121,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the edge marker.</string>
+ <string>Select the color for the edge marker.</string>
</property>
<property name="text">
<string/>
@@ -1131,7 +1131,7 @@
<item row="2" column="0">
<widget class="QLabel" name="TextLabel13_3_2_2">
<property name="text">
- <string>Background colour:</string>
+ <string>Background color:</string>
</property>
</widget>
</item>
@@ -1219,7 +1219,7 @@
</item>
<item>
<property name="text">
- <string>Change Background Colour</string>
+ <string>Change Background Color</string>
</property>
</item>
</widget>
@@ -1309,7 +1309,7 @@
<item row="0" column="0">
<widget class="QPushButton" name="annotationsWarningFgButton">
<property name="toolTip">
- <string>Press to select the foreground colour</string>
+ <string>Press to select the foreground color</string>
</property>
<property name="text">
<string>Foreground</string>
@@ -1319,7 +1319,7 @@
<item row="0" column="1">
<widget class="QPushButton" name="annotationsWarningBgButton">
<property name="toolTip">
- <string>Press to select the background colour</string>
+ <string>Press to select the background color</string>
</property>
<property name="text">
<string>Background</string>
@@ -1354,7 +1354,7 @@
<item row="0" column="0">
<widget class="QPushButton" name="annotationsErrorFgButton">
<property name="toolTip">
- <string>Press to select the foreground colour</string>
+ <string>Press to select the foreground color</string>
</property>
<property name="text">
<string>Foreground</string>
@@ -1364,7 +1364,7 @@
<item row="0" column="1">
<widget class="QPushButton" name="annotationsErrorBgButton">
<property name="toolTip">
- <string>Press to select the background colour</string>
+ <string>Press to select the background color</string>
</property>
<property name="text">
<string>Background</string>
@@ -1399,7 +1399,7 @@
<item row="0" column="0">
<widget class="QPushButton" name="annotationsStyleWarningFgButton">
<property name="toolTip">
- <string>Press to select the foreground colour</string>
+ <string>Press to select the foreground color</string>
</property>
<property name="text">
<string>Foreground</string>
@@ -1409,7 +1409,7 @@
<item row="0" column="1">
<widget class="QPushButton" name="annotationsStyleWarningBgButton">
<property name="toolTip">
- <string>Press to select the background colour</string>
+ <string>Press to select the background color</string>
</property>
<property name="text">
<string>Background</string>
@@ -1511,7 +1511,7 @@
<item>
<widget class="QLabel" name="TextLabel13_3_2_3">
<property name="text">
- <string>Unsaved changes colour:</string>
+ <string>Unsaved changes color:</string>
</property>
</widget>
</item>
@@ -1524,7 +1524,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the change marker for unsaved changes.</string>
+ <string>Select the color for the change marker for unsaved changes.</string>
</property>
<property name="text">
<string/>
@@ -1534,7 +1534,7 @@
<item>
<widget class="QLabel" name="TextLabel13_3_2_4">
<property name="text">
- <string>Saved changes colour:</string>
+ <string>Saved changes color:</string>
</property>
</widget>
</item>
@@ -1547,7 +1547,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the change marker for saved changes.</string>
+ <string>Select the color for the change marker for saved changes.</string>
</property>
<property name="text">
<string/>
@@ -1633,7 +1633,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the foreground colour for visible whitespace</string>
+ <string>Select the foreground color for visible whitespace</string>
</property>
<property name="text">
<string/>
@@ -1656,7 +1656,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for visible whitespace</string>
+ <string>Select the background color for visible whitespace</string>
</property>
<property name="text">
<string/>
@@ -1702,7 +1702,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the foreground colour for indentation guides</string>
+ <string>Select the foreground color for indentation guides</string>
</property>
<property name="text">
<string/>
@@ -1725,7 +1725,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for indentation guides</string>
+ <string>Select the background color for indentation guides</string>
</property>
<property name="text">
<string/>
@@ -1760,7 +1760,7 @@
<item>
<widget class="QGroupBox" name="groupBox_16">
<property name="title">
- <string>Marker Colours</string>
+ <string>Marker Colors</string>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0">
@@ -1779,7 +1779,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for error markers</string>
+ <string>Select the color for error markers</string>
</property>
<property name="text">
<string/>
@@ -1802,7 +1802,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for warning markers</string>
+ <string>Select the color for warning markers</string>
</property>
<property name="text">
<string/>
@@ -1825,7 +1825,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for bookmark markers</string>
+ <string>Select the color for bookmark markers</string>
</property>
<property name="text">
<string/>
@@ -1848,7 +1848,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for breakpoint markers</string>
+ <string>Select the color for breakpoint markers</string>
</property>
<property name="text">
<string/>
@@ -1871,7 +1871,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for task markers</string>
+ <string>Select the color for task markers</string>
</property>
<property name="text">
<string/>
@@ -1894,7 +1894,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for change markers</string>
+ <string>Select the color for change markers</string>
</property>
<property name="text">
<string/>
@@ -1917,7 +1917,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for coverage markers</string>
+ <string>Select the color for coverage markers</string>
</property>
<property name="text">
<string/>
@@ -1940,7 +1940,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the current line marker</string>
+ <string>Select the color for the current line marker</string>
</property>
<property name="text">
<string/>
@@ -1963,7 +1963,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the search marker</string>
+ <string>Select the color for the search marker</string>
</property>
<property name="text">
<string/>
@@ -1986,7 +1986,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the colour for the conflict marker line marker</string>
+ <string>Select the color for the conflict marker line marker</string>
</property>
<property name="text">
<string/>
@@ -2009,7 +2009,7 @@
</size>
</property>
<property name="toolTip">
- <string>Select the background colour for the marker map</string>
+ <string>Select the background color for the marker map</string>
</property>
<property name="text">
<string/>
