Some more ui cleanup

indra/newview/skins/default/xui/en/floater_profile.xml

@@ -36,7 +36,7 @@
         >
             <panel
              name="panel_profile_secondlife"
-             label="Second Life"
+             label="2nd Life"
              layout="topleft"
              class="panel_profile_secondlife"
              filename="panel_profile_secondlife.xml"

indra/newview/skins/default/xui/en/floater_tos.xml

@@ -76,7 +76,7 @@
      word_wrap="true"
      text_readonly_color="LabelDisabledColor"
      width="552">
-      I have read and agree to the Second Life Terms and Conditions, Privacy Policy, and Terms of Service, including the dispute resolution requirements.
+      I have read and agree to the [CURRENT_GRID] Terms and Conditions, Privacy Policy, and Terms of Service, including the dispute resolution requirements.
     </text>
     <button
      enabled="false"

indra/newview/skins/default/xui/en/notifications.xml

@@ -1326,7 +1326,7 @@ There was a problem uploading a report screenshot due to the following reason: [
    name="MustAgreeToLogIn"
    type="alertmodal">
    <tag>fail</tag>
-You must agree to the Terms and Conditions, Privacy Policy, and Terms of Service to continue logging into [CURRENT_GRID].
+You must agree to the [CURRENT_GRID] Terms and Conditions, Privacy Policy, and Terms of Service to continue logging into [CURRENT_GRID].
   </notification>
 
   <notification

indra/newview/skins/default/xui/en/panel_navigation_bar.xml

@@ -186,7 +186,7 @@
              top="4"
              name="favorite"
              image_drag_indication="Accordion_ArrowOpened_Off"
-             tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+             tool_tip="Drag Landmarks here for quick access to your favorite places in [CURRENT_GRID]!"
              width="310">
             <label
              follows="left|top"
@@ -195,7 +195,7 @@
              left="10"
              name="favorites_bar_label"
              text_color="LtGray"
-             tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+             tool_tip="Drag Landmarks here for quick access to your favorite places in [CURRENT_GRID]!"
              top="13"
 	     valign="bottom"
              width="290">

indra/newview/skins/default/xui/en/panel_profile_picks.xml

@@ -24,7 +24,7 @@
      visible="false"
     />
     <text
-     name="Tell everyone about your favorite places in Second Life."
+     name="Tell everyone about your favorite places in [CURRENT_GRID]."
      top="5"
      left="5"
      right="-5"
@@ -33,8 +33,8 @@
      layout="topleft"
      halign="center"
     >
-        Tell everyone about your favorite places in Second Life.
-    </text>
+		Tell everyone about your favorite places in [CURRENT_GRID].
+	</text>
     <button
      name="new_btn"
      label="New..."

indra/newview/skins/default/xui/en/panel_profile_secondlife.xml

@@ -212,7 +212,7 @@
              />
             <text
              name="label"
-             value="Second Life Birthdate:"
+             value="[CURRENT_GRID] Birthdate:"
              top_pad="2"
              right="-6"
              height="16"