Merge pull request kivy#2787 from inclement/color-colour

doc: colour -> color fixes

Author: inclement

kivy/uix/effectwidget.py

@@ -80,11 +80,11 @@
         return something;  // must be a vec4 representing the new color
     }
 
-The full shader will calculate the normal pixel colour at each point,
+The full shader will calculate the normal pixel color at each point,
 then call your :code:`effect` function to transform it. The
 parameters are:
 
-- **color**: The normal colour of the current pixel (i.e. texture
+- **color**: The normal color of the current pixel (i.e. texture
   sampled at tex_coords).
 - **texture**: The texture containing the widget's normal background.
 - **tex_coords**: The normal texture_coords used to access texture.
@@ -448,14 +448,14 @@ def set_fbo_shader(self, *args):
 
 
 class MonochromeEffect(EffectBase):
-    '''Returns its input colours in monochrome.'''
+    '''Returns its input colors in monochrome.'''
     def __init__(self, *args, **kwargs):
         super(MonochromeEffect, self).__init__(*args, **kwargs)
         self.glsl = effect_monochrome
 
 
 class InvertEffect(EffectBase):
-    '''Inverts the colours in the input.'''
+    '''Inverts the colors in the input.'''
     def __init__(self, *args, **kwargs):
         super(InvertEffect, self).__init__(*args, **kwargs)
         self.glsl = effect_invert

kivy/uix/screenmanager.py

@@ -687,7 +687,7 @@ class FallOutTransition(ShaderTransition):
         vec2 dist = diff + 0.5;
         float max_dist = 1.0 - tr;
 
-        /* in and out colours */
+        /* in and out colors */
         vec4 cin = vec4(texture2D(tex_in, tex_coord0.st));
         vec4 cout = vec4(texture2D(tex_out, dist));
 
@@ -742,7 +742,7 @@ class RiseInTransition(ShaderTransition):
         vec2 dist = diff + 0.5;
         float max_dist = 1.0 - tr;
 
-        /* in and out colours */
+        /* in and out colors */
         vec4 cin = vec4(texture2D(tex_in, dist));
         vec4 cout = vec4(texture2D(tex_out, tex_coord0.st));