diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
| commit | 14e82732f4f74ec59933bb9e6c67cf1ce7800a7f (patch) | |
| tree | c2b5ff471400ced9342f7f3c1e4bc6b32d8df79f /indra/newview/skins/default/xui/zh/sidepanel_inventory.xml | |
| parent | a897e69ffc36b8159e89031c38846395b6551d0b (diff) | |
| parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) | |
merging in latest changes, resolved llimview.cpp conflict
Diffstat (limited to 'indra/newview/skins/default/xui/zh/sidepanel_inventory.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/zh/sidepanel_inventory.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml index 08d441a2f2..c8aae15011 100644 --- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml @@ -1,6 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="事物" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> + <layout_stack name="inventory_layout_stack"> + <layout_panel name="inbox_layout_panel"> + <panel label="" name="marketplace_inbox"> + <string name="InboxLabelWithArg"> + 收到的物項 ([NUM]) + </string> + <string name="InboxLabelNoArg"> + 收到的物項 + </string> + <button label="收到的物項" name="inbox_btn"/> + <text name="inbox_fresh_new_count"> + [NUM] 項新的 + </text> + <panel name="inbox_inventory_placeholder_panel" tool_tip="將物項拖曳置放到收納區，即可開始使用"> + <text name="inbox_inventory_placeholder"> + 從第二人生購物市集購得物項將送到這裡。 + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel name="button_panel"> <layout_stack name="button_panel_ls"> <layout_panel name="info_btn_lp"> |