Update colour to color to be consistent

doc/terminator_config.5

@@ -22,7 +22,7 @@ This is what a Terminator config file should look like:
     [[default]]
       font = Fixed 10
       background_color = "#000000" # A comment
-      foreground_color = "#FFFFFF" # Note that hex colour values must be quoted
+      foreground_color = "#FFFFFF" # Note that hex color values must be quoted
       scrollback_lines = '500' #More comment. Single quotes are valid too
       cursor_blink = True
       custom_command = "echo \\"foo#bar\\"" #Final comment - this will work as expected.
@@ -95,27 +95,27 @@ If this is set to True, Terminator will never try to use 'real' transparency if
 Default value: False
 .TP
 .B title_transmit_fg_color
-Sets the colour of the text shown in the titlebar of the active terminal.
+Sets the color of the text shown in the titlebar of the active terminal.
 Default value: \fB'#FFFFFF'\fR
 .TP
 .B title_transmit_bg_color
-Sets the colour of the background of the titlebar in the active terminal.
+Sets the color of the background of the titlebar in the active terminal.
 Default value: \fB'#C80003'\fR
 .TP
 .B title_receive_fg_color
-Sets the colour of the text shown in the titlebar of any terminal that \fBwill\fR receive input from the active terminal.
+Sets the color of the text shown in the titlebar of any terminal that \fBwill\fR receive input from the active terminal.
 Default value: \fB'#FFFFFF'\fR
 .TP
 .B title_receive_bg_color
-Sets the colour of the background of the titlebar of any terminal that \fBwill\fR receive input from the active terminal.
+Sets the color of the background of the titlebar of any terminal that \fBwill\fR receive input from the active terminal.
 Default value: \fB'#0076C9'\fR
 .TP
 .B title_inactive_fg_color
-Sets the colour of the text shown in the titlebar of any terminal that will \fBnot\fR receive input from the active terminal.
+Sets the color of the text shown in the titlebar of any terminal that will \fBnot\fR receive input from the active terminal.
 Default value: \fB'#000000'\fR
 .TP
 .B title_inactive_bg_color
-Sets the colour of the background of the titlebar of any terminal that will \fBnot\fR receive input from the active terminal.
+Sets the color of the background of the titlebar of any terminal that will \fBnot\fR receive input from the active terminal.
 Default value: \fB'#C0BEBF'\fR
 .TP
 .B title_use_system_font \fR(boolean)
@@ -127,8 +127,8 @@ An Pango font name. Examples are "Sans 12" or "Monospace Bold 14".
 Default value: \fB"Sans 9"\fR
 .TP
 .B inactive_color_offset
-Controls how much to reduce the colour values of fonts in terminals that do not have focus. It is a simple multiplication
-factor. A font colour that was RGB(200,200,200) with an inactive_color_offset of 0.5 would set inactive terminals to
+Controls how much to reduce the color values of fonts in terminals that do not have focus. It is a simple multiplication
+factor. A font color that was RGB(200,200,200) with an inactive_color_offset of 0.5 would set inactive terminals to
 RGB(100,100,100).
 .TP
 .B always_split_with_profile
@@ -371,23 +371,23 @@ If true, don't make a noise or flash. All terminal bells will be ignored.
 Default value: \fBFalse\fR
 .TP
 .B use_theme_colors
-If true, ignore the configured colours and use values from the theme instead.
+If true, ignore the configured colors and use values from the theme instead.
 Default value: \fBFalse\fR
 .TP
 .B bold_is_bright
 If true, show bold text with increased brightness. If false, then text boldness can be controlled by applications independently from the text brightness.
 Default value: \fBFalse\fR
 .TP
 .B background_color
-Default colour of terminal background, as a colour specification (can be HTML-style hex digits, or a colour name such as "red"). \fBNote:\fR You may need to set \fBuse_theme_colors=False\fR to force this setting to take effect.
+Default color of terminal background, as a color specification (can be HTML-style hex digits, or a color name such as "red"). \fBNote:\fR You may need to set \fBuse_theme_colors=False\fR to force this setting to take effect.
 Default value: \fB'#000000'\fR
 .TP
 .B background_darkness
 A value between 0.0 and 1.0 indicating how much to darken the background image. 0.0 means no darkness, 1.0 means fully dark. If the terminal is set to transparent, this setting controls how transparent it is. 0.0 means fully transparent, 1.0 means fully opaque.
 Default value: \fB0.5\fR
 .TP
 .B background_type
-Type of terminal background. May be "solid" for a solid colour or "transparent" for full transparency in compositing window managers.
+Type of terminal background. May be "solid" for a solid color or "transparent" for full transparency in compositing window managers.
 Default value: \fBsolid\fR
 .TP
 .B backspace_binding
