From 101be91182d2cd1f79778b1a83270d5780de6727 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 2 Aug 2010 16:37:03 -0500
Subject: Renamed the "Clock" choices in Preferences > General.

---
 .../skins/default/xui/en-us/panel_preferences_general.xml    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 199f2a8..1357eb5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -183,14 +183,14 @@
 	<combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
 	     height="18" left="153" max_chars="20" mouse_opaque="true"
 	     name="time_combobox" width="146">
-		<combo_item type="string" length="1" enabled="true" name="12HourTime" value="Use 12 Hour Sim Time">
-			Use 12 Hour Sim Time
+		<combo_item type="string" name="12HourTime" value="PST 12">
+			12-hour PST/PDT
 		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="24HourTime" value="Use 24 Hour Sim Time">
-			Use 24 Hour Sim Time
+		<combo_item type="string" name="24HourTime" value="PST 24">
+			24-hour PST/PDT
 		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="UTCTime" value="Use UTC Time">
-			Use UTC Time
+		<combo_item type="string" name="UTCTime" value="UTC">
+			UTC
 		</combo_item>
 	</combo_box>
 	<combo_box allow_text_entry="true" bottom="-382" enabled="true"
-- 
cgit v1.1