diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-20 11:51:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-20 11:51:55 -0400 |
| commit | c7e02dd3f75d6431ecd28f2d1cab3a40b8bf77fd (patch) | |
| tree | 6a514c641f8e5abf01ad707ed82445de10d478f7 | |
| parent | 09939ac8af21fd98159e8cb38bdd16527b44fff7 (diff) | |
| parent | aa11127742e39c5b797435a0a8c3a1fc46fad7aa (diff) | |
merge changes for storm-1615
| -rw-r--r-- | indra/newview/installers/windows/lang_ru.nsi | bin | 7540 -> 7542 bytes | |||
| -rw-r--r-- | indra/newview/installers/windows/lang_tr.nsi | bin | 7540 -> 7542 bytes | |||
| -rw-r--r-- | indra/newview/installers/windows/lang_zh.nsi | bin | 5824 -> 5554 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml | 4 |
5 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi Binary files differindex af288c0bfb..23a0252200 100644 --- a/indra/newview/installers/windows/lang_ru.nsi +++ b/indra/newview/installers/windows/lang_ru.nsi diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi Binary files differindex a4efc95475..e5468c6e9d 100644 --- a/indra/newview/installers/windows/lang_tr.nsi +++ b/indra/newview/installers/windows/lang_tr.nsi diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi Binary files differindex f4fb70a726..3702eeb12c 100644 --- a/indra/newview/installers/windows/lang_zh.nsi +++ b/indra/newview/installers/windows/lang_zh.nsi 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> |