@@ -407,7 +407,7 @@ Controls if the cursor blinks.
 Default value: \fBTrue\fR
 .TP
 .B cursor_color
-Default colour of cursor, as a colour specification (can be HTML-style hex digits, or a colour name such as "red").
+Default color of cursor, as a color specification (can be HTML-style hex digits, or a color name such as "red").
 Default value: Current value of \fBforeground_color\fR
 .TP
 .B cursor_shape
@@ -431,7 +431,7 @@ An Pango font name. Examples are "Sans 12" or "Monospace Bold 14".
 Default value: \fBMono 10\fR
 .TP
 .B foreground_color
-Default colour of text in the terminal, as a colour specification (can be HTML-style hex digits, or a colour name such as "red"). \fBNote:\fR You may need to set \fBuse_theme_colors=False\fR to force this setting to take effect.
+Default color of text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). \fBNote:\fR You may need to set \fBuse_theme_colors=False\fR to force this setting to take effect.
 Default value: \fB'#AAAAAA'\fR
 .TP
 .B scrollbar_position
@@ -472,7 +472,7 @@ Possible values are "close" to close the terminal, and "restart" to restart the
 Default value: \fBclose\fR
 .TP
 .B palette
-Terminals have a 16-colour palette that applications inside the terminal can use. This is that palette, in the form of a colon-separated list of colour names. Colour names should be in hex format e.g. "#FF00FF".
+Terminals have a 16-color palette that applications inside the terminal can use. This is that palette, in the form of a colon-separated list of color names. Color names should be in hex format e.g. "#FF00FF".
 .TP
 .B word_chars
 When selecting text by word, sequences of these characters are also considered members of single words. The hyphen and alphanumerics do not need to be specified. Ranges can be given as "A-Z".

terminatorlib/preferences.glade

@@ -56,7 +56,7 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="ColourSchemeListStore">
+  <object class="GtkListStore" id="ColorSchemeListStore">
     <columns>
       <!-- column-name scheme -->
       <column type="gchararray"/>
@@ -2128,7 +2128,7 @@
                                         <property name="can-focus">False</property>
                                         <property name="halign">start</property>
                                         <property name="margin-top">3</property>
-                                        <property name="model">ColourSchemeListStore</property>
+                                        <property name="model">ColorSchemeListStore</property>
                                         <property name="active">2</property>
                                         <signal name="changed" handler="on_color_scheme_combobox_changed" swapped="no"/>
                                         <child>

terminatorlib/prefseditor.py

@@ -22,7 +22,7 @@ def get_color_string(widcol):
     return('#%02x%02x%02x' % (widcol.red>>8, widcol.green>>8, widcol.blue>>8))
 
 def color2hex(widget):
