diff options
author | Alain Linden <alain@lindenlab.com> | 2011-03-03 13:56:43 -0800 |
---|---|---|
committer | Alain Linden <alain@lindenlab.com> | 2011-03-03 13:56:43 -0800 |
commit | ba1d1267fe2214198b36b5ed130a9a4ae5c5fb3f (patch) | |
tree | 5e647d28eaeed51872ff9ca65536aeb2ce90535a /indra/newview/skins/default/xui/en/panel_edit_profile.xml | |
parent | 0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff) | |
parent | d0ed06ffcae08a11ee8b5ff35692b25b5cbbb48a (diff) |
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_profile.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 37265d65f1..442eb8c28d 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -127,7 +127,8 @@ name="solo_user_name" text_color="white" top_delta="3" - value="Hamilton Hitchings" + translate="false" + value="TestString PleaseIgnore" use_ellipses="true" visible="false" width="275" /> @@ -140,7 +141,8 @@ name="user_name" text_color="white" top_delta="0" - value="Hamilton Hitchings" + translate="false" + value="TestString PleaseIgnore" use_ellipses="true" visible="true" width="250" /> @@ -153,7 +155,8 @@ name="user_name_small" text_color="white" top_delta="-4" - value="Hamilton Hitchings" + translate="false" + value="TestString PleaseIgnore" use_ellipses="true" visible="false" wrap="true" @@ -177,8 +180,9 @@ text_color="EmphasisColor" font="SansSerifBold" top_delta="-2" + translate="false" use_ellipses="true" - value="hamilton.linden" + value="teststring.pleaseignore" wrap="true" width="205" /> <panel |