Merge from 2.1 Alpha tag

6 files changed, 108 insertions, 192 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index bf5bd87ad6..0569b4d515 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -47,8 +47,8 @@
          width="263">
         <layout_panel
          follows="top|left|right"
-         user_resize="false"
-         auto_resize="false"
+          user_resize="false" 
+         auto_resize="false" 
          layout="topleft"
          height="20"
          name="my_panel">
@@ -123,7 +123,7 @@
           layout="topleft"
           left="2"
           top_pad="0"
-          height="132"
+          height="132" 
           name="callers_panel"
           user_resize="false" 
           width="280">
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 9bf9cc6c77..edc25348e4 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="27"
+ legacy_header_height="18"
  can_resize="true"
- height="500"
+ height="420"
  name="voice_effects"
  help_topic="voice_effects"
- title="VOICE MORPHING"
+ title="PREVIEW VOICE MORPHING"
  background_visible="true"
  follows="all"
  label="Places"
  layout="topleft"
- min_height="360"
- min_width="200"
- width="300">
+ min_height="350"
+ min_width="330"
+ width="455">
   <string name="no_voice_effect">
     (No Voice Morph)
   </string>
@@ -25,22 +25,8 @@
   <string name="new_voice_effect">
     (New!)
   </string>
- <text
-   height="16"
-   word_wrap="true"
-   use_ellipses="true"
-   type="string"
-   follows="left|top|right"
-   layout="topleft"
-   font="SansSerifBold"
-   color="White"
-   left="10"
-   name="preview_text"
-   right="-10"
-   top="27">To Preview
-   </text>
   <text
-   height="23"
+   height="68"
    word_wrap="true"
    use_ellipses="true"
    type="string"
@@ -48,20 +34,22 @@
    layout="topleft"
    left="10"
    name="status_text"
-   right="-5"
-   top_pad="0">
-Record a sample, then click on a voice to hear how it will sound.
+   right="-10"
+   top="25">
+To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
+
+To reconnect to Nearby Voice simply close this window.
   </text>
   <button
    follows="left|top"
    height="23"
-   label="Record"
+   label="Record Sample"
    layout="topleft"
    left="10"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
-   width="100">
+   width="150">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
@@ -73,22 +61,22 @@ Record a sample, then click on a voice to hear how it will sound.
    left_delta="0"
    name="record_stop_btn"
    top_delta="0"
-   width="100">
+   width="150">
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
   <text
-   height="23"
+   height="18"
    halign="right"
    use_ellipses="true"
    type="string"
    follows="left|top|right"
    layout="topleft"
    left_pad="10"
-   top_delta="10"
    name="voice_morphing_link"
-   right="-10">
-    [[URL] Subscribe Now]
+   right="-10"
+   top_delta="5">
+    [[URL] Get Voice Morphing]
   </text>
   <scroll_list
    bottom="-10"
@@ -100,16 +88,14 @@ Record a sample, then click on a voice to hear how it will sound.
    name="voice_effect_list"
    right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="95">
+   top="128">
     <scroll_list.columns
-     label="Voice Name"
-     name="name"
-     relative_width="0.60" />
+     label="Voice Morph"
+     name="name" relative_width="0.41"/>
     <scroll_list.columns
      dynamic_width="true"
      label="Expires"
      name="expires"
-     relative_width="0.30" />
+	 relative_width="0.59" />
   </scroll_list>
-
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 63ff7047b4..2641ce4ee4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -707,6 +707,13 @@
          label="Options"
          name="Options"
          tear_off="true">
+            <menu_item_call
+             label="Set Default Upload Permissions"
+             name="perm prefs">
+                <menu_item_call.on_click
+                 function="Floater.Toggle"
+                 parameter="perm_prefs" />
+            </menu_item_call>
 	   <menu_item_check
 	       label="Show Advanced Permissions"
 	       name="DebugPermissions">
@@ -866,13 +873,8 @@
                  function="File.UploadBulk"
                  parameter="" />
             </menu_item_call>
-            <menu_item_call
-             label="Set Default Upload Permissions"
-             name="perm prefs">
-                <menu_item_call.on_click
-                 function="Floater.Toggle"
-                 parameter="perm_prefs" />
-            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
         </menu>
     </menu>
     <menu
@@ -925,7 +927,7 @@
         <menu_item_check
          label="Show Advanced Menu"
          name="Show Advanced Menu"
-         shortcut="control|alt|shift|D">
+         shortcut="control|alt|D">
           <on_check
            function="CheckControl"
            parameter="UseDebugMenus" />
