summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-09-03 20:12:47 +0000
committerDon Kjer <don@lindenlab.com>2012-09-03 20:12:47 +0000
commit403d1b6404355fa26b0bfeff206f5c56758a491c (patch)
tree6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /indra/newview/skins/default/xui/zh/floater_voice_controls.xml
parent21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff)
parent825cc7873251ad90720ab40221d689abed7b2ac8 (diff)
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
Diffstat (limited to 'indra/newview/skins/default/xui/zh/floater_voice_controls.xml')
-rw-r--r--indra/newview/skins/default/xui/zh/floater_voice_controls.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
index 24b7efea4f..fa724a4736 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
@@ -7,7 +7,7 @@
與 [GROUP] 進行群組通話
</string>
<string name="title_adhoc">
- 會議通話
+ 多方通話
</string>
<string name="title_peer_2_peer">
與 [NAME] 進行通話
@@ -22,7 +22,7 @@
<layout_panel name="leave_call_panel">
<layout_stack name="voice_effect_and_leave_call_stack">
<layout_panel name="leave_call_btn_panel">
- <button label="結束通話" name="leave_call_btn"/>
+ <button label="離開通話" name="leave_call_btn"/>
</layout_panel>
</layout_stack>
</layout_panel>