From fa4ee553085968c65932b743498e5a617a824231 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 28 Mar 2012 00:00:42 -0400
Subject: [PATCH] Nomade Zhao's 4 fixes for translation. Re: Issue 340

Conflicts:

	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
---
 .../newview/skins/default/xui/en-us/floater_about_land.xml  | 2 +-
 .../skins/default/xui/en-us/floater_display_name.xml        | 4 ++--
 .../default/xui/en-us/panel_preferences_ascent_chat.xml     | 6 +++---
 .../skins/default/xui/en-us/panel_preferences_network.xml   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index b091777c6..08a6c38f7 100644
--- a/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -911,7 +911,7 @@ Only large parcels can be listed in search.
 				 height="16"
 				 left="10"
 				 length="1"
-				 name="at URL:"
+				 name="at URL2:"
 				 type="string"
 				 width="65">
 				Current URL:
diff --git a/indra/newview/skins/default/xui/en-us/floater_display_name.xml b/indra/newview/skins/default/xui/en-us/floater_display_name.xml
index d31e9271e..9e49c9d93 100644
--- a/indra/newview/skins/default/xui/en-us/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_display_name.xml
@@ -19,10 +19,10 @@
     <button height="20" bottom_delta="-28" label="Save" font="SansSerif" left="20" name="save_btn" tool_tip="Save your new Display Name" width="113" />
     <button height="20" bottom_delta="0" label="Reset" font="SansSerif" left_delta="123" name="reset_btn" tool_tip="Make Display Name the same as Username" width="113" />
     <button height="20" bottom_delta="0" label="Cancel" font="SansSerif" left_delta="123" name="cancel_btn" tool_tip="Cancel and close this Dialog" width="113" />
-    <text left="20" bottom_delta="-25" width="360" height="18" font="SansSerif" name="name_confirm_label">
+    <text left="20" bottom_delta="-25" width="360" height="18" font="SansSerif" name="name_confirm_label2">
       The name you give your avatar is called yours Display Name.
     </text>
-     <text left="20" bottom_delta="-18" width="360" height="18" font="SansSerif" name="name_confirm_label">
+     <text left="20" bottom_delta="-18" width="360" height="18" font="SansSerif" name="name_confirm_label3">
       You can change it once a week.
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 5c954dca4..1c6e649e4 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -16,7 +16,7 @@
 		 <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
 		left="235" name="CmdDivisor" width="0"/>
 	  -->
-      <text bottom="-15" left="250" name="objects_link_text_box" width="300">Chat:</text>
+      <text bottom="-15" left="250" name="objects_link_text_box2" width="300">Chat:</text>
       <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
         label="Play the typing sound for local chat" tool_tip="Silences the chatting type sound, making it quieter for things like performances." name="play_typing_sound_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
@@ -25,7 +25,7 @@
         label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
         label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
-      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box">Show links on chatting object names in chat history for:</text>
+      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
       <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
         follows="top" height="20" left="20" name="objects_link" width="350">
         <radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">No object</radio_item>
@@ -58,7 +58,7 @@
       <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Send an item along with the response" name="AscentInstantMessageResponseItem" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
 	  <text bottom_delta="120" left_delta="245" follows="left|top" height="18" name="text_box1">Response Text:</text>
       <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="230" word_wrap="true" spell_check="true"/>
-      <text bottom_delta="-25" follows="left|top" height="18" name="text_box1">
+      <text bottom_delta="-25" follows="left|top" height="18" name="text_box2">
 #f for user's first name, #l for last name,
 #t for timestamp, #r for SLURL to you,
 #i for your idle time. (e.g. "5 mins")
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index d8d200259..2a1b8255b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -24,7 +24,7 @@
 	<text bottom_delta="-26" follows="top" height="10" left="12" name="socks5_host_label">Socks 5 Host:</text>
 	<line_editor bottom_delta="-6" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_host" tool_tip="The name or IP address of the SOCKS5 proxy you would like to use" width="311"/>
 	<spinner bottom_delta="-30" decimal_digits="0" follows="top" height="16" increment="1" initial_val="80" label="Port Number:" label_width="75" max_val="65535" min_val="0" name="socks5_proxy_port" width="140"/>
-	<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_auth_label">Socks5 Authentication:</text>
+	<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_auth_label2">Socks5 Authentication:</text>
 	<radio_group bottom_delta="-6" draw_border="false" follows="top" height="20" name="socks5_auth" width="420">
 		<radio_item bottom="0" height="20" left_delta="80" name="None" tool_tip="No authentication">None</radio_item>
 		<radio_item bottom="0" height="20" left_delta="50" name="UserPass" tool_tip="Username / Password authentication">Username/Password</radio_item>