merge from latest svn/viewer-2-0 to hg/viewer-2-0

1 files changed, 6 insertions, 9 deletions

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 03e2d35b9f..6f01202680 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -12,9 +12,7 @@
  width="280">
     <panel.string
      name="help_text">
-        The General tab contains general information about
-this group, a list of Owners and visible Members, 
-general Group Preferences and member options.
+        The General tab contains general information about this group, a list of members, general Group Preferences and member options.
 
 Hover your mouse over the options for more help.
     </panel.string>
@@ -45,7 +43,6 @@ Hover your mouse over the options for more help.
      follows="left|top"
      left="5"
      height="75"
-     hide_scrollbar="true"
      layout="topleft"
      max_length="511"
      name="charter"
@@ -114,7 +111,7 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left_delta="0"
          name="active_title"
-         tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active."
+         tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."
          top_pad="0"
          width="240" />
         <check_box
@@ -124,7 +121,7 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left_delta="0"
          name="receive_notices"
-         tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you."
+         tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."
          top_pad="5"
          width="240" />
         <check_box
@@ -180,7 +177,7 @@ Hover your mouse over the options for more help.
          max_val="99999"
          top_pad="5"
          name="spin_enrollment_fee"
-         tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
+         tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
          top_delta="-2"
          width="75" />
         <check_box
@@ -202,7 +199,7 @@ Hover your mouse over the options for more help.
          top_pad="10"
          width="240">
             <combo_box.item
-             label="Select Mature -"
+             label="- Select Mature -"
              name="select_mature"
              value="Select" />
             <combo_box.item
@@ -215,4 +212,4 @@ Hover your mouse over the options for more help.
              value="Not Mature" />
         </combo_box>  
     </panel>
-</panel> 
\ No newline at end of file
+</panel>