Make user-visible spelling "colours" rather than "colors".
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13671 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
f01b661116
commit
f8b5913ae7
6 changed files with 7 additions and 7 deletions
|
@ -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)
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -14,4 +14,4 @@ README
|
|||
TECH
|
||||
UISIMULATOR
|
||||
KNOWN_ISSUES
|
||||
sample.colors
|
||||
sample.colours
|
||||
|
|
|
@ -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/`;
|
||||
|
|
Loading…
Reference in a new issue