@@ -1475,18 +1477,6 @@
                 <menu_item_call.on_click
                  function="View.DefaultUISize" />
             </menu_item_call>
-            <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility.  The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. -->
-            <menu_item_check
-               label="Show Advanced Menu - legacy shortcut"
-               name="Show Advanced Menu - legacy shortcut"
-               shortcut="control|alt|D">
-              <on_check
-		 function="CheckControl"
-		 parameter="UseDebugMenus" />
-              <on_click
-		 function="ToggleControl"
-		 parameter="UseDebugMenus" />
-            </menu_item_check>
             <menu_item_separator/>
             <menu_item_check
              label="Always Run"
@@ -1662,6 +1652,7 @@
              function="ToggleControl"
              parameter="QAMode" />
         </menu_item_check>
+    
     </menu>
     <menu
      create_jump_keys="true"
@@ -3287,4 +3278,4 @@
             </menu>
         </menu>
     </menu>
-</menu_bar>
+</menu_bar>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3576462cca..6d3d0f13bf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -817,17 +817,6 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
 
   <notification
    icon="alertmodal.tga"
-   name="DeleteOutfits"
-   type="alertmodal">
-    Delete the selected outfit?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
    name="PromptGoToEventsPage"
    type="alertmodal">
 Go to the [SECOND_LIFE] events web page?
@@ -1408,7 +1397,8 @@ Unable to encode file: [FILE]
    icon="alertmodal.tga"
    name="CorruptedProtectedDataStore"
    type="alertmodal">
-   We can't fill in your username and password.  This may happen when you change network setup
+  We are unable to read your protected data so it is being reset.
+   This may happen when you change network setup.
 
     <usetemplate
      name="okbutton"
@@ -2076,7 +2066,6 @@ Would you be my friend?
        name="Cancel"
        text="Cancel"/>
     </form>
-    <unique/>
   </notification>
 
   <notification
@@ -2109,7 +2098,7 @@ Would you be my friend?
    type="alertmodal">
     New outfit name:
     <form name="form">
-      <input name="new_name" type="text" width="300">
+      <input name="new_name" type="text">
         [NAME]
       </input>
       <button
@@ -4529,6 +4518,18 @@ Uploading in-world and web site snapshots...
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   name="UploadConfirmation"
+   type="alertmodal">
+Uploading costs L$[AMOUNT].
+Do you wish to proceed?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Upload"/>
+  </notification>
+
+  <notification
    icon="notify.tga"
    name="UploadPayment"
    persist="true"
@@ -4897,10 +4898,6 @@ If you want to view streaming media on parcels that support it you should go to
    persist="true"
    type="notify">
 No Media Plugin was found to handle the "[MIME_TYPE]" mime type.  Media of this type will be unavailable.
-    <unique>
-      <context key="[MIME_TYPE]"/>
-    </unique>
-
   </notification>
   <notification
    icon="alertmodal.tga"
@@ -5493,6 +5490,7 @@ If you stay in this region you will be logged out.
   <notification
    icon="notify.tga"
    name="LoadWebPage"
+   persist="true"
    type="notify">
 Load web page [URL]?
 
@@ -5529,6 +5527,14 @@ Failed to find [TYPE] named [DESC] in database.
 
   <notification
    icon="notify.tga"
+   name="ShareToWebFailed"
+   persist="true"
+   type="notify">
+    Failed to upload image to web.
+  </notification>
+  
+  <notification
+   icon="notify.tga"
    name="InvalidWearable"
    persist="true"
    type="notify">
@@ -5592,6 +5598,7 @@ Grant this request?
   <notification
    icon="notify.tga"
    name="ScriptDialog"
