Merge with head

cc8ee99a · callum · 76fb5dee · aa111277 · 76fb5dee · 76fb5dee
Commit cc8ee99a authored 13 years ago by callum
--- 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
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_currency_html" title="BUY CURRENCY (TODO: Translate to Simplified Chinese)"/>
--- a/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml
+++ b/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml
-<?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>