diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-31 10:56:29 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-31 10:56:29 -0700 |
| commit | 5d99b221fa8ea75b128e3cc771ed91baa8b11311 (patch) | |
| tree | d98836effa40674d5d31ee7cbde6a95236f134fc /indra/newview/skins/default/xui/en | |
| parent | f18cfe97750cc13374adab15636532fe0fbda19c (diff) | |
| parent | e1023d614c7e9b0a1619e1ff917dbc37fa344aa8 (diff) | |
merge changes for storm-1669
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/inspect_remote_object.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml index ef3dd844cd..e83257d2a0 100644 --- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml @@ -36,7 +36,7 @@ height="16" left="8" name="object_owner_label" - width="55" + width="65" top_pad="12"> Owner: </text> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 0a1c0872e9..4079a80924 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -92,7 +92,7 @@ value="ja" /> <combo_box.item enabled="true" - label="正體 (Traditional Chinese) - Beta" + label="正體中文 (Traditional Chinese) - Beta" name="Traditional Chinese" value="zh" /> </combo_box> |