summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-03-18 17:09:32 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-03-18 17:09:32 +0200
commit40e7a65c698665a8b1db128412bce8332f888875 (patch)
treef6ce345fcc4d1776985652cc439e7fb93ac910f2
parent33746d7c73c09e9e42d1ba31a05ed83548d6e09c (diff)
parent646c349f4178836c6014d9e90670589fcc1b61a4 (diff)
merge
--HG-- branch : product-engine
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml33
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml21
2 files changed, 43 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 412485e03f..9fcabc7722 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -311,12 +311,15 @@
height="23"
label="Add Friend"
layout="topleft"
- left="2"
+ left="1"
mouse_opaque="false"
name="add_friend"
+ pad_left="1"
+ pad_right="1"
tool_tip="Offer friendship to the Resident"
top="5"
- width="80" />
+ use_ellipses="true"
+ width="105" />
<button
follows="bottom|left"
height="23"
@@ -325,8 +328,8 @@
name="im"
tool_tip="Open instant message session"
top="5"
- left_pad="3"
- width="39" />
+ left_pad="0"
+ width="19" />
<button
follows="bottom|left"
height="23"
@@ -334,9 +337,12 @@
layout="topleft"
name="call"
tool_tip="Call this Resident"
- left_pad="3"
+ left_pad="0"
+ pad_left="1"
+ pad_right="1"
top="5"
- width="43" />
+ use_ellipses="true"
+ width="48" />
<button
enabled="false"
follows="bottom|left"
@@ -344,10 +350,13 @@
label="Map"
layout="topleft"
name="show_on_map_btn"
+ pad_left="1"
+ pad_right="1"
tool_tip="Show the Resident on the map"
top="5"
- left_pad="3"
- width="41" />
+ left_pad="0"
+ use_ellipses="true"
+ width="33" />
<button
follows="bottom|left"
height="23"
@@ -355,9 +364,12 @@
layout="topleft"
name="teleport"
tool_tip="Offer teleport"
- left_pad="3"
+ left_pad="0"
+ pad_left="1"
+ pad_right="1"
top="5"
- width="69" />
+ use_ellipses="true"
+ width="81" />
<button
follows="bottom|right"
height="23"
@@ -367,7 +379,6 @@
tool_tip="Pay money to or share inventory with the Resident"
right="-1"
top="5"
- left_pad="3"
width="23" />
</layout_panel>
<layout_panel
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d24873e9e6..934b3c8c5c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3073,4 +3073,25 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="uploading_abuse_report">Uploading...
Abuse Report</string>
+
+ <!-- names for new inventory items-->
+ <string name="New Shape">New Shape</string>
+ <string name="New Skin">New Skin</string>
+ <string name="New Hair">New Hair</string>
+ <string name="New Eyes">New Eyes</string>
+ <string name="New Shirt">New Shirt</string>
+ <string name="New Pants">New Pants</string>
+ <string name="New Shoes">New Shoes</string>
+ <string name="New Socks">New Socks</string>
+ <string name="New Jacket">New Jacket</string>
+ <string name="New Gloves">New Gloves</string>
+ <string name="New Undershirt">New Undershirt</string>
+ <string name="New Underpants">New Underpants</string>
+ <string name="New Skirt">New Skirt</string>
+ <string name="New Alpha">New Alpha</string>
+ <string name="New Tattoo">New Tattoo</string>
+ <string name="Invalid Wearable">Invalid Wearable</string>
+ <string name="New Script">New Script</string>
+ <string name="New Folder">New Folder</string>
+ <string name="Contents">Contents</string>
</strings>