9 files changed, 10 insertions, 19 deletions

diff --git a/linden/indra/newview/skins/xui/de/teleport_strings.xml b/linden/indra/newview/skins/xui/de/teleport_strings.xml
index 061f41d..6beba54 100644
--- a/linden/indra/newview/skins/xui/de/teleport_strings.xml
+++ b/linden/indra/newview/skins/xui/de/teleport_strings.xml
@@ -4,7 +4,7 @@
                 <message name="invalid_tport">

                         Bei der Bearbeitung Ihrer Teleport-Anfrage ist ein Problem aufgetreten. Sie müssen

 sich zum Teleportieren eventuell neu anmelden. Wenn Sie diese

-Nachricht       weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:

+Nachricht weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:

 www.secondlife.com/support

                 </message>

                 <message name="invalid_region_handoff">

diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
index fe76e10..a7fd3ed 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
@@ -213,14 +213,6 @@ Try selecting a smaller area.
                 Land owned by another user is selected. 
 Try selecting a smaller area.
         </string>
-        <string name="for_first_time_group">
-                This land is reserved for first time buyers. 
-You cannot buy it for a group.
-        </string>
-        <string name="for_first_time">
-                This land is reserved for first time buyers. 
-You already own land.
-        </string>
         <string name="processing">
                 Processing your purchase...
  
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index dd7520c..8cfb470 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -385,6 +385,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
+                
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Places" left="1" mouse_opaque="false" name="places_panel"
                      width="778">
@@ -458,9 +459,8 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
                              name="Search" width="70" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+                             draw_heading="true" 
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
@@ -473,6 +473,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
+                
     <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="People" left="1" mouse_opaque="false" name="people_panel"
                      width="778">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_hud.xml b/linden/indra/newview/skins/xui/en-us/floater_hud.xml
index 6a72920..2372f3e 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_hud.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_hud.xml
@@ -2,7 +2,7 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false"

      height="272" min_height="272" width="342" min_width="342" name="floater_hud"

      title="Tutorial">

-        <web_browser border_visible="false" left="0" bottom="0" right="-1" top="-16" caret_color="1 1 1 1" follows="top|left|bottom|right"

+        <web_browser border_visible="false" left="0" bottom="0" right="-1" top="-24" caret_color="1 1 1 1" follows="top|left|bottom|right"

              name="floater_hud_browser"

              start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"

         />

diff --git a/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml b/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml
index 64926c9..fb1f64a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml
@@ -12,8 +12,6 @@
              left="20" name="ok_btn" width="64" />
         <button bottom="10" bottom_delta="0" follows="top|left" height="20" label="Cancel"
              left="112" name="cancel_btn" width="64" />
-        <button bottom="10" bottom_delta="0" follows="top|left" height="20" label="Cancel"
-             left="112" name="cancel_btn2" width="64" />
         <button bottom="10" bottom_delta="0" follows="top|right" height="20" label="Clear"
              name="clear_btn" right="460" width="64" />
         <text bottom_delta="2" follows="bottom|left" height="15" left="220"
diff --git a/linden/indra/newview/skins/xui/en-us/teleport_strings.xml b/linden/indra/newview/skins/xui/en-us/teleport_strings.xml
index 4b3dfa4..616dc1a 100644
--- a/linden/indra/newview/skins/xui/en-us/teleport_strings.xml
+++ b/linden/indra/newview/skins/xui/en-us/teleport_strings.xml
@@ -4,7 +4,7 @@
                 <message name="invalid_tport">
                         Problem encountered processing your teleport request. You may
 need to log back in before you can teleport. If you continue
-to get  this message, please check the Tech Support FAQ at:
+to get this message, please check the Tech Support FAQ at:
 www.secondlife.com/support
                 </message>
                 <message name="invalid_region_handoff">
diff --git a/linden/indra/newview/skins/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/xui/ja/menu_viewer.xml
index c987ea4..278e43f 100644
--- a/linden/indra/newview/skins/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ja/menu_viewer.xml
@@ -177,7 +177,7 @@
         <menu label="ツール" name="Tools">
                 <menu_item_check label="リンクされたパートを編集" name="Edit Linked Parts" />
                 <menu_item_separator label="-----------" name="separator7" />
-                <menu label="������報告" name="Select Tool">
+                <menu label="�����ル���選��" name="Select Tool">
                         <menu_item_call label="フォーカス" name="Focus" />
                         <menu_item_call label="移動" name="Move" />
                         <menu_item_call label="編集" name="Edit" />
diff --git a/linden/indra/newview/skins/xui/ja/teleport_strings.xml b/linden/indra/newview/skins/xui/ja/teleport_strings.xml
index f86ec55..288c44b 100644
--- a/linden/indra/newview/skins/xui/ja/teleport_strings.xml
+++ b/linden/indra/newview/skins/xui/ja/teleport_strings.xml
@@ -4,7 +4,7 @@
                 <message name="invalid_tport">

                         テレポート・リクエストの処理中に問題が発生しました。テレポートするには、

 再度ログインする必要があります。このメッセージが

-        引き続き表示される場合は、技術サポートFAQ（www.secondlife.com/support）

+引き続き表示される場合は、技術サポートFAQ（www.secondlife.com/support）

 を参照してください。

                 </message>

                 <message name="invalid_region_handoff">

diff --git a/linden/indra/newview/skins/xui/ko/teleport_strings.xml b/linden/indra/newview/skins/xui/ko/teleport_strings.xml
index afb83d0..e7985e9 100644
--- a/linden/indra/newview/skins/xui/ko/teleport_strings.xml
+++ b/linden/indra/newview/skins/xui/ko/teleport_strings.xml
@@ -4,7 +4,7 @@
                 <message name="invalid_tport">

                         텔리포트 요청 처리 중 문제가 발생했습니다. 지역 횡단을 하기 전에

 다시 로그인을 해야 합니다. 이러한 메시지를

-계속 받는   경우에는 www.secondlife.com/support에서 기술 지원 FAQ를

+계속 받는 경우에는 www.secondlife.com/support에서 기술 지원 FAQ를

 참조하십시오.

                 </message>

                 <message name="invalid_region_handoff">