+   persist="true"
    type="notify">
 [FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
@@ -5606,6 +5613,7 @@ Grant this request?
   <notification
    icon="notify.tga"
    name="ScriptDialogGroup"
+   persist="true"
    type="notify">
 [GROUPNAME]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
@@ -6199,7 +6207,7 @@ The button will be shown when there is enough space for it.
    icon="notifytip.tga"
    name="ShareNotification"
    type="notifytip">
-Select residents to share with.
+Drag items from inventory onto a person in the resident picker
   </notification>
   <notification
    icon="notifytip.tga"
@@ -6221,7 +6229,7 @@ With the following Residents:
    icon="notifytip.tga"
    name="ItemsShared"
    type="notifytip">
-Items successfully shared.
+Items are successfully shared.
   </notification>
   <notification
    icon="notifytip.tga"
@@ -6296,39 +6304,36 @@ Avatar '[NAME]' entered appearance mode.
 Avatar '[NAME]' left appearance mode.
   </notification>
 
-  <notification
+    <notification
    icon="alertmodal.tga"
    name="NoConnect"
    type="alertmodal">
-We're having trouble connecting using [PROTOCOL] [HOSTID].
-Please check your network and firewall setup.
-    <form name="form">
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoVoiceConnect"
-   type="alertmodal">
-We're having trouble connecting to your voice server:
-
-[HOSTID]
+        We're having trouble connecting using [PROTOCOL] [HOSTID].
+        Please check your network and firewall setup.
+        <form name="form">
+            <button
+               default="true"
+               index="0"
+               name="OK"
+               text="OK"/>
+        </form>
+    </notification>
 
-Voice communications will not be available.
-Please check your network and firewall setup.
-    <form name="form">
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-    </form>
-  </notification>
+    <notification
+          icon="alertmodal.tga"
+          name="NoVoiceConnect"
+          type="alertmodal">
+        We're having trouble connecting your voiceserver using [HOSTID].
+        Voice communications will not be available.
+        Please check your network and firewall setup.
+        <form name="form">
+            <button
+               default="true"
+               index="0"
+               name="OK"
+               text="OK"/>
+        </form>
+    </notification>
 
   <notification
    icon="notifytip.tga"
@@ -6340,21 +6345,13 @@ Avatar '[NAME]' left as fully loaded.
 
   <notification
    icon="notifytip.tga"
-   name="AvatarRezSelfBakedTextureUploadNotification"
+   name="AvatarRezSelfBakeNotification"
    type="notifytip">
 ( [EXISTENCE] seconds alive )
 You uploaded a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
   </notification>
 
   <notification
-   icon="notifytip.tga"
-   name="AvatarRezSelfBakedTextureUpdateNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
-  </notification>
-
-  <notification
    icon="alertmodal.tga"
    name="ConfirmLeaveCall"
    type="alert">
@@ -6364,7 +6361,7 @@ Are you sure you want to leave this call?
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
-    <unique/>
+     <unique/>
   </notification>
 
   <notification
@@ -6381,7 +6378,7 @@ Mute everyone?
      name="okcancelignore"
      yestext="Ok"
      notext="Cancel"/>
-    <unique/>
+     <unique/>
   </notification>
 
   <global name="UnsupportedCPU">
@@ -6410,14 +6407,11 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
 - Your system memory does not meet the minimum requirements.
   </global>
 
-<!-- these are alert strings from server. the name needs to match entire the server string, and needs to be changed
+<!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed
 	whenever the server string changes -->
    <global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">
 If you own a piece of land, you can make it your home location.
 Otherwise, you can look at the Map and find places marked &quot;Infohub&quot;.
   </global>
-  <global name="You died and have been teleported to your home location">
-You died and have been teleported to your home location.
-  </global>
 
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 93e79b7328..c575ca468c 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -6,7 +6,7 @@
  name="panel_voice_effect"
  width="200">
   <string name="no_voice_effect">
-    Voice Morphing Off
+    No Voice Morph
   </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
@@ -19,11 +19,11 @@
    follows="left|top|right"
    height="23"
    name="voice_effect"
-   tool_tip="Select a Voice Morph to change your voice"
+   tool_tip="Select a Voice Morphing effect to change your voice."
    top_pad="0"
    width="200">
     <combo_box.item
-     label="Voice Morphing Off"
+     label="No Voice Morph"
      name="no_voice_effect"
 	 top_pad="0"
      value="0" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 048de70045..0d14a6b3c8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -67,7 +67,7 @@
 	<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
 	<string name="TestingDisconnect">Testing viewer disconnect</string>
 
-	<!-- Tooltip -->
+	<!-- Tooltip, lltooltipview.cpp -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
 	<string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
@@ -83,7 +83,6 @@
 	<string name="TooltipFlagNoScripts">No Scripts</string>
 	<string name="TooltipLand">Land:</string>
 	<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>
-	<string name="TooltipPrice" value="L$[AMOUNT]: "/>
 
 	<!-- tooltips for Urls -->
 	<string name="TooltipHttpUrl">Click to view this web page</string>
@@ -104,6 +103,8 @@
 	<string name="TooltipMapUrl">Click to view this location on a map</string>
 	<string name="TooltipSLAPP">Click to run the secondlife:// command</string>
 	<string name="CurrentURL" value=" CurrentURL: [CurrentURL]" />	
+  <string name="TooltipPrice" value=" L$[PRICE]-" />
+  
 
 	<!-- text for SLURL labels -->
 	<string name="SLurlLabelTeleport">Teleport to</string>
@@ -135,8 +136,7 @@
 	<string name="RetrievingData">Retrieving...</string>
 
 	<string name="ReleaseNotes">Release Notes</string>
-	<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
-	<string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.secondlife.com/wiki/Release_Notes/</string>
+	<string name="RELEASE_NOTES_BASE_URL">http://secondlife.com/app/releasenotes/</string>
 
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">Loading...</string>
@@ -278,7 +278,6 @@
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
 	<string name="worldmap_offline">Offline</string>
-	<string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE]</string>
 	<string name="worldmap_results_none_found">None found.</string>
 
 	<!-- animations uploading status codes -->
