diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-26 08:55:58 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-26 08:55:58 +0000 |
| commit | a4741cdd1084ce5e3d4940cc4b33556e82e0ce6b (patch) | |
| tree | f40e3c88c62770093effdf9434e14c981fad98cc /indra/newview/skins/default/xui/en | |
| parent | 6acaa5fe309fb2986e1dc1b445f90dba4a2ce418 (diff) | |
| parent | 6bee636a8baddb96affcddbe3cc61aa52e19b3c0 (diff) | |
merge from viewer-2-0
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about_land.xml | 18 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 3be2d1b4e1..51bd7a0a16 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -559,21 +559,26 @@ Leyla Linden </text> left="0" top="0" help_topic="land_covenant_tab" - name="land_covenant_panel"> + name="land_covenant_panel" + word_wrap="true"> <panel.string - name="can_resell"> + name="can_resell" + word_wrap="true"> Purchased land in this region may be resold. </panel.string> <panel.string - name="can_not_resell"> + name="can_not_resell" + word_wrap="true"> Purchased land in this region may not be resold. </panel.string> <panel.string - name="can_change"> + name="can_change" + word_wrap="true"> Purchased land in this region may be joined or subdivided. </panel.string> <panel.string - name="can_not_change"> + name="can_not_change" + word_wrap="true"> Purchased land in this region may not be joined or subdivided. </panel.string> <text @@ -748,6 +753,7 @@ Leyla Linden </text> left_pad="10" mouse_opaque="false" name="resellable_clause" + word_wrap="true" width="330"> Land in this region may not be resold. </text> @@ -1619,7 +1625,7 @@ Only large parcels can be listed in search. layout="topleft" left_pad="5" name="set_media_url" - width="50" + width="70" top_delta="0"/> <check_box follows="top|left" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index c27b251112..fd046c3695 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -249,10 +249,10 @@ <check_box left="10" follows="left|top" - height="16" + height="28" control_name="EditLinkedParts" label="Edit linked" - layout="topleft" + layout="topleft" name="checkbox edit linked parts" > <check_box.commit_callback function="BuildTool.selectComponent"/> @@ -265,7 +265,7 @@ left="13" name="RenderingCost" tool_tip="Shows the rendering cost calculated for this object" - top_pad="9" + top_pad="2" type="string" width="100"> รพ: [COUNT] diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index d1e0746d9d..cc68ec2bdc 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -204,7 +204,7 @@ height="16" name="forgot_password_text" top_pad="12" right="-10" - width="180"> + width="210"> Forgot your name or password? </text> <text |