summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-19 17:59:55 -0500
committerOz Linden <oz@lindenlab.com>2013-11-19 17:59:55 -0500
commit0031e9a97be1bf6e9fe773c23506494d09ce91ae (patch)
tree220f195c82174b7cc8e94dceb2553e59fe5837a5 /indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
parentb7edc965bc77ab21e9a1e3f6b424299a50053529 (diff)
parentebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff)
merge up to 3.6.10-release; some of the storm-68 changes lost
Diffstat (limited to 'indra/newview/skins/default/xui/zh/panel_im_control_panel.xml')
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/zh/panel_im_control_panel.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
index 703182e04d..e937368a2b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
@@ -8,7 +8,7 @@
<button label="加為朋友" name="add_friend_btn"/>
</layout_panel>
<layout_panel name="teleport_btn_panel">
- <button label="瞬間傳送" name="teleport_btn" tool_tip="Offer to teleport this person"/>
+ <button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請給此人"/>
</layout_panel>
<layout_panel name="share_btn_panel">
<button label="分享" name="share_btn"/>