Colour, color, couleur

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -158,7 +158,7 @@ public class NickColourInputDialog extends StandardDialog {
 
     /** Saves settings. */
     public void saveSettings() {
-        final Color colour = NickColourUtils.getColourFromString(colourManager,
+        final Color colour = NickColourUtils.getColorFromString(colourManager,
                 textColour.getColour());
         final NickColourEntry entry = NickColourEntry.create(network.getText().toLowerCase(),
                 nickname.getText().toLowerCase(),

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourUtils.java

@@ -34,7 +34,7 @@ final class NickColourUtils {
         //Utility class
     }
 
-    static Color getColourFromString(final ColourManager colourManager, final String value) {
+    static Color getColorFromString(final ColourManager colourManager, final String value) {
         final Colour colour = colourManager.getColourFromString(value, null);
         return new Color(colour.getRed(), colour.getGreen(), colour.getBlue());
     }

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourYamlStore.java

@@ -78,7 +78,7 @@ public class NickColourYamlStore extends BaseYamlStore<NickColourEntry> {
             final String user = requiredString(map, "user");
             final String colour = requiredString(map, "colour");
             return Optional.of(NickColourEntry.create(network, user,
-                    NickColourUtils.getColourFromString(colourManager, colour)));
+                    NickColourUtils.getColorFromString(colourManager, colour)));
         } catch (IllegalArgumentException ex) {
             LOG.info("Unable to read profile", ex);
             return Optional.empty();