From a8796e17bbbd41b6b7b930e42d684ca9acbffe35 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 1 Dec 2009 16:21:08 +0800
Subject: EXT-2854 Replace instances in the viewer with the final search
 maturity names

---
 indra/newview/skins/default/xui/en/floater_about_land.xml        | 8 ++++----
 indra/newview/skins/default/xui/en/floater_world_map.xml         | 2 +-
 indra/newview/skins/default/xui/en/notifications.xml             | 6 +++---
 indra/newview/skins/default/xui/en/panel_edit_classified.xml     | 4 ++--
 indra/newview/skins/default/xui/en/panel_group_general.xml       | 6 +++---
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 6 +++---
 indra/newview/skins/default/xui/en/panel_region_general.xml      | 4 ++--
 indra/newview/skins/default/xui/en/strings.xml                   | 4 ++--
 8 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 8bfd64b3df..6706ef0c8b 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1177,19 +1177,19 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="mature_check_mature">
-                Mature Content
+                Moderate Content
             </panel.string>
             <panel.string
              name="mature_check_adult">
-                Adult Content
+                Explicit Content
             </panel.string>
             <panel.string
              name="mature_check_mature_tooltip">
-                Your parcel information or content is considered mature.
+                Your parcel information or content is considered moderate.
             </panel.string>
             <panel.string
              name="mature_check_adult_tooltip">
-                Your parcel information or content is considered adult.
+                Your parcel information or content is considered explicit.
             </panel.string>
             <panel.string
              name="landing_point_none">
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index e3db0972ec..cb87c9a94d 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -256,7 +256,7 @@
      follows="top|right"
      height="16"
      initial_value="true"
-     label="Mature"
+     label="Moderate"
      layout="topleft"
      left_pad="4"
      name="event_mature_chk"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6e178ad570..cf4b486561 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3486,7 +3486,7 @@ Publish this classified now for L$[AMOUNT]?
    icon="alertmodal.tga"
    name="SetClassifiedMature"
    type="alertmodal">
-Does this classified contain Mature content?
+Does this classified contain Moderate content?
     <usetemplate
      canceltext="Cancel"
      name="yesnocancelbuttons"
@@ -3498,7 +3498,7 @@ Does this classified contain Mature content?
    icon="alertmodal.tga"
    name="SetGroupMature"
    type="alertmodal">
-Does this group contain Mature content?
+Does this group contain Moderate content?
     <usetemplate
      canceltext="Cancel"
      name="yesnocancelbuttons"
@@ -4574,7 +4574,7 @@ Some terms in your search query were excluded due to content restrictions as cla
    icon="notifytip.tga"
    name="NoContentToSearch"
    type="notifytip">
-Please select at least one type of content to search (PG, Mature, or Adult).
+Please select at least one type of content to search (General, Moderate, or Adult).
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 2f3277804f..b5760e977f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -189,12 +189,12 @@
          <combo_item 
           name="mature_ci" 
           value="Mature">
-           Mature Content
+           Moderate Content
          </combo_item>
          <combo_item 
           name="pg_ci" 
           value="PG">
-           PG Content
+           General Content
          </combo_item>
         </combo_box>
         <spinner
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 4c30db4034..06c187991f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -156,15 +156,15 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left_delta="0"
          name="group_mature_check"
-         tool_tip="Sets whether your group information is considered mature"
+         tool_tip="Sets whether your group information is considered moderate"
          top_pad="2"
          width="190">
             <combo_box.item
-             label="PG Content"
+             label="General Content"
              name="pg"
              value="Not Mature" />
              <combo_box.item
-             label="Mature Content"
+             label="Moderate Content"
              name="mature"
              value="Mature" />
         </combo_box>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 6bb937e3c6..ee9bfbae93 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -143,15 +143,15 @@
      top_pad="-10"
      width="170">
         <combo_box.item
-         label="PG, Mature and Adult"
+         label="General, Moderate, Adult"
          name="Desired_Adult"
          value="42" />
         <combo_box.item
-         label="PG and Mature"
+         label="General and Moderate"
          name="Desired_Mature"
          value="21" />
         <combo_box.item
-         label="PG"
+         label="General"
          name="Desired_PG"
          value="13" />
     </combo_box>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 42c6319699..1f22689313 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -182,11 +182,11 @@
          name="Adult"
          value="42" />
         <combo_box.item
-         label="Mature"
+         label="Moderate"
          name="Mature"
          value="21" />
         <combo_box.item
-         label="PG"
+         label="General"
          name="PG"
          value="13" />
     </combo_box>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3c03f0a8cf..d44bdee947 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -269,8 +269,8 @@
 	<string name="ControlYourCamera">Control your camera</string>
 
 	<!-- Sim Access labels -->
-	<string name="SIM_ACCESS_PG">PG</string>
-	<string name="SIM_ACCESS_MATURE">Mature</string>
+	<string name="SIM_ACCESS_PG">General</string>
+	<string name="SIM_ACCESS_MATURE">Moderate</string>
 	<string name="SIM_ACCESS_ADULT">Adult</string>
 	<string name="SIM_ACCESS_DOWN">Offline</string>
 	<string name="SIM_ACCESS_MIN">Unknown</string>
-- 
cgit v1.2.3