summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-09-07 12:53:07 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-09-07 12:53:07 -0400
commit04e8d074b2f21438b3f9c463a387c964cd5b6961 (patch)
treec95b5bee3fd31fc66b0055c9635f5d8369cbd5e6 /indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
parent7bee4b58ff1e36ca39abc090991833c43c8903cc (diff)
parente3b4b3875a6d8c7857ba948a662ace4731913ecf (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/floater_outgoing_call.xml')
-rw-r--r--indra/newview/skins/default/xui/zh/floater_outgoing_call.xml20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
index 63da47f4de..e57374f4d7 100644
--- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="outgoing call" title="CALLING">
+<floater name="outgoing call" title="打電話">
<floater.string name="lifetime">
5
</floater.string>
@@ -10,31 +10,31 @@
匿名
</floater.string>
<floater.string name="VoiceInviteP2P">
- 通話中。
+ 來電中。
</floater.string>
<floater.string name="VoiceInviteAdHoc">
- has joined a Voice Chat call with a conference chat.
+ 已加入多方語音通話。
</floater.string>
<text name="connecting">
- Connecting to [CALLEE_NAME]
+ 正在連通 [CALLEE_NAME]
</text>
<text name="calling">
- Calling [CALLEE_NAME]
+ 正在打給 [CALLEE_NAME]
</text>
<text name="noanswer">
- 無應答,請稍候再試。
+ 無人接聽。 請稍候再試一次。
</text>
<text name="nearby">
- You have been disconnected from [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY]
+ 你的 [VOICE_CHANNEL_NAME] 通話已經中斷。 [RECONNECT_NEARBY]
</text>
<text name="nearby_P2P_by_other">
- Your call has ended. [RECONNECT_NEARBY]
+ 你的通話已經結束。 [RECONNECT_NEARBY]
</text>
<text name="nearby_P2P_by_agent">
- You have ended the call. [RECONNECT_NEARBY]
+ 你已經結束通話。 [RECONNECT_NEARBY]
</text>
<text name="leaving">
- Leaving [CURRENT_CHAT].
+ 離開 [CURRENT_CHAT]。
</text>
<button label="取消" label_selected="取消" name="Cancel"/>
</floater>