summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/floater_mute_object.xml
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-09-08 18:56:43 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-09-08 18:56:43 -0400
commit4091e47cf206a41cac7ee440b8fd2e2898006685 (patch)
tree61de24d7aa90171a5fb6481189567fe408d03786 /indra/newview/skins/default/xui/zh/floater_mute_object.xml
parent81b9e29a1fe227c8f51c6a644b4e2e1afa6bcfb2 (diff)
parent09cd2a4b1a9f1ddf046fb0ce5d12988b968269a3 (diff)
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
cmake and other files didn't get moved over, do it by hand.
Diffstat (limited to 'indra/newview/skins/default/xui/zh/floater_mute_object.xml')
-rw-r--r--indra/newview/skins/default/xui/zh/floater_mute_object.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
index 606e061395..64998d3e28 100644
--- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="block by name" title="依名稱封鎖物件">
<text name="message">
- Block an object:
+ 封鎖一個物件:
</text>
<line_editor name="object_name">
物件名稱
</line_editor>
<text name="note">
- * Only blocks object text, not sounds
+ * 只封鎖物件文字,不封鎖聲音
</text>
<button label="確定" name="OK"/>
<button label="取消" name="Cancel"/>