Mercurial Repositories > eric / file diff

diff -r 861e46f99d65 -r 4e2d6b12f67c eric6/Preferences/ConfigurationPages/VcsPage.ui
--- a/eric6/Preferences/ConfigurationPages/VcsPage.ui	Mon Apr 13 16:57:44 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/VcsPage.ui	Mon Apr 13 17:35:49 2020 +0200
@@ -125,7 +125,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
-      <string>Colours</string>
+      <string>Colors</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
@@ -144,7 +144,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;added&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;added&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -167,7 +167,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;conflict&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;conflict&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -203,7 +203,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;modified&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;modified&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -226,7 +226,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;replaced&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;replaced&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -249,7 +249,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;needs update&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;needs update&quot;.</string>
         </property>
         <property name="text">
          <string/>
@@ -272,7 +272,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the background colour for entries with VCS status &quot;removed&quot;.</string>
+         <string>Select the background color for entries with VCS status &quot;removed&quot;.</string>
         </property>
         <property name="text">
          <string/>