diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 14:03:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 14:03:19 -0500 |
| commit | 5729441b46a546e7e201419c3011964c1e555269 (patch) | |
| tree | b20b731f80d9ada496b13c19ddd2456cb086b178 /indra/newview/skins/default/xui/zh | |
| parent | de825f2cbe69f884c1efdcf3e93af5e28f00e3e0 (diff) | |
| parent | b4edfb1c1dea7940d10c7fd9a699f49562f3096e (diff) | |
merge changes for storm-1676
Diffstat (limited to 'indra/newview/skins/default/xui/zh')
| -rw-r--r-- | indra/newview/skins/default/xui/zh/floater_nearby_chat.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/zh/panel_preferences_chat.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml index f0c34acb06..38a5dab523 100644 --- a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="nearby_chat" title="附近的聊天"> - <check_box label="Translate chat (powered by Google)" name="translate_chat_checkbox"/> + <check_box label="Translate chat" name="translate_chat_checkbox"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml index fc326c2ce2..738c77fd08 100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml @@ -30,7 +30,7 @@ <spinner label="Nearby chat toasts life time:" name="nearby_toasts_lifetime"/> <spinner label="Nearby chat toasts fading time:" name="nearby_toasts_fadingtime"/> <text name="translate_chb_label"> - 聊天時使用機器自動進行翻譯（由 Google 所提供） + 聊天時使用機器自動進行翻譯 </text> <text name="translate_language_text"> 聊天翻譯為： |