From caa367e5d435a70647c56460741a52b14f41ec9e Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 11 Aug 2009 06:37:35 +0000
Subject: svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3 EXT-172 -
 adding non-unicode support for group name line_editor EXT-310 text was
 squished, moved things around so there was was more space between text
 blocks. EXT-313 "me" panel EXT-314 changed out arrow character for arrow art,
 added arrow art to textures.xml EXT-315 replaced word "mute" with "block"
 EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
 EXT-323 killed some two items EXT-324 and EXT-322 removed small avatar names
 checkbox and added show chat bubbled checkbox EXT-330 Sidetray filter - text
 overlaps search icon inside textbox EXT-261  I18N: Labels in
 /character/avatar_lad.xml are not localizable EXT-392 Rearranged
 floater_inventory_items_properties.xml to match spec DEV-35897  Filters in
 sidebar remain active even after user has changed/closed tab DEV-36886 I18N:
 hardcoded currency format in panel_status_bar.xml/status/buycurrency
 DEV-36987 - Pressed states needed for widgets DEV-36795 Remove slurl tooltip
 from navigation bar location box DEV-37184 Move "Block List" out of topmenu
 and make a button in Prefs > Privacy

---
 indra/newview/skins/default/xui/en/strings.xml | 194 ++++++++++++++++++++++++-
 1 file changed, 191 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bc364687e9..fb3d3b4dea 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -733,7 +733,195 @@ If you continue to receive this message, contact customer support.
 If you continue to receive this message, contact customer support.
 	</string>
 
