diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:37:06 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:37:06 +0100 |
| commit | 77c3a65db60e5ba5f5507c0f68a5d92cc67b83f9 (patch) | |
| tree | 310cd028cea3fe636ce355d044564f009f40c9ef /indra/newview/skins/default/xui/en | |
| parent | b6804a855bc54b060f5e27cfdce7a8277c590ee9 (diff) | |
| parent | 76da1229ec26b582e054e8a1588ea78943c92d70 (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 50df227fbf..49b252174c 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -80,10 +80,11 @@ <panel follows="all" height="493" + help_topic="" label="" layout="topleft" left="9" - help_topic="" + name="item_profile" top="45" width="313" background_visible="true" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a0c67e3612..048de70045 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3239,4 +3239,20 @@ Abuse Report</string> <!-- currency formatting --> <string name="LocalEstimateUSD">US$ [AMOUNT]</string> + + <!-- Group Profile roles and powers --> + <string name="Membership">Membership</string> + <string name="Roles">Roles</string> + <string name="Group Identity">Group Identity</string> + <string name="Parcel Management">Parcel Management</string> + <string name="Parcel Identity">Parcel Identity</string> + <string name="Parcel Settings">Parcel Settings</string> + <string name="Parcel Powers">Parcel Powers</string> + <string name="Parcel Access">Parcel Access</string> + <string name="Parcel Content">Parcel Content</string> + <string name="Object Management">Object Management</string> + <string name="Accounting">Accounting</string> + <string name="Notices">Notices</string> + <string name="Chat">Chat</string> + </strings> |