summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-03 13:23:50 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-03 13:23:50 -0700
commit0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (patch)
tree25741079cb8edf161b07741decffb43ffa04b144 /indra/newview/skins/default/xui/zh/floater_incoming_call.xml
parent6eb09ab2ae9c90b23c8af1929e7d0a2088a6e76e (diff)
parentfa3b55e68a00359f8b37b1225337e615b3f6da4d (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/skins/default/xui/zh/floater_incoming_call.xml')
-rw-r--r--indra/newview/skins/default/xui/zh/floater_incoming_call.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 123cdd9f2c..a0f31fa11f 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -13,10 +13,10 @@
通話中。
</floater.string>
<floater.string name="VoiceInviteAdHoc">
- has joined a Voice Chat call with a conference chat.
+ 已加訴入會議交談中的語音聊天。
</floater.string>
<floater.string name="VoiceInviteGroup">
- just joined &apos;[GROUP]&apos; voice channel.
+ 剛加入 &apos;[GROUP]&apos; 語音頻道。
</floater.string>
<floater.string name="VoiceInviteQuestionGroup">
Would you like to leave [CURRENT_CHAT] and join the call with &apos;[GROUP]&apos;?