summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/panel_script_ed.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/panel_script_ed.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/panel_script_ed.xml')
-rw-r--r--indra/newview/skins/default/xui/zh/panel_script_ed.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index cc2b0fc673..e59307fcfc 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -4,7 +4,7 @@
載入中...
</panel.string>
<panel.string name="can_not_view">
- 你不能察看或編輯此腳本,自從它被設定為 &quot;no copy&quot; 後。你需要完整權限去察看或編輯有包含腳本在內的物件。
+ 你無法察看或編輯這腳本,它被設為「禁止複製」。 你需要完整權限去察看或編輯物件內的腳本。
</panel.string>
<panel.string name="public_objects_can_not_run">
公開物件不能執行腳本
@@ -27,7 +27,7 @@
<menu_item_call label="復原" name="Undo"/>
<menu_item_call label="重做" name="Redo"/>
<menu_item_call label="剪下" name="Cut"/>
- <menu_item_call label="覆製" name="Copy"/>
+ <menu_item_call label="恚庨" name="Copy"/>
<menu_item_call label="貼上" name="Paste"/>
<menu_item_call label="全選" name="Select All"/>
<menu_item_call label="取消選擇" name="Deselect"/>