-    """Pull the colour values out of a Gtk ColorPicker widget and return them
+    """Pull the color values out of a Gtk ColorPicker widget and return them
    as 8bit hex values, sinces its default behaviour is to give 16bit values"""
     return get_color_string(widget.get_color())
 
@@ -57,7 +57,7 @@ class PrefsEditor:
                          'gruvbox_light': 9,
                          'gruvbox_dark': 10,
                          'custom': 11}
-    colourschemes = {'grey_on_black': ['#aaaaaa', '#000000'],
+    colorschemes = {'grey_on_black': ['#aaaaaa', '#000000'],
                      'black_on_yellow': ['#000000', '#ffffdd'],
                      'black_on_white': ['#000000', '#ffffff'],
                      'white_on_black': ['#ffffff', '#000000'],
@@ -564,9 +564,9 @@ def set_profile_values(self, profile):
         # Colorscheme
         widget = guiget('color_scheme_combobox')
         scheme = None
-        for ascheme in self.colourschemes:
-            forecol = self.colourschemes[ascheme][0]
-            backcol = self.colourschemes[ascheme][1]
+        for ascheme in self.colorschemes:
+            forecol = self.colorschemes[ascheme][0]
+            backcol = self.colorschemes[ascheme][1]
             if self.config['foreground_color'].lower() == forecol and \
                self.config['background_color'].lower() == backcol:
                 scheme = ascheme
@@ -577,7 +577,7 @@ def set_profile_values(self, profile):
                 scheme = 'grey_on_black'
             else:
                 scheme = 'custom'
-        # NOTE: The scheme is set in the GUI widget after the fore/back colours
+        # NOTE: The scheme is set in the GUI widget after the fore/back colors
         # Foreground color
         widget = guiget('foreground_colorbutton')
         widget.set_events(Gdk.EventMask.BUTTON_PRESS_MASK)
@@ -607,8 +607,8 @@ def set_profile_values(self, profile):
                 palette = 'rxvt'
             else:
                 palette = 'custom'
-        # NOTE: The palette selector is set after the colour pickers
-        # Palette colour pickers
+        # NOTE: The palette selector is set after the color pickers
+        # Palette color pickers
         for palette_id in range(0, NUM_PALETTE_COLORS):
             widget = self.get_palette_widget(palette_id)
             widget.set_events(Gdk.EventMask.BUTTON_PRESS_MASK)
@@ -1063,10 +1063,10 @@ def get_palette_id(self, widget):
     def get_palette_color(self, palette_id):
         """Returns the configured Gdk color for the given palette ID."""
         if self.config['palette'] in self.palettes:
-            colourpalette = self.palettes[self.config['palette']]
+            colorpalette = self.palettes[self.config['palette']]
         else:
-            colourpalette = self.config['palette'].split(':')
-        return Gdk.color_parse(colourpalette[palette_id])
+            colorpalette = self.config['palette'].split(':')
+        return Gdk.color_parse(colorpalette[palette_id])
 
     def on_palette_colorpicker_draw(self, widget, cr):
         width = widget.get_allocated_width()
@@ -1095,9 +1095,9 @@ def replace_palette_color(self, palette_id, color):
 
     def load_palette(self):
         """Load the palette from the configuration into the color buttons."""
-        colourpalette = self.config['palette'].split(':')
+        colorpalette = self.config['palette'].split(':')
         for palette_id in range(0, NUM_PALETTE_COLORS):
-            color = Gdk.color_parse(colourpalette[palette_id])
+            color = Gdk.color_parse(colorpalette[palette_id])
             self.load_palette_color(palette_id, color)
 
     def edit_palette_button(self, widget):
@@ -1204,32 +1204,32 @@ def on_title_font_selector_font_set(self, widget):
         self.config.save()
 
     def on_title_receive_bg_color_color_set(self, widget):
-        """Title receive background colour changed"""
+        """Title receive background color changed"""
         self.config['title_receive_bg_color'] = color2hex(widget)
         self.config.save()
 
     def on_title_receive_fg_color_color_set(self, widget):
-        """Title receive foreground colour changed"""
+        """Title receive foreground color changed"""
         self.config['title_receive_fg_color'] = color2hex(widget)
         self.config.save()
 
     def on_title_inactive_bg_color_color_set(self, widget):
-        """Title inactive background colour changed"""
+        """Title inactive background color changed"""
         self.config['title_inactive_bg_color'] = color2hex(widget)
         self.config.save()
 
     def on_title_transmit_bg_color_color_set(self, widget):
-        """Title transmit backgruond colour changed"""
+        """Title transmit backgruond color changed"""
         self.config['title_transmit_bg_color'] = color2hex(widget)
         self.config.save()
 
     def on_title_inactive_fg_color_color_set(self, widget):
-        """Title inactive foreground colour changed"""
+        """Title inactive foreground color changed"""
         self.config['title_inactive_fg_color'] = color2hex(widget)
         self.config.save()
 
     def on_title_transmit_fg_color_color_set(self, widget):
-        """Title transmit foreground colour changed"""
+        """Title transmit foreground color changed"""
         self.config['title_transmit_fg_color'] = color2hex(widget)
         self.config.save()
 
@@ -1682,7 +1682,7 @@ def on_layout_name_edited(self, cell, path, newtext):
             self.layouteditor.layout_name = newtext
 
     def on_color_scheme_combobox_changed(self, widget):
-        """Update the fore/background colour pickers"""
+        """Update the fore/background color pickers"""
         value = None
         guiget = self.builder.get_object
         active = widget.get_active()
@@ -1698,15 +1698,15 @@ def on_color_scheme_combobox_changed(self, widget):
 
         forecol = None
         backcol = None
-        if value in self.colourschemes:
-            forecol = self.colourschemes[value][0]
-            backcol = self.colourschemes[value][1]
+        if value in self.colorschemes:
+            forecol = self.colorschemes[value][0]
+            backcol = self.colorschemes[value][1]
             self.config['foreground_color'] = forecol
             self.config['background_color'] = backcol
         self.config.save()
 
     def on_use_theme_colors_checkbutton_toggled(self, widget):
-        """Update colour pickers"""
+        """Update color pickers"""
         guiget = self.builder.get_object
         active = widget.get_active()
 

terminatorlib/themes/Raleigh/gtk-3.0/apps/terminator.css

@@ -1,4 +1,4 @@
-/* Raleigh is so old, it doesn't use the correct public colours */
+/* Raleigh is so old, it doesn't use the correct public colors */
 .terminator-terminal-window {
     background-color: alpha(@bg_color,0); }