diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 0dc7d62b19ff470add3b3d2f0a0c51321514ede0..ddc0d9af729777afdebc1a39c6030869a7ad8c46 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -260,10 +260,9 @@
left="10"
name="not worn instructions"
top="31"
+ word_wrap="true"
width="373">
- Put on a new shape by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -274,6 +273,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -300,7 +300,7 @@ scratch and wear it.
left="10"
name="Create New"
top="104"
- width="140" />
+ width="160" />
<button
follows="right|bottom"
height="23"
@@ -463,10 +463,9 @@ scratch and wear it.
left="10"
name="not worn instructions"
top="31"
+ word_wrap="true"
width="373">
- Put on a new skin by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -477,6 +476,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -542,7 +542,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-249"
- width="120" />
+ width="160" />
<button
follows="right|bottom"
height="23"
@@ -713,10 +713,9 @@ scratch and wear it.
left="10"
name="not worn instructions"
top="31"
+ word_wrap="true"
width="373">
- Put on a new hair by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -727,6 +726,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -765,7 +765,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-89"
- width="120" />
+ width="160" />
<button
follows="right|bottom"
height="23"
@@ -898,10 +898,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new eyes by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -912,6 +911,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -950,7 +950,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="39"
- width="120" />
+ width="160" />
<button
follows="right|bottom"
height="23"
@@ -1056,7 +1056,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -1170,10 +1170,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new shirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1184,6 +1183,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1262,7 +1262,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -1376,10 +1376,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new pants by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1390,6 +1389,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1509,10 +1509,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new shoes by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1523,6 +1522,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1572,7 +1572,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -1715,10 +1715,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new socks by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1729,6 +1728,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1778,7 +1778,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -1921,10 +1921,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new jacket by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1935,6 +1934,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1996,7 +1996,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-121"
- width="140" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -2139,10 +2139,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new gloves by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2153,6 +2152,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -2202,7 +2202,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="130" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -2345,10 +2345,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new undershirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2359,6 +2358,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -2551,10 +2551,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new underpants by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2565,6 +2564,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -2757,10 +2757,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new skirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2771,6 +2770,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -2820,7 +2820,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -2962,11 +2962,10 @@ scratch and wear it.
layout="topleft"
left_delta="-2"
name="not worn instructions"
- top_delta="2"
+ top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new alpha mask by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2977,6 +2976,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -3108,7 +3108,7 @@ scratch and wear it.
left="8"
name="Create New"
top="104"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -3250,11 +3250,10 @@ scratch and wear it.
layout="topleft"
left_delta="-2"
name="not worn instructions"
- top_delta="2"
+ top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new tattoo by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -3265,6 +3264,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -3327,7 +3327,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-121"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 93aa1f0e31aabab87ecb54469f5bdfcbbd32e063..4e89df5a7352f7770c5058f564e03aa922a0061d 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -15,13 +15,12 @@
follows="left|top"
height="30"
layout="topleft"
- left="10"
+ left="30"
name="Save item as:"
top="25"
word_wrap="true"
- width="220">
- Press a key to set your
-Speak button trigger.
+ width="180">
+ Press a key to set your Speak button trigger.
</text>
<button
height="23"
@@ -30,5 +29,6 @@ Speak button trigger.
layout="topleft"
right="-10"
name="Cancel"
+ top_pad="8"
width="100" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 1adb824e2a6ad6ff4956db4b9167488a13221699..5e168fe4aa6f268f2eb024a869581aca81baf988 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -49,9 +49,9 @@
left_delta="0"
name="tos_heading"
top_delta="-399"
+ word_wrap="true"
width="552">
- Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE],
-you must accept the agreement.
+ Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
</text>
<web_browser
follows="left|top"
@@ -60,6 +60,6 @@ you must accept the agreement.
left_delta="0"
name="tos_html"
start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
- top_delta="0"
+ top_delta="40"
width="568" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index c17317d0e82842703351f36f752c33e244ab6013..48083b7677da153f4805bdc61fd507cf33b9c5cf 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -17,7 +17,7 @@
</panel.string>
<panel.string
name="already_in_group">
- Some avatars are already in group and were not invited.
+ Some Residents you chose are already in the group, and so were not sent an invitation.
</panel.string>
<text
type="string"
@@ -26,11 +26,10 @@
layout="topleft"
left="7"
name="help_text"
- top="24"
+ top="28"
+ word_wrap="true"
width="200">
- You can select multiple Residents to
-invite to your group. Click 'Open
-Resident Chooser' to start.
+ You can select multiple Residents to invite to your group. Click 'Open Resident Chooser' to start.
</text>
<button
height="20"
@@ -68,6 +67,7 @@ Resident Chooser' to start.
left_delta="4"
name="role_text"
top_pad="5"
+ word_wrap="true"
width="200">
Choose what Role to assign them to:
</text>
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index ff55090f162e9326e348430fa5aaaed23f4207ce..dc8f71c868af937620d9248710ef5ff102eb0f58 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -135,7 +135,8 @@
left="120"
name="covenant_help_text"
top_pad="10"
- width="460">
+ word_wrap="true"
+ width="360">
Changes to the covenant will show on all parcels in the estate.
</text>
<text
@@ -145,9 +146,10 @@
left_delta="0"
name="covenant_instructions"
top_pad="5"
- width="465">
- Drag and drop a notecard to change
- the Covenant for this Estate.
+ word_wrap="true"
+ font.style="ITALIC"
+ width="360">
+ Drag and drop a notecard to change the Covenant for this estate.
</text>
<text
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 6ddd018c7a76ea2c68fa7a4aa12c2fe5894afa43..3980eb86d306b63dc06370fb5eb714e319263504 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -19,9 +19,9 @@
left="10"
name="estate_help_text"
top="14"
- width="313">
- Changes to settings on this tab will affect all
-regions in the estate.
+ word_wrap="true"
+ width="275">
+ Changes to settings on this tab will affect all regions in the estate.
</text>
<text
type="string"
@@ -138,7 +138,7 @@ regions in the estate.
name="Only Allow"
top="250"
width="278">
- Restrict Access to Accounts Verified by:
+ Restrict Access to accounts verified by:
</text>
<check_box
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index 502a5804c3135d9e127973d3efba41736f5365e9..04dbf73be94830f3260e4f0760243be3f0a14e7c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -292,7 +292,7 @@
name="height_text_lbl10"
top_delta="30"
width="400"
- wrap="true">
+ word_wrap="true">
These values represent the blend range for the textures above.
</text>
<text
@@ -303,7 +303,7 @@
name="height_text_lbl11"
top_delta="32"
width="400"
- wrap="true">
+ word_wrap="true">
Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
</text>
<button