-	<!-- Group Information -->
-	
-	
+	<!-- Avatar Shape Information -->
+    <string name="Attached Earlobes">Attached Earlobes</string>
+	<string name="Arm Length">Arm Length</string>	
+    <string name="Back Bangs Down">Back Bangs Down</string>
+    <string name="Back Bangs Up">Back Bangs Up</string>
+    <string name="Back Hair Down">Back Hair Down</string>
+    <string name="Back Hair Up">Back Hair Up</string>
+    <string name="Belly Size">Belly Size</string>	
+	<string name="Blonde Hair">Blonde Hair</string>
+    <string name="Big Eyeball">Big Eyeball</string>
+    <string name="Big Hair Back">Big Hair Back</string>
+    <string name="Big Hair Front">Big Hair Front</string>
+    <string name="Big Hair Top">Big Hair Top</string>
+	<string name="Body Fat">Body Fat</string>
+    <string name="Body Thickness">Body Thickness</string>
+    <string name="Breast Buoyancy">Breast Buoyancy</string>
+    <string name="Breast Cleavage">Breast Cleavage</string>
+	<string name="Breast Size">Breast Size</string>
+    <string name="Bridge Width">Bridge Width</string>
+    <string name="Brow Size">Brow Size</string>
+    <string name="Butt Size">Butt Size</string>
+    <string name="Cheek Bones">Cheek Bones</string>
+    <string name="Chest Size">Chest Size</string>
+    <string name="Chin Angle">Chin Angle</string>
+    <string name="Chin Cleft">Chin Cleft</string>
+    <string name="Chin Depth">Chin Depth</string>
+    <string name="Chin-Neck">Chin-Neck</string>
+	<string name="Collar Back">Collar Back</string>
+	<string name="Collar Front">Collar Front</string>
+    <string name="Crooked Nose">Crooked Nose</string>
+    <string name="Cuff Flare">Cuff Flare</string>
+    <string name="Ear Angle">Ear Angle</string>
+    <string name="Ear Size">Ear Size</string>
+    <string name="Ear Tips">Ear Tips</string>
+    <string name="Egg Head">Egg Head</string>
+    <string name="Eye Bags">Eye Bags</string>
+	<string name="Eye Color">Eye Color</string>
+    <string name="Eye Depth">Eye Depth</string>
+	<string name="Eye Lightness">Eye Lightness</string>
+    <string name="Eye Opening">Eye Opening</string>
+    <string name="Eye Pop">Eye Pop</string>
+    <string name="Eye Size">Eye Size</string>
+    <string name="Eye Spacing">Eye Spacing</string>
+    <string name="Eyeball Size">Eyeball Size</string>
+    <string name="Eyebrow Arc">Eyebrow Arc</string>
+    <string name="Eyebrow Height">Eyebrow Height</string>
+    <string name="Eyebrow Points">Eyebrow Points</string>
+    <string name="Eyelash Length">Eyelash Length</string>
+	<string name="Eyeliner">Eyeliner</string>
+	<string name="Eyeliner Color">Eyeliner Color</string>
+	<string name="Face Shear">Face Shear</string>
+	<string name="Facial Definitionr">Facial Definition</string>
+    <string name="Fat Head">Fat Head</string>
+    <string name="Fat Lower Lip">Fat Lower Lip</string>
+    <string name="Fat Torso">Fat Torso</string>
+    <string name="Fat Upper Lip">Fat Upper Lip</string>
+    <string name="Foot Size">Foot Size</string>
+	<string name="Freckles">Freckles</string>
+    <string name="Front Bangs Down">Front Bangs Down</string>
+    <string name="Front Bangs Up">Front Bangs Up</string>
+    <string name="Front Hair Down">Front Hair Down</string>
+    <string name="Front Hair Up">Front Hair Up</string>
+	<string name="Forehead Angle">Forehead Angle</string>
+    <string name="Full Hair Sides">Full Hair Sides</string>
+	<string name="Glove Fingers">Glove Fingers</string> 
+	<string name="Glove Length">Glove Length</string>
+    <string name="Hair Thickess">Hair Thickess</string>
+    <string name="Hair Tilted Left">Hair Tilted Left</string>
+    <string name="Hair Tilted Right">Hair Tilted Right</string>
+    <string name="Hair Volume">Hair Volume</string>
+	<string name="Hand Size">Hand Size</string>
+	<string name="Head Length">Head Length</string>
+    <string name="Head Shape">Head Shape</string>
+    <string name="Head Size">Head Size</string>
+    <string name="Head Stretch">Head Stretch</string>
+    <string name="Heel Height">Heel Height</string>
+    <string name="Heel Shape">Heel Shape</string>
+    <string name="Height">Height</string>
+    <string name="Hip Width">Hip Width</string>
+	<string name="Hip Length">Hip Length</string>
+    <string name="Inner Eye Corner">Inner Eye Corner</string>
+    <string name="Jacket Length">Jacket Length</string>
+    <string name="Jacket Wrinkles">Jacket Wrinkles</string>
+    <string name="Jowls">Jowls</string>	
+    <string name="Jaw Angle">Jaw Angle</string>
+    <string name="Jaw Jut">Jaw Jut</string>
+    <string name="Jaw Shape">Jaw Shape</string>
+    <string name="Knee Angle">Knee Angle</string>
+    <string name="Left Part">Left Part</string>
+    <string name="Leg Muscles">Leg Muscles</string>
+	<string name="Leg Length">Leg Length</string>
+    <string name="Lip Cleft">Lip Cleft</string>
+    <string name="Lip Cleft Depth">Lip Cleft Depth</string>
+    <string name="Lip Fullness">Lip Fullness</string>
+	<string name="Lip Pinkness">Lip Pinkness</string>
+    <string name="Lip Ratio">Lip Ratio</string>
+    <string name="Lip Thickness">Lip Thickness</string>	
+    <string name="Lip Width">Lip Width</string>
+    <string name="Longcuffs">Longcuffs</string>
+    <string name="Love Handles">Love Handles</string>
+    <string name="Lower Bridge">Lower Bridge</string>
+    <string name="Lower Cheeks">Lower Cheeks</string>
+    <string name="Middle Part">Middle Part</string>
+    <string name="Mouth Corner">Mouth Corner</string>
+    <string name="Mouth Position">Mouth Position</string>
+	<string name="Nail Polish">Nail Polish</string>
+	<string name="Nail Polish Color">Nail Polish Color</string>
+	<string name="Neck Length">Neck Length</string>
+	<string name="Neck Thickness">Neck Thickness</string>
+    <string name="Nose Size">Nose Size</string>
+    <string name="Nose Thickness">Nose Thickness</string>
+    <string name="Nose Tip Angle">Nose Tip Angle</string>
+    <string name="Nose Tip Shape">Nose Tip Shape</string>
+    <string name="Nose Width">Nose Width</string>
+    <string name="Nostril Division">Nostril Division</string>
+    <string name="Nostril Width">Nostril Width</string>
+    <string name="Open Front">Open Front</string>
+    <string name="Outer Eye Corner">Outer Eye Corner</string>
+	<string name="Outer Shadow">Outer Shadow</string>
+	<string name="Out Shdw Opacity">Out Shdw Opacity</string>
+	<string name="Out Shdw Color">Out Shdw Color</string>	
+    <string name="Package">Package</string>
+    <string name="Pants Crotch">Pants Crotch</string> 
+	<string name="Pants Fit">Pants Fit</string>
+	<string name="Pants Length">Pants Length</string>
+	<string name="Pants Waist">Pants Waist</string>
+	<string name="Pants Wrinkles">Pants Wrinkles</string>
+    <string name="Part Bangs">Part Bangs</string>
+    <string name="Pectorals">Pectorals</string>
+    <string name="Platform Height">Platform Height</string>
+    <string name="Platform Width">Platform Width</string>
+	<string name="Pigment">Pigment</string>
+    <string name="Puffy Eyelids">Puffy Eyelids</string>
+	<string name="Rainbow Color">Rainbow Color</string>
+	<string name="Red Hair">Red Hair</string>
+    <string name="Right Part">Right Part</string>
+    <string name="Round Forehead">Round Forehead</string>
+	<string name="Rosy Complexion">Rosy Complexion</string>
+    <string name="Ruddiness">Ruddiness</string>
+    <string name="Rumpled Hair">Rumpled Hair</string>
+    <string name="Saddle Bags">Saddle Bags</string>
+    <string name="Scrawny Leg">Scrawny Leg</string>
+    <string name="Shear Back">Shear Back</string>
+    <string name="Shear Face">Shear Face</string>
+    <string name="Shear Front">Shear Front</string>
+    <string name="Shift Mouth">Shift Mouth</string>
+	<string name="Shirt Bottom">Shirt Bottom</string>
+    <string name="Shirt Fit">Shirt Fit</string>
+	<string name="Shirt Wrinkles">Shirt Wrinkles</string>
+	<string name="Shoe Height">Shoe Height</string>
+    <string name="Shoulders">Shoulders</string>
+    <string name="Side Bangs Down">Side Bangs Down</string>
+    <string name="Side Bangs Up">Side Bangs Up</string>
+    <string name="Sides Hair Down">Sides Hair Down</string>
+    <string name="Sides Hair Up">Sides Hair Up</string>
+    <string name="Skirt Fit">Skirt Fit</string>
+	<string name="Skirt Length">Skirt Length</string>
+    <string name="Slanted Forehead">Slanted Forehead</string> 
+	<string name="Sleeve Length">Sleeve Length</string>
+    <string name="Sleeve Looseness">Sleeve Looseness</string> 
+	<string name="Slit Back">Slit Back</string> 
+	<string name="Slit Front">Slit Front</string> 
+	<string name="Slit Left">Slit Left</string> 
+	<string name="Slit Right">Slit Right</string> 
+	<string name="Socks Length">Socks Length</string>
+    <string name="Spiked Hair">Spiked Hair</string>
+    <string name="Squash/Stretch Head">Squash/Stretch Head</string>
+    <string name="Swept Back Hair">Swept Back Hair</string>
+    <string name="Swept Forward Hair">Swept Forward Hair</string>
+    <string name="Taper Back">Taper Back</string>
+    <string name="Taper Front">Taper Front</string>
+    <string name="Toe Shape">Toe Shape</string>
+    <string name="Toe Thickness">Toe Thickness</string>
+	<string name="Toe Length">Toe Length</string>
+	<string name="Torso Length">Torso Length</string>
+    <string name="Torso Muscles">Torso Muscles</string>
+    <string name="Torso Scrawny">Torso Scrawny</string>
+    <string name="Upper Bridge">Upper Bridge</string>
+    <string name="Upper Cheeks">Upper Cheeks</string>
+    <string name="Upper Chin Cleft">Upper Chin Cleft</string>
+    <string name="Upper Eyelid Fold">Upper Eyelid Fold</string>
+	<string name="Waist Height">Waist Height</string>
+	<string name="White Hair">White Hair</string>
+    <string name="big belly skirt">big belly skirt</string>
+    <string name="bigbutt skirt">bigbutt skirt</string>
+    <string name="bustle skirt">bustle skirt</string>
+    <string name="legs skirt">legs skirt</string>
+    <string name="loose skirt">loose skirt</string>
+    <string name="poofy skirt">poofy skirt</string>
+    <string name="tight skirt">tight skirt</string>	
+	<string name="wrinkles">wrinkles</string>	
 </strings>
-- 
cgit v1.2.3