@@ -1813,8 +1812,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="skirt">Skirt</string>
 	<string name="alpha">Alpha</string>
 	<string name="tattoo">Tattoo</string>
-  <string name="invalid">invalid</string>
-  <string name="none">none</string>
+	<string name="invalid">invalid</string>
   
   <!-- Not Worn Wearable Types -->
 	<string name="shirt_not_worn">Shirt not worn</string>
@@ -1830,26 +1828,9 @@ Clears (deletes) the media and all params from the given face.
 	<string name="tattoo_not_worn">Tattoo not worn</string>
 	<string name="invalid_not_worn">invalid</string>
 
-	<!-- Create new wearable of the specified type -->
-	<string name="create_new_shape">Create new shape</string>
-	<string name="create_new_skin">Create new skin</string>
-	<string name="create_new_hair">Create new hair</string>
-	<string name="create_new_eyes">Create new eyes</string>
-	<string name="create_new_shirt">Create new shirt</string>
-	<string name="create_new_pants">Create new pants</string>
-	<string name="create_new_shoes">Create new shoes</string>
-	<string name="create_new_socks">Create new socks</string>
-	<string name="create_new_jacket">Create new jacket</string>
-	<string name="create_new_gloves">Create new gloves</string>
-	<string name="create_new_undershirt">Create new undershirt</string>
-	<string name="create_new_underpants">Create new underpants</string>
-	<string name="create_new_skirt">Create new skirt</string>
-	<string name="create_new_alpha">Create new alpha</string>
-	<string name="create_new_tattoo">Create new tattoo</string>
-	<string name="create_new_invalid">invalid</string>
-
   <!-- Wearable List-->
   <string name="NewWearable">New [WEARABLE_ITEM]</string>
+  <string name="CreateNewWearable">Create [WEARABLE_TYPE]</string>
   
 	<!-- LLGroupNotify -->
 	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
@@ -1914,7 +1895,6 @@ Clears (deletes) the media and all params from the given face.
 	<string name="AnimFlagStop"  value=" Stop Animation :    " />
 	<string name="AnimFlagStart" value=" Start Animation :   " />
 	<string name="Wave"          value=" Wave " />
-	<string name="GestureActionNone" value="None" />
 	<string name="HelloAvatar"   value=" Hello, avatar! " />
 	<string name="ViewAllGestures"  value="  View All &gt;&gt;" />
 	<string name="GetMoreGestures"  value="  Get More &gt;&gt;" />
@@ -1957,12 +1937,8 @@ Clears (deletes) the media and all params from the given face.
 	<string name="InvFolder Uncompressed Sounds">Uncompressed Sounds</string>
 	<string name="InvFolder Animations">Animations</string>
 	<string name="InvFolder Gestures">Gestures</string>
-	<string name="InvFolder Favorite">Favorites</string>
-  <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
-  We should localize both of them with the same value -->
 	<string name="InvFolder favorite">Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
-	<string name="InvFolder Initial Outfits">Initial Outfits</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
 	<string name="InvFolder Accessories">Accessories</string>
 
@@ -2103,7 +2079,6 @@ Clears (deletes) the media and all params from the given face.
 	<string name="SummaryForTheWeek"    value="Summary for this week, beginning on " />
 	<string name="NextStipendDay"       value="The next stipend day is " />
 	<string name="GroupIndividualShare" value="                      Group       Individual Share" />
-	<string name="GroupColumn"          value="                      Group" />
 	<string name="Balance">Balance</string>
 	<string name="Credits">Credits</string>
 	<string name="Debits">Debits</string>
