diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-07 12:53:07 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-07 12:53:07 -0400 |
| commit | 04e8d074b2f21438b3f9c463a387c964cd5b6961 (patch) | |
| tree | c95b5bee3fd31fc66b0055c9635f5d8369cbd5e6 /indra/newview/skins/default/xui/zh/menu_people_nearby.xml | |
| parent | 7bee4b58ff1e36ca39abc090991833c43c8903cc (diff) | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool. There are still a few questions
outstanding but this is the initial, optimistic merge.
Diffstat (limited to 'indra/newview/skins/default/xui/zh/menu_people_nearby.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/zh/menu_people_nearby.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml index 9faa35001c..38d5f3d324 100644 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml @@ -2,12 +2,12 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="察看檔案" name="View Profile"/> <menu_item_call label="加為朋友" name="Add Friend"/> - <menu_item_call label="Remove Friend" name="Remove Friend"/> + <menu_item_call label="移除朋友" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="通話" name="Call"/> <menu_item_call label="地圖" name="Map"/> <menu_item_call label="分享" name="Share"/> <menu_item_call label="支付" name="Pay"/> - <menu_item_check label="Block/Unblock" name="Block/Unblock"/> + <menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/> <menu_item_call label="發給瞬間傳送請求" name="teleport"/> </context_menu> |