From f8b5913ae7e9020674f8260fa861fd3424eb0bff Mon Sep 17 00:00:00 2001
From: Paul Louden <paulthenerd@gmail.com>
Date: Tue, 19 Jun 2007 04:21:06 +0000
Subject: Make user-visible spelling "colours" rather than "colors".

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13671 a1c6a512-1295-4272-9138-f99709370657
---
 apps/filetypes.c           | 4 ++--
 apps/plugins/text_editor.c | 2 +-
 apps/settings_list.c       | 4 ++--
 docs/FILES                 | 2 +-
 docs/sample.colors         | 7 -------
 docs/sample.colours        | 7 +++++++
 tools/buildzip.pl          | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 docs/sample.colors
 create mode 100644 docs/sample.colours

diff --git a/apps/filetypes.c b/apps/filetypes.c
index 75c58cc752..b9c0e69321 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -143,7 +143,7 @@ static void read_config(char* config_file);
 /* Colors file format is similar to icons:
  * ext:hex_color
  * load a colors file from a theme with:
- * filetype colors: filename.colors */
+ * filetype colours: filename.colours */
 void read_color_theme_file(void) {
     char buffer[MAX_PATH];
     int fd;
@@ -152,7 +152,7 @@ void read_color_theme_file(void) {
     for (i = 0; i < filetype_count; i++) {
         custom_colors[i] = -1;
     }
-    snprintf(buffer, MAX_PATH, "%s/%s.colors", THEME_DIR, 
+    snprintf(buffer, MAX_PATH, "%s/%s.colours", THEME_DIR, 
              global_settings.colors_file);
     fd = open(buffer, O_RDONLY);
     if (fd < 0)
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c
index 97ceae5746..bb6fdbf755 100644
--- a/apps/plugins/text_editor.c
+++ b/apps/plugins/text_editor.c
@@ -360,7 +360,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
         }
 #ifdef HAVE_LCD_COLOR
         c = rb->strrchr(filename, '.');
-        if (c && !rb->strcmp(c, ".colors"))
+        if (c && !rb->strcmp(c, ".colours"))
             edit_colors_file = true;
 #endif
         /* read in the file */
diff --git a/apps/settings_list.c b/apps/settings_list.c
index fb9ac17539..6c388f7e6b 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1215,8 +1215,8 @@ const struct settings_list settings[] = {
                      ICON_DIR "/", ".bmp", MAX_FILENAME+1),
 #endif /* HAVE_REMOTE_LCD */
 #ifdef HAVE_LCD_COLOR
-    FILENAME_SETTING(F_THEMESETTING, colors_file, "filetype colors", "",
-                     THEME_DIR "/", ".colors", MAX_FILENAME+1),
+    FILENAME_SETTING(F_THEMESETTING, colors_file, "filetype colours", "",
+                     THEME_DIR "/", ".colours", MAX_FILENAME+1),
 #endif
 #ifdef HAVE_BUTTON_LIGHT
     INT_SETTING_W_CFGVALS(F_FLIPLIST, button_light_timeout,
diff --git a/docs/FILES b/docs/FILES
index 80e27a2e51..da6f6e12d3 100644
--- a/docs/FILES
+++ b/docs/FILES
@@ -14,4 +14,4 @@ README
 TECH
 UISIMULATOR
 KNOWN_ISSUES
-sample.colors
+sample.colours
diff --git a/docs/sample.colors b/docs/sample.colors
deleted file mode 100644
index 930a34e8dd..0000000000
--- a/docs/sample.colors
+++ /dev/null
@@ -1,7 +0,0 @@
-folder:808080
-ipod:00B0B0
-mp3:00FF00
-flac:00FF00
-ogg:00FF00
-txt:FF0000
-cfg:D00000
diff --git a/docs/sample.colours b/docs/sample.colours
new file mode 100644
index 0000000000..930a34e8dd
--- /dev/null
+++ b/docs/sample.colours
@@ -0,0 +1,7 @@
+folder:808080
+ipod:00B0B0
+mp3:00FF00
+flac:00FF00
+ogg:00FF00
+txt:FF0000
+cfg:D00000
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 79cf59c7eb..8c78b82170 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -363,7 +363,7 @@ STOP
     if ($fonts) {
         `cp $ROOT/docs/profontdoc.txt .rockbox/docs/`;
     }
-    for(("sample.colors",
+    for(("sample.colours",
          "sample.icons"
         )) {
         `cp $ROOT/docs/$_ .rockbox/docs/`;
-- 
cgit v1.2.3