From c12382c1c9334c64628d4cef5ab81ba3e8b1f4fb Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Fri, 18 Aug 2006 03:19:23 +0000
Subject: [PATCH] r1069: Removing outward signs of "colour"

---
 admin/status.php       | 4 ++--
 admin/user.php         | 2 +-
 templates/userctrl.tpl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/status.php b/admin/status.php
index edb3280..c70452e 100755
--- a/admin/status.php
+++ b/admin/status.php
@@ -86,7 +86,7 @@ if ($_REQUEST['do'] == 'add')
 	$admin->table_head(_('New Status'));
 	$admin->row_input(_('Status Title<div><dfn>The title of this status flag (eg: `Confirmed` or `Closed (Fixed)`)</dfn></div>'), 'status');
 	$admin->row_input(_('Display Order<div><dfn>The order in which the statuses ar displayed.</dfn></div>'), 'displayorder');
-	$admin->row_input(_('Status Colour<div><dfn>The colour of the status. This will be displayed on bug listings page to make viewing easier. Note: you must enter the # sign if you are using HEX values.</dfn></div>'), 'color');
+	$admin->row_input(_('Status Color<div><dfn>The color of the status. This will be displayed on bug listings page to make viewing easier. Note: you must enter the # sign if you are using HEX values.</dfn></div>'), 'color');
 	$admin->row_submit();
 	$admin->table_end();
 	$admin->form_end();
@@ -129,7 +129,7 @@ if ($_REQUEST['do'] == 'edit')
 	$admin->table_head(sprintf(_('Edit Status - %1$s (id: %2$s)'), $status->objdata['status'], $status->objdata['statusid']));
 	$admin->row_input(_('Status Title<div><dfn>The title of this status flag (eg: `Confirmed` or `Closed (Fixed)`)</dfn></div>'), 'status', $status->objdata['status']);
 	$admin->row_input(_('Display Order<div><dfn>The order in which the statuses ar displayed.</dfn></div>'), 'displayorder', $status->objdata['displayorder']);
-	$admin->row_input(_('Status Colour<div><dfn>The colour of the status. This will be displayed on bug listings page to make viewing easier. Note: you must enter the # sign if you are using HEX values.</dfn></div>'), 'color', $status->objdata['color']);
+	$admin->row_input(_('Status Color<div><dfn>The color of the status. This will be displayed on bug listings page to make viewing easier. Note: you must enter the # sign if you are using HEX values.</dfn></div>'), 'color', $status->objdata['color']);
 	$admin->row_submit();
 	$admin->table_end();
 	$admin->form_end();
diff --git a/admin/user.php b/admin/user.php
index 37da372..e15aa15 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -192,7 +192,7 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add')
 	$admin->row_list(_('Usergroup'), 'usergroupid');
 	
 	$admin->row_yesno(_('Show Email Publicly'), 'showemail', $user->objdata['showemail']);
-	$admin->row_yesno(_('Show Status Colours on Bug Listings'), 'showcolours', $user->objdata['showcolours']);
+	$admin->row_yesno(_('Show Status Colors on Bug Listings'), 'showcolours', $user->objdata['showcolours']);
 	
 	foreach ($bugsys->datastore['language'] AS $language)
 	{
diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl
index 30c538f..674a0ca 100644
--- a/templates/userctrl.tpl
+++ b/templates/userctrl.tpl
@@ -41,7 +41,7 @@ $header
 					</fieldset>
 					
 					<fieldset>
-						<legend>{@"Show Status Colours on Bug Listings"}</legend>
+						<legend>{@"Show Status Colors on Bug Listings"}</legend>
 						<input type="radio" name="showcolours" value="1"<if condition="$userinfo['showcolours']"> checked="checked"</if> /> {@"Yes"}
 						<input type="radio" name="showcolours" value="0"<if condition="!$userinfo['showcolours']"> checked="checked"</if> /> {@"No"}
 					</fieldset>
-- 
2.22.5