From 806d09b1143894ad66cea2c228f467e8c39a8adf Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 30 Apr 2013 19:50:05 -0700
Subject: Merge 3.5.1 into Materials

---
 indra/newview/skins/default/xui/zh/floater_incoming_call.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/zh/floater_incoming_call.xml')

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 45a003d3c8..4526eff21d 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</floater.string>
 	<text name="question">
-		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
+		如果接聽，你將切斷目前的語音交談。
 	</text>
-	<button label="接受" label_selected="接受" name="Accept"/>
-	<button label="拒絕" label_selected="拒絕" name="Reject"/>
-	<button label="開始 IM" name="Start IM"/>
+	<button label="接聽" label_selected="接聽" name="Accept"/>
+	<button label="忽視" label_selected="忽視" name="Reject"/>
+	<button label="不接聽但開啟 IM" name="Start IM"/>
 </floater>
-- 
cgit v1.2.3