summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcallum <none@none>2011-10-21 11:55:50 -0700
committercallum <none@none>2011-10-21 11:55:50 -0700
commitcc8ee99a59bdefccf953b2f4399c424d7e8d72cd (patch)
tree69ae9788d7912a44ce81801f1e4f420caa8a0d47
parent76fb5dee943d7579892e92e265e48fe0136adbe7 (diff)
parentaa11127742e39c5b797435a0a8c3a1fc46fad7aa (diff)
Merge with head
-rw-r--r--indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml2
-rw-r--r--indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml4
2 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml
deleted file mode 100644
index 21953aec08..0000000000
--- a/indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_currency_html" title="BUY CURRENCY (TODO: Translate to Simplified Chinese)"/>
diff --git a/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml b/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml
deleted file mode 100644
index 371086c374..0000000000
--- a/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="ScriptChiclet Menu">
- <menu_item_call label="Close (TODO: translate to Simplified Chinese)" name="Close"/>
-</menu>