6 files changed, 11 insertions, 11 deletions

diff --git a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
index 71f9c86..9898149 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
@@ -19,10 +19,10 @@ a:hover {color:#ff7900;text-decoration:underline;}
 <div id="infobox">
         <img src="../../unabletoconnect.png"><br/>
                 <p>
-                        Second Life can't establish a connection to the login server.
+                        This viewer can't establish a connection to the login server.
                 </p>
                 <p>
-                        Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that Second Life is permitted to access the network.
+                        Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that this viewer is permitted to access the network.
                 </p>
                 <div id="submitbtn">
                         <input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 36a8f93..be29df8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3686,7 +3686,7 @@ Default: off
  label="Max Inventory Items To Transfer"
  name="HelpMaxInventoryItemsTransfer"
  type="alertmodal">
-This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default Second Life setting is 42.
+This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default setting is 42.
 
 Default: -1
 </notification>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 0df65e7..38c5a98 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -103,7 +103,7 @@
                              bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
                              mouse_opaque="true" name="partner_label"
-                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
+                             tool_tip="In world partner."
                              v_pad="0" width="145">
         Partner:
       </text>
@@ -118,7 +118,7 @@
                              border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="18" is_unicode="false" right="-12"
                              max_length="254" mouse_opaque="false" name="partner_edit"
-                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
+                             tool_tip="In world partner."
                              width="145">
         [FIRST] [LAST]
       </line_editor>
@@ -295,7 +295,7 @@
                              bottom="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
                              mouse_opaque="true"
-                             name="Tell everyone about your favorite places in Second Life." v_pad="0"
+                             name="Tell everyone about your favorite places in world." v_pad="0"
                              width="302">
         Tell everyone about your favorite places.
       </text>
@@ -321,7 +321,7 @@
                              bottom="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
                              mouse_opaque="true"
-                             name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
+                             name="Place an ad in the classified listings." v_pad="0"
                              width="302">
         Place an ad in the current grid&apos;s classified listings.
       </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 46283bb..e077ca1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -9,7 +9,7 @@
                         Use external web browser (Firefox, Safari, Internet Explorer)
                 </radio_item>
                 <radio_item bottom="-40" height="20" left="0" name="internal" width="480" 
-                  tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Second Life.">
+                  tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside the viewer.">
                         Use built-in web browser
                 </radio_item>
         </radio_group>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 46ba64a..0169f38 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -101,7 +101,7 @@
         <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
              halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png"
              label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
-             tool_tip="Search Second Life" width="16" scale_image="false"/>
+             tool_tip="Search the grid" width="16" scale_image="false"/>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
              halign="center" height="12" left="-20" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
index 147a5f6..3cbb74b 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
@@ -138,7 +138,7 @@
                 </panel>
                 <panel label="ピック" name="Picks">
                         <tab_container name="picks tab" />
-                        <text name="Tell everyone about your favorite places in Second Life.">
+                        <text name="Tell everyone about your favorite places in world.">
                                 Second Lifeのお気入りの場所を皆に教えてください
                         </text>
                         <button label="新規..." label_selected="新規..." name="New..."/>
@@ -149,7 +149,7 @@
                 </panel>
                 <panel label="広告" name="Classified">
                         <tab_container name="classified tab" />
-                        <text name="Place an ad in Second Life&apos;s classified listings.">
+                        <text name="Place an ad in the classified listings.">
                                 SecondLifeのクラシファイドリストに広告を載せます。
                         </text>
                         <button label="新規..." label_selected="新規..." name="New..."/>