--- a/eric6/Preferences/ConfigurationPages/DiffColoursPage.ui Mon Apr 13 16:57:44 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/DiffColoursPage.ui Mon Apr 13 17:35:49 2020 +0200 @@ -14,7 +14,7 @@ <item> <widget class="QLabel" name="headerLabel"> <property name="text"> - <string><b>Configure Diff colours</b></string> + <string><b>Configure Diff colors</b></string> </property> </widget> </item> @@ -36,10 +36,10 @@ <item row="5" column="0"> <widget class="QPushButton" name="headerButton"> <property name="toolTip"> - <string>Select the background colour for header lines</string> + <string>Select the background color for header lines</string> </property> <property name="text"> - <string>Header Colour</string> + <string>Header Color</string> </property> </widget> </item> @@ -62,10 +62,10 @@ <item row="6" column="0"> <widget class="QPushButton" name="whitespaceButton"> <property name="toolTip"> - <string>Select the background colour for bad whitespace</string> + <string>Select the background color for bad whitespace</string> </property> <property name="text"> - <string>Whitespace Colour</string> + <string>Whitespace Color</string> </property> </widget> </item> @@ -85,10 +85,10 @@ <item row="0" column="0"> <widget class="QPushButton" name="textButton"> <property name="toolTip"> - <string>Select the text foreground colour</string> + <string>Select the text foreground color</string> </property> <property name="text"> - <string>Text Colour</string> + <string>Text Color</string> </property> </widget> </item> @@ -111,10 +111,10 @@ <item row="1" column="0"> <widget class="QPushButton" name="addedButton"> <property name="toolTip"> - <string>Select the background colour for additions</string> + <string>Select the background color for additions</string> </property> <property name="text"> - <string>Added Colour</string> + <string>Added Color</string> </property> </widget> </item> @@ -137,10 +137,10 @@ <item row="2" column="0"> <widget class="QPushButton" name="removedButton"> <property name="toolTip"> - <string>Select the background colour for removed text</string> + <string>Select the background color for removed text</string> </property> <property name="text"> - <string>Removed Colour</string> + <string>Removed Color</string> </property> </widget> </item> @@ -163,10 +163,10 @@ <item row="3" column="0"> <widget class="QPushButton" name="replacedButton"> <property name="toolTip"> - <string>Select the background colour for replaced text</string> + <string>Select the background color for replaced text</string> </property> <property name="text"> - <string>Replaced Colour</string> + <string>Replaced Color</string> </property> </widget> </item> @@ -189,10 +189,10 @@ <item row="4" column="0"> <widget class="QPushButton" name="contextButton"> <property name="toolTip"> - <string>Select the background colour for context lines</string> + <string>Select the background color for context lines</string> </property> <property name="text"> - <string>Context Colour</string> + <string>Context Color</string> </property> </widget> </item>