@@ -2182,7 +2157,6 @@ Clears (deletes) the media and all params from the given face.
 	<string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string>
 	<string name="ATTACH_HUD_BOTTOM">HUD Bottom</string>
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string>
-	<string name="Bad attachment point">Invalid Attachment Point</string>
 			
 	<!-- script editor -->
 	<string name="CursorPos">Line [LINE], Column [COLUMN]</string>
@@ -2195,8 +2169,8 @@ Clears (deletes) the media and all params from the given face.
 	<string name="PanelDirEventsDateText">[mthnum,datetime,slt]/[day,datetime,slt]</string>
 
 	<!-- panel contents -->
+	<string name="PanelContentsNewScript">New Script</string>
 	<string name="PanelContentsTooltip">Content of object</string>
-	<string name="PanelContentsNewScript">New Script</string>	
 
   <!-- panel preferences general -->
   <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
@@ -3143,7 +3117,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="group_role_everyone">Everyone</string>
   <string name="group_role_officers">Officers</string>
   <string name="group_role_owners">Owners</string>
-  <string name="group_member_status_online">Online</string>
 
   <string name="uploading_abuse_report">Uploading...
   
@@ -3166,9 +3139,7 @@ Abuse Report</string>
   <string name="New Alpha">New Alpha</string>
   <string name="New Tattoo">New Tattoo</string>
   <string name="Invalid Wearable">Invalid Wearable</string>
-  <string name="New Gesture">New Gesture</string>
   <string name="New Script">New Script</string>
-  <string name="New Note">New Note</string>
   <string name="New Folder">New Folder</string>
   <string name="Contents">Contents</string>
   <string name="Gesture">Gesture</string>
@@ -3190,20 +3161,13 @@ Abuse Report</string>
   <string name="Male - Stick tougue out">Male - Stick tougue out</string>
   <string name="Male - Wow">Male - Wow</string>
 
-  <string name="Female - Chuckle">Female - Chuckle</string>
-  <string name="Female - Cry">Female - Cry</string>
-  <string name="Female - Embarrassed">Female - Embarrassed</string>
   <string name="Female - Excuse me">Female - Excuse me</string>
   <string name="Female - Get lost">Female - Get lost</string>
   <string name="Female - Blow kiss">Female - Blow kiss</string>
   <string name="Female - Boo">Female - Boo</string>
   <string name="Female - Bored">Female - Bored</string>
   <string name="Female - Hey">Female - Hey</string>
-  <string name="Female - Hey baby">Female - Hey baby</string>
   <string name="Female - Laugh">Female - Laugh</string>
-  <string name="Female - Looking good">Female - Looking good</string>
-  <string name="Female - Over here">Female - Over here</string>
-  <string name="Female - Please">Female - Please</string>
   <string name="Female - Repulsed">Female - Repulsed</string>
   <string name="Female - Shrug">Female - Shrug</string>
   <string name="Female - Stick tougue out">Female - Stick tougue out</string>
@@ -3217,12 +3181,12 @@ Abuse Report</string>
 
   <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
   <string name="sentences_separator" value=" "></string>
-  <string name="words_separator" value=", "/>
+  <string name="words_separator">, </string>
   
   <string name="server_is_down">
 	Despite our best efforts, something unexpected has gone wrong.
 
-	Please check status.secondlifegrid.net to see if there is a known problem with the service.  
+	Please check secondlife.com/status to see if there is a known problem with the service.  
         If you continue to experience problems, please check your network and firewall setup.
   </string>
 
@@ -3236,23 +3200,4 @@ Abuse Report</string>
   <string name="dateTimeDayFormat">[MDAY]</string>
   <string name="dateTimeAM">AM</string>
   <string name="dateTimePM">PM</string>
-
-  <!--  currency formatting -->
-  <string name="LocalEstimateUSD">US$ [AMOUNT]</string>
-
-  <!-- Group Profile roles and powers -->
-  <string name="Membership">Membership</string>
-  <string name="Roles">Roles</string>
-  <string name="Group Identity">Group Identity</string>
-  <string name="Parcel Management">Parcel Management</string>
-  <string name="Parcel Identity">Parcel Identity</string>
-  <string name="Parcel Settings">Parcel Settings</string>
-  <string name="Parcel Powers">Parcel Powers</string>
-  <string name="Parcel Access">Parcel Access</string>
-  <string name="Parcel Content">Parcel Content</string>
-  <string name="Object Management">Object Management</string>
-  <string name="Accounting">Accounting</string>
-  <string name="Notices">Notices</string>
-  <string name="Chat">Chat</string>
-
   </strings>