From c7c232221815b3f1e1764a4a216d1ccf9ec555c2 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Tue, 22 Nov 2011 19:06:42 -0600
Subject: [PATCH] Minor preference page cleanups.

---
 indra/newview/skins/default/xui/en/panel_preferences_UI.xml     | 2 +-
 .../newview/skins/default/xui/en/panel_preferences_general.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_move.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index 11d89e60dc..8e5b206756 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -721,7 +721,7 @@ Default 0. Larger values may not work well.
          length="1"
          line_spacing.pixels="5">
           pixels (requires restart)
-V2/3 default 0. V1 default [TODO: unknown].
+V2/3 default 0. V1 default 2.
         </text>
 
         <text
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 1090bdb1af..947771acca 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -326,7 +326,7 @@
      control_name="FSNameTagShowLegacyUsernames"
 	 enabled_control="NameTagShowUserNames"
      height="16"
-     label="Legacy names instead"
+     label="Legacy names instead of usernames"
      layout="topleft"
      left_pad="50"
      name="FSshow_legacyun"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 9bf2833dd5..c2211f65cf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -313,7 +313,7 @@
         <button
          follows="top|left"
          height="23"
-         label="Other Devices"
+         label="Joystick Configuration"
          left="130"
          name="joystick_setup_button"
          top_pad="10"