merge changes for storm-1615

2011-10-20 11:51:55 -04:00 · 2011-10-20 11:51:55 -04:00 · c7e02dd3f7
parent 09939ac8af aa11127742
commit c7e02dd3f7
5 changed files with 0 additions and 6 deletions
--- a/indra/newview/installers/windows/lang_ru.nsi
+++ b/indra/newview/installers/windows/lang_ru.nsi
--- a/indra/newview/installers/windows/lang_tr.nsi
+++ b/indra/newview/installers/windows/lang_tr.nsi
--- a/indra/newview/installers/windows/lang_zh.nsi
+++ b/indra/newview/installers/windows/lang_zh.nsi
--- 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
@ -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)"/>
--- a/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml
+++ b/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml
@ -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>