summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-10-16 21:02:48 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-10-16 21:02:48 -0400
commitc370313676451f6e5cfd72bec314ad79bc653833 (patch)
tree1bd99330b482d828f8edc71691d177078123fd1e /indra/newview/skins/default/xui/zh/floater_voice_controls.xml
parent988767d5ec4631ad9f0099180a92c4f186553940 (diff)
parentf2e2ea99a351ca8663af460974137545d020b97f (diff)
Automated merge with file:///Users/nat/linden/viewer-sourceid
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>