diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-05-24 18:37:20 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-05-24 18:37:20 +0300 |
| commit | 4d9b3cd725e053e10016a39313080c9c6c6a71c7 (patch) | |
| tree | a96f24fa3ab0ba0a787a49361619570e5e68ec62 /indra/newview/skins/default/xui/zh | |
| parent | addbfaf1c774011f3e55a1106f0b83153b7b8568 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Merge VOB with release 4.0.6
Diffstat (limited to 'indra/newview/skins/default/xui/zh')
340 files changed, 539 insertions, 193 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml index e2d6a2b004..e2d6a2b004 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_aaa.xml +++ b/indra/newview/skins/default/xui/zh/floater_aaa.xml diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml index 250cbe67e0..9f6b4421a9 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_about.xml +++ b/indra/newview/skins/default/xui/zh/floater_about.xml @@ -3,6 +3,7 @@ <tab_container name="about_tab"> <panel label="資訊" name="support_panel"> <button label="覆製到剪貼簿" name="copy_btn"/> + <button label="查詢是否有更新版" name="update_btn"/> </panel> <panel label="貸記" name="credits_panel"> <text name="linden_intro">Second Life 由以下的 Linden 家族帶給你： diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml index a9d95e5b9b..489ea61c72 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_about_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml @@ -13,7 +13,7 @@ [MINUTES] 分鐘 </floater.string> <floater.string name="Minute"> - 分鐘 + 分 </floater.string> <floater.string name="Seconds"> [SECONDS] 秒 @@ -446,7 +446,7 @@ <spinner label="出入時間：" name="HoursSpin"/> <panel name="Allowed_layout_panel"> <text label="永遠允許" name="AllowedText"> - 允許的居民 + 允許的居民 ([COUNT]) </text> <name_list name="AccessList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/> <button label="添加" name="add_allowed"/> @@ -454,7 +454,7 @@ </panel> <panel name="Banned_layout_panel"> <text label="禁止" name="BanCheck"> - 被封鎖的居民 + 被封鎖的居民 ([COUNT]) </text> <name_list name="BannedList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/> <button label="添加" name="add_banned"/> diff --git a/indra/newview/skins/default/xui/zh/floater_activeim.xml b/indra/newview/skins/default/xui/zh/floater_activeim.xml index b148ca8eb4..b148ca8eb4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_activeim.xml +++ b/indra/newview/skins/default/xui/zh/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml index 76cb9079c4..76cb9079c4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml index 756cca825d..756cca825d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml index 1b589a92cc..1b589a92cc 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_auction.xml +++ b/indra/newview/skins/default/xui/zh/floater_auction.xml diff --git a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml index 4ee07e6295..ee031edb2d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml @@ -13,6 +13,12 @@ </scroll_list> <button label="添加..." name="autoreplace_add_entry"/> <button label="移除" name="autoreplace_delete_entry"/> + <text name="autoreplace_keyword_txt"> + 關鍵字： + </text> + <text name="autoreplace_replacement_txt"> + 取代文字： + </text> <button label="儲存項目" name="autoreplace_save_entry" tool_tip="儲存此項目。"/> <button label="儲存變更" name="autoreplace_save_changes" tool_tip="儲存所有變更。"/> <button label="取消" name="autoreplace_cancel" tool_tip="放棄所有變更。"/> diff --git a/indra/newview/skins/default/xui/zh/floater_avatar.xml b/indra/newview/skins/default/xui/zh/floater_avatar.xml index 55b1a95a41..55b1a95a41 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_avatar.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml index c19369c859..c19369c859 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml index 69309c96de..69309c96de 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml index 83e10804d6..83e10804d6 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_beacons.xml +++ b/indra/newview/skins/default/xui/zh/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml index 29f36b461c..29f36b461c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_build_options.xml +++ b/indra/newview/skins/default/xui/zh/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml index c103ea938f..c103ea938f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml index 2d76a9f831..d6bdec61b7 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_bumps.xml +++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml @@ -19,6 +19,6 @@ [TIME] [NAME] 以物理物件擊中你 </floater.string> <floater.string name="timeStr"> - [[hour,datetime,slt]:[min,datetime,slt]] + [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]] </floater.string> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml index 5e4153de66..5e4153de66 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml index fcf2800728..fcf2800728 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml index ec700ad7af..ec700ad7af 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml index 51bbd6a561..51bbd6a561 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml index ff4a1feedb..ff4a1feedb 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml index becb7b9546..becb7b9546 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_camera.xml +++ b/indra/newview/skins/default/xui/zh/floater_camera.xml diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml index f1a69a7688..f1a69a7688 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml index 9977bfc828..9977bfc828 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml index fa7b795d4f..fa7b795d4f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/zh/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml index 7d08fe8af2..7d08fe8af2 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_critical.xml +++ b/indra/newview/skins/default/xui/zh/floater_critical.xml diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml index 4aafb31952..4aafb31952 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml new file mode 100644 index 0000000000..f7dd4c8145 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Delete Pref Preset" title="刪除偏好預設"> + <string name="title_graphic"> + 刪除顯像預設 + </string> + <string name="title_camera"> + 刪除攝影機預設 + </string> + <text name="Preset"> + 選擇一個預設 + </text> + <button label="刪除" name="delete"/> + <button label="取消" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_destinations.xml b/indra/newview/skins/default/xui/zh/floater_destinations.xml index f50a6a631a..f50a6a631a 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_destinations.xml +++ b/indra/newview/skins/default/xui/zh/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml index aa71bba769..aa71bba769 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_display_name.xml +++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml index b84a4027ea..b84a4027ea 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml index 1ff832cdc4..1ff832cdc4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml index 7943866e72..7943866e72 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml index 1c6f2f936d..1c6f2f936d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_event.xml b/indra/newview/skins/default/xui/zh/floater_event.xml index 7175731fef..7175731fef 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_event.xml +++ b/indra/newview/skins/default/xui/zh/floater_event.xml diff --git a/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml b/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml index 4d2b3331d7..62e4165c5c 100644 --- a/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml +++ b/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml @@ -66,7 +66,7 @@ <icons_combo_box label="適度成人" name="edit_ContentRatingText" tool_tip="提升體驗的內容分級將會重設所有已允許該體驗的居民的權限。"> <icons_combo_box.item label="完全成人" name="Adult" value="42"/> <icons_combo_box.item label="適度成人" name="Mature" value="21"/> - <icons_combo_box.item label="一般" name="PG" value="13"/> + <icons_combo_box.item label="普級" name="PG" value="13"/> </icons_combo_box> <text name="edit_Location"> 位置： diff --git a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml index 871849305c..be8a824eed 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml @@ -6,5 +6,16 @@ <string name="run"> 跑步 </string> + <combo_box name="time_scale_combo"> + <item label="2x 平均值" name="2x Average"/> + <item label="最大值" name="Max"/> + <item label="最近的最大值" name="Recent Max"/> + <item label="100毫秒" name="100ms"/> + </combo_box> + <combo_box name="metric_combo"> + <item label="時間" name="Time"/> + <item label="通話次數" name="Number of Calls"/> + <item label="赫茲" name="Hz"/> + </combo_box> <button label="暫停" name="pause_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_font_test.xml b/indra/newview/skins/default/xui/zh/floater_font_test.xml index ec83c51eb3..ec83c51eb3 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_font_test.xml +++ b/indra/newview/skins/default/xui/zh/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml index e7b1ed1de3..e7b1ed1de3 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_gesture.xml +++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml index 69a6eadc8c..69a6eadc8c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml index 9e3bb88ac0..9e3bb88ac0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_help_browser.xml b/indra/newview/skins/default/xui/zh/floater_help_browser.xml index e605d5f19c..e605d5f19c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/zh/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/zh/floater_how_to.xml b/indra/newview/skins/default/xui/zh/floater_how_to.xml index e033327165..e033327165 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_how_to.xml +++ b/indra/newview/skins/default/xui/zh/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml index a788961e95..a788961e95 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_hud.xml +++ b/indra/newview/skins/default/xui/zh/floater_hud.xml diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml index 84ad869100..84ad869100 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_im_container.xml +++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml index 864af2e592..864af2e592 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_im_session.xml +++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml index d2de37fa6a..d2de37fa6a 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_import_collada.xml b/indra/newview/skins/default/xui/zh/floater_import_collada.xml index 8f6b476ccf..8f6b476ccf 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/zh/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml index 4526eff21d..4526eff21d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml index 4e1f4b24fd..4e1f4b24fd 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_inspect.xml +++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml index 4f17b96579..4f17b96579 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml index 51dc73d971..d4dfd835d1 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml @@ -24,6 +24,12 @@ <radio_item label="早於" name="older"/> </radio_group> <spinner label="小時前" name="spin_hours_ago"/> + <text name="label_hours"> + 小時 + </text> <spinner label="天前" name="spin_days_ago"/> + <text name="label_days"> + 日 + </text> <button label="關閉" label_selected="關閉" name="Close"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml index e0b2cf5a1c..e0b2cf5a1c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_joystick.xml +++ b/indra/newview/skins/default/xui/zh/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml index aae2cfb466..aae2cfb466 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml index e971b166f7..e971b166f7 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml new file mode 100644 index 0000000000..42eb6c292d --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Load Pref Preset" title="載入偏好預設"> + <string name="title_graphic"> + 載入顯像預設 + </string> + <string name="title_camera"> + 載入攝影機預設 + </string> + <text name="Preset"> + 選擇一個預設 + </text> + <button label="確定" name="ok"/> + <button label="取消" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml index b10a480b06..b10a480b06 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/zh/floater_map.xml b/indra/newview/skins/default/xui/zh/floater_map.xml index 8a030b3b3f..8a030b3b3f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_map.xml +++ b/indra/newview/skins/default/xui/zh/floater_map.xml diff --git a/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml index 7f030924e1..7f030924e1 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/zh/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/zh/floater_media_settings.xml b/indra/newview/skins/default/xui/zh/floater_media_settings.xml index 3984095a65..3984095a65 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml index 350254e385..350254e385 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml index 6b6126c8e0..e6a70a7724 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml @@ -12,15 +12,20 @@ <string name="OutboxInitializing"> 正在初始化… </string> - <panel label=""> - <panel> + <panel label="" name="panel_1"> + <panel name="panel_2"> <panel name="outbox_inventory_placeholder_panel"> <text name="outbox_inventory_placeholder_title"> - 載入中... + 載入中… </text> </panel> </panel> - <panel> + <panel name="panel_3"> + <panel name="outbox_generic_drag_target"> + <text name="text_1"> + 把物項拖曳到這裡，可建立資料夾 + </text> + </panel> <button label="送往第二人生購物市集" name="outbox_import_btn" tool_tip="推到我第二人生購物市集的店面"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml index 22b3d3b065..817b1af88d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml @@ -55,6 +55,9 @@ <string name="mesh_status_invalid_material_list"> 細節層次材料並非參考模型的子集合。 </string> + <string name="phys_status_vertex_limit_exceeded"> + 有些具體殼面超出頂點限制。 + </string> <string name="layer_all"> 全部 </string> @@ -93,52 +96,52 @@ <text initial_value="頂點" name="vertices" value="頂點"/> <text initial_value="高" name="high_label" value="高"/> <combo_box name="lod_source_high"> - <item name="Load from file" value="從檔案載入"/> - <item name="Generate" value="產生"/> + <item label="從檔案載入" name="Load from file" value="從檔案載入"/> + <item label="產生" name="Generate" value="產生"/> </combo_box> <button label="瀏覽…" name="lod_browse_high"/> <combo_box name="lod_mode_high"> - <item name="Triangle Limit" value="三角形上限"/> - <item name="Error Threshold" value="錯誤門檻"/> + <item label="三角形上限" name="Triangle Limit" value="三角形上限"/> + <item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/> </combo_box> <text initial_value="0" name="high_triangles" value="0"/> <text initial_value="0" name="high_vertices" value="0"/> <text initial_value="中" name="medium_label" value="中"/> <combo_box name="lod_source_medium"> - <item name="Load from file" value="從檔案載入"/> - <item name="Generate" value="產生"/> - <item name="Use LoD above" value="以上使用低階細節"/> + <item label="從檔案載入" name="Load from file" value="從檔案載入"/> + <item label="產生" name="Generate" value="產生"/> + <item label="以上使用低階細節" name="Use LoD above" value="以上使用低階細節"/> </combo_box> <button label="瀏覽…" name="lod_browse_medium"/> <combo_box name="lod_mode_medium"> - <item name="Triangle Limit" value="三角形上限"/> - <item name="Error Threshold" value="錯誤門檻"/> + <item label="三角形上限" name="Triangle Limit" value="三角形上限"/> + <item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/> </combo_box> <text initial_value="0" name="medium_triangles" value="0"/> <text initial_value="0" name="medium_vertices" value="0"/> <text initial_value="低" name="low_label" value="低"/> <combo_box name="lod_source_low"> - <item name="Load from file" value="從檔案載入"/> - <item name="Generate" value="產生"/> - <item name="Use LoD above" value="以上使用低階細節"/> + <item label="從檔案載入" name="Load from file" value="從檔案載入"/> + <item label="產生" name="Generate" value="產生"/> + <item label="以上使用低階細節" name="Use LoD above" value="以上使用低階細節"/> </combo_box> <button label="瀏覽…" name="lod_browse_low"/> <combo_box name="lod_mode_low"> - <item name="Triangle Limit" value="三角形上限"/> - <item name="Error Threshold" value="錯誤門檻"/> + <item label="三角形上限" name="Triangle Limit" value="三角形上限"/> + <item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/> </combo_box> <text initial_value="0" name="low_triangles" value="0"/> <text initial_value="0" name="low_vertices" value="0"/> <text initial_value="最低" name="lowest_label" value="最低"/> <combo_box name="lod_source_lowest"> - <item name="Load from file" value="從檔案載入"/> - <item name="Generate" value="產生"/> - <item name="Use LoD above" value="以上使用低階細節"/> + <item label="從檔案載入" name="Load from file" value="從檔案載入"/> + <item label="產生" name="Generate" value="產生"/> + <item label="以上使用低階細節" name="Use LoD above" value="以上使用低階細節"/> </combo_box> <button label="瀏覽…" name="lod_browse_lowest"/> <combo_box name="lod_mode_lowest"> - <item name="Triangle Limit" value="三角形上限"/> - <item name="Error Threshold" value="錯誤門檻"/> + <item label="三角形上限" name="Triangle Limit" value="三角形上限"/> + <item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/> </combo_box> <text initial_value="0" name="lowest_triangles" value="0"/> <text initial_value="0" name="lowest_vertices" value="0"/> diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml index 0b267e8fae..0b267e8fae 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_moveview.xml +++ b/indra/newview/skins/default/xui/zh/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml index 64998d3e28..64998d3e28 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml index 217ea5d1f9..217ea5d1f9 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml index 187597f4eb..187597f4eb 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/floater_notification.xml b/indra/newview/skins/default/xui/zh/floater_notification.xml index 1e0e207fb0..1e0e207fb0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_notification.xml +++ b/indra/newview/skins/default/xui/zh/floater_notification.xml diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml index 3478761b0b..3478761b0b 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml new file mode 100644 index 0000000000..d1b89a4267 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_notifications_tabbed" title="通知"> + <floater.string name="system_tab_title"> + 系統：([COUNT]) + </floater.string> + <floater.string name="transactions_tab_title"> + 交易：([COUNT]) + </floater.string> + <floater.string name="group_invitations_tab_title"> + 邀請：([COUNT]) + </floater.string> + <floater.string name="group_notices_tab_title"> + 群組：([COUNT]) + </floater.string> + <string name="title_notification_tabbed_window"> + 通知 + </string> + <layout_stack name="TabButtonsStack"> + <layout_panel name="TabButtonsLayoutPanel"> + <tab_container name="notifications_tab_container"> + <panel label="系統 (0)" name="system_notification_list_tab"/> + <panel label="交易 (0)" name="transaction_notifications_tab"/> + <panel label="邀請 (0)" name="group_invite_notifications_tab"/> + <panel label="群組 (0)" name="group_notice_notifications_tab"/> + </tab_container> + <layout_stack name="ButtonsStack"> + <layout_panel name="CondenseAllButtonPanel"> + <button label="全部摺疊" name="collapse_all_button"/> + </layout_panel> + <layout_panel name="GapLayoutPanel"> + <panel label="空隙欄" name="GapPanel"/> + </layout_panel> + <layout_panel name="DeleteAllButtonPanel"> + <button label="全部刪除" name="delete_all_button"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_object_weights.xml b/indra/newview/skins/default/xui/zh/floater_object_weights.xml index d2875b24b4..d2875b24b4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/zh/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml index 29140eceb9..29140eceb9 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_openobject.xml +++ b/indra/newview/skins/default/xui/zh/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml index 9e786edcdd..9e786edcdd 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml index e57374f4d7..e57374f4d7 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml index e6971d111f..e04166c589 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml @@ -27,7 +27,7 @@ <floater.string name="character_owner_group"> [group] </floater.string> - <panel> + <panel name="pathfinding_chars_main"> <scroll_list name="objects_scroll_list"> <scroll_list.columns label="名稱" name="name"/> <scroll_list.columns label="描述" name="description"/> @@ -42,7 +42,7 @@ <button label="全選" name="select_all_objects"/> <button label="全都不選" name="select_none_objects"/> </panel> - <panel> + <panel name="pathfinding_chars_actions"> <text name="actions_label"> 所選角色所採動作： </text> diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml index be009b54d8..7cd1094a05 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml @@ -66,6 +66,16 @@ <floater.string name="pathing_error"> 產生路徑時出錯。 </floater.string> + <panel name="pathfinding_console_main"> + <text name="viewer_status_label"> + 瀏覽器狀態 + </text> + </panel> + <panel name="pathfinding_console_simulator"> + <text name="simulator_status_label"> + 模擬器狀態 + </text> + </panel> <tab_container name="view_test_tab_container"> <panel label="視角" name="view_panel"> <text name="show_label"> diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml index 22e5d2e846..71278b7ce6 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml @@ -90,7 +90,16 @@ <floater.string name="linkset_choose_use"> 選擇聯結集的使用… </floater.string> - <panel> + <panel name="pathfinding_linksets_main"> + <text name="linksets_filter_label"> + 過濾方式： + </text> + <text name="linksets_name_label"> + 名稱 + </text> + <text name="linksets_desc_label"> + 描述 + </text> <combo_box name="filter_by_linkset_use"> <combo_box.item label="按聯結集的使用來過濾…" name="filter_by_linkset_use_none"/> <combo_box.item label="可行走的" name="filter_by_linkset_use_walkable"/> @@ -122,7 +131,10 @@ <button label="全選" name="select_all_objects"/> <button label="全都不選" name="select_none_objects"/> </panel> - <panel> + <panel name="pathfinding_linksets_actions"> + <text name="linksets_actions_label"> + 對所選聯結集採取的動作（如果連結集從虛擬世界移除，其屬性恐會遺失）： + </text> <check_box label="顯示指標" name="show_beacon"/> <button label="取得" name="take_objects"/> <button label="拿取副本" name="take_copy_objects"/> @@ -130,7 +142,10 @@ <button label="退回" name="return_objects"/> <button label="刪除" name="delete_objects"/> </panel> - <panel> + <panel name="pathfinding_linksets_attributes"> + <text name="linksets_attributes_label"> + 編輯所選聯結集的屬性，並按按鈕啟用變更 + </text> <text name="walkability_coefficients_label"> 可行走性： </text> diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml index 026ead9574..026ead9574 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_pay.xml +++ b/indra/newview/skins/default/xui/zh/floater_pay.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml index c32243a115..c32243a115 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/zh/floater_people.xml b/indra/newview/skins/default/xui/zh/floater_people.xml index f629f2f184..f629f2f184 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_people.xml +++ b/indra/newview/skins/default/xui/zh/floater_people.xml diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml index b38db59ff3..b38db59ff3 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/zh/floater_perms_default.xml b/indra/newview/skins/default/xui/zh/floater_perms_default.xml index 78696be482..d4706d8d87 100644 --- a/indra/newview/skins/default/xui/zh/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/zh/floater_perms_default.xml @@ -1,6 +1,43 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="perms default" title="預設的創建權限"> - <panel label="預設的權限" name="default permissions"/> + <panel label="預設的權限" name="default permissions"> + <text name="label_1"> + 下一個所有人： + </text> + <text name="label_2"> + 複製 + </text> + <text name="label_3"> + 修改 + </text> + <text name="label_4"> + 轉移 + </text> + <text name="label_5"> + 與群組分享 + </text> + <text name="label_6"> + 允許任何人覆製 + </text> + <text name="label_7" tool_tip="設定預設權限決定何時建立物件"> + 物件 + </text> + <text name="label_8" tool_tip="設定已上傳物項的預設權限"> + 上傳內容 + </text> + <text name="label_9" tool_tip="設定預設權限決定何時建立腳本"> + 腳本 + </text> + <text name="label_10" tool_tip="設定預設權限決定何時建立記事卡"> + 記事卡 + </text> + <text name="label_11" tool_tip="設定預設權限決定何時建立姿勢"> + 姿勢 + </text> + <text name="label_12" tool_tip="設定預設權限決定何時建立服裝或身體部位"> + 可穿裝扮 + </text> + </panel> <button label="確定" label_selected="確定" name="ok"/> <button label="取消" label_selected="取消" name="cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_picks.xml b/indra/newview/skins/default/xui/zh/floater_picks.xml index a8bfcd99e3..a8bfcd99e3 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_picks.xml +++ b/indra/newview/skins/default/xui/zh/floater_picks.xml diff --git a/indra/newview/skins/default/xui/zh/floater_places.xml b/indra/newview/skins/default/xui/zh/floater_places.xml index f6ef1e2141..f6ef1e2141 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_places.xml +++ b/indra/newview/skins/default/xui/zh/floater_places.xml diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml index 2908f7c1d0..2908f7c1d0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_post_process.xml +++ b/indra/newview/skins/default/xui/zh/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml index b0a27e8c1f..b0a27e8c1f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preferences.xml +++ b/indra/newview/skins/default/xui/zh/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml new file mode 100644 index 0000000000..f9c2fe47e7 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="prefs_graphics_advanced" title="進階顯像偏好設定"> + <text name="GeneralText"> + 一般 + </text> + <slider label="描繪距離：" name="DrawDistance"/> + <text name="DrawDistanceMeterText2"> + 公尺 + </text> + <slider label="最大粒子效果數量：" name="MaxParticleCount"/> + <slider label="後處理品質：" name="RenderPostProcess"/> + <text name="PostProcessText"> + 低 + </text> + <text name="AvatarText"> + 化身 + </text> + <slider label="最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈像為「單色軟糖娃娃」"/> + <text name="IndirectMaxComplexityText"> + 0 + </text> + <slider label="非假冒化身數目上限：" name="IndirectMaxNonImpostors"/> + <text name="IndirectMaxNonImpostorsText"> + 0 + </text> + <slider label="細節：" name="AvatarMeshDetail"/> + <text name="AvatarMeshDetailText"> + 低 + </text> + <slider label="身體物理：" name="AvatarPhysicsDetail"/> + <text name="AvatarPhysicsDetailText"> + 低 + </text> + <text name="ShadersText"> + 硬體 + </text> + <slider label="材質記憶體（MB）：" name="GraphicsCardTextureMemory" tool_tip="配置給材質使用的記憶體量。 預設為顯像卡記憶體。 降低此值可以提升效能，但材質也會變模糊。"/> + <slider label="霧距離比率：" name="fog"/> + <slider label="伽瑪值：" name="gamma"/> + <text name="(brightness, lower is brighter)"> + （0 = 預設亮度；值越小 = 亮度越高） + </text> + <check_box label="各向異性過濾（若啟用會變慢）" name="ani"/> + <check_box initial_value="true" label="啟用 OpenGL 頂點緩衝物件(VBO)" name="vbo" tool_tip="在較新硬體上啟用，可提升效能。 但是，較舊硬體的 VBO 實作不佳，若啟用可能導致當機。"/> + <check_box initial_value="true" label="啟用材質壓縮（須重新啟動）" name="texture compression" tool_tip="在影片記憶體中壓縮材質，讓高解析度材質可以載入，但色彩品質稍差。"/> + <text name="antialiasing label"> + 消除鋸齒： + </text> + <combo_box label="消除鋸齒" name="fsaa"> + <combo_box.item label="已停用" name="FSAADisabled"/> + <combo_box.item label="2x" name="2x"/> + <combo_box.item label="4x" name="4x"/> + <combo_box.item label="8x" name="8x"/> + <combo_box.item label="16x" name="16x"/> + </combo_box> + <text name="antialiasing restart"> + （須重新啟動） + </text> + <slider label="地形網面細節：" name="TerrainMeshDetail"/> + <text name="TerrainMeshDetailText"> + 低 + </text> + <slider label="樹木：" name="TreeMeshDetail"/> + <text name="TreeMeshDetailText"> + 低 + </text> + <slider label="物件：" name="ObjectMeshDetail"/> + <text name="ObjectMeshDetailText"> + 低 + </text> + <slider label="彈性幾何元件：" name="FlexibleMeshDetail"/> + <text name="FlexibleMeshDetailText"> + 低 + </text> + <check_box initial_value="true" label="清澈透明的水" name="TransparentWater"/> + <check_box initial_value="true" label="凹凸映射與光澤效果" name="BumpShiny"/> + <check_box initial_value="true" label="本地光線" name="LocalLights"/> + <check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/> + <slider label="地形細節：" name="TerrainDetail"/> + <text name="TerrainDetailText"> + 低 + </text> + <check_box initial_value="true" label="硬體化身換膚" name="AvatarVertexProgram"/> + <check_box initial_value="true" label="化身衣服" name="AvatarCloth"/> + <text name="ReflectionsText"> + 水文反射： + </text> + <combo_box name="Reflections"> + <combo_box.item label="最小" name="0"/> + <combo_box.item label="地形與樹木" name="1"/> + <combo_box.item label="全部靜態物件" name="2"/> + <combo_box.item label="全部化身與物件" name="3"/> + <combo_box.item label="一切" name="4"/> + </combo_box> + <check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/> + <slider label="天空：" name="SkyMeshDetail"/> + <text name="SkyMeshDetailText"> + 低 + </text> + <check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/> + <check_box initial_value="true" label="環境光遮蔽" name="UseSSAO"/> + <check_box initial_value="true" label="景深" name="UseDoF"/> + <text name="RenderShadowDetailText"> + 陰影： + </text> + <combo_box name="ShadowDetail"> + <combo_box.item label="無" name="0"/> + <combo_box.item label="日 / 月" name="1"/> + <combo_box.item label="日 / 月 + 投影物" name="2"/> + </combo_box> + <button label="重設為我們建議的設定" name="Defaults"/> + <button label="確定" label_selected="確定" name="OK"/> + <button label="取消" label_selected="取消" name="Cancel"/> + <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml index f91d5c5cdb..f91d5c5cdb 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml index b94d67b7ef..b94d67b7ef 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml index be75038a09..be75038a09 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml index 9447939801..9447939801 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml index d04428a36d..d04428a36d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml index c56b1c2987..c56b1c2987 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml index 078b490655..078b490655 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml index b810af0145..b810af0145 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml index 4ff2a3fc79..4ff2a3fc79 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/zh/floater_region_info.xml b/indra/newview/skins/default/xui/zh/floater_region_info.xml index 0e4879f555..0e4879f555 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_region_info.xml +++ b/indra/newview/skins/default/xui/zh/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml index 347b40e675..347b40e675 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml new file mode 100644 index 0000000000..6a3c95940c --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Save Pref Preset" title="儲存偏好預設"> + <string name="title_graphic"> + 儲存顯示預設 + </string> + <string name="title_camera"> + 儲存攝影機預設 + </string> + <text name="Preset"> + 輸入預設名稱，或選擇一組現有預設。 + </text> + <button label="儲存" name="save"/> + <button label="取消" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml index 5b3500c018..5b3500c018 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_limits.xml b/indra/newview/skins/default/xui/zh/floater_script_limits.xml index 7cd2c8e6c6..7cd2c8e6c6 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml index a6c6c76181..a6c6c76181 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml index 7c253aa74c..7c253aa74c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml index 11c23d933f..11c23d933f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_search.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml index 3e85a529ae..3e85a529ae 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_search.xml +++ b/indra/newview/skins/default/xui/zh/floater_search.xml diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml index 231eb48b04..231eb48b04 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_select_key.xml +++ b/indra/newview/skins/default/xui/zh/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml index 9030f7eb63..9030f7eb63 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml index 56a31bc292..56a31bc292 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml index 4090248083..4090248083 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml index 0374c74f8f..0374c74f8f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml index c942ba1cfb..c942ba1cfb 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml index f5a6665844..f5a6665844 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml index 6094a3bbce..bb4ebcdf21 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml @@ -1,6 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="spellcheck_import" title="匯入字典"> + <text name="import_dict"> + 字典： + </text> <button label="瀏覽" label_selected="瀏覽" name="dictionary_path_browse"/> + <text name="import_name"> + 名稱： + </text> + <text name="import_lang"> + 語言： + </text> <button label="匯入" name="ok_btn"/> <button label="取消" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml index f06eb5e78f..f06eb5e78f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_stats.xml +++ b/indra/newview/skins/default/xui/zh/floater_stats.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sys_well.xml b/indra/newview/skins/default/xui/zh/floater_sys_well.xml index ca0b7f146d..ca0b7f146d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/zh/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/zh/floater_telehub.xml b/indra/newview/skins/default/xui/zh/floater_telehub.xml index ee21a78e90..ee21a78e90 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_telehub.xml +++ b/indra/newview/skins/default/xui/zh/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml index 68fcf3f7f7..68fcf3f7f7 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml index 83b6df6fe5..83b6df6fe5 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml index 02d06323d4..02d06323d4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml index 0dcac17a75..0dcac17a75 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml index 175e2bf7a4..175e2bf7a4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_tools.xml +++ b/indra/newview/skins/default/xui/zh/floater_tools.xml diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml index 58530f00c1..58530f00c1 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml index 3da9445a55..c86cc3057d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_tos.xml +++ b/indra/newview/skins/default/xui/zh/floater_tos.xml @@ -12,4 +12,7 @@ <text name="tos_heading"> 請仔細閱讀以下服務條款及隱私政策。 繼續登入 [SECOND_LIFE] 前，你必須同意條款。 </text> + <text name="external_tos_required"> + 你需先登入 my.secondlife.com 同意服務條款，才可繼續。 謝謝你！ + </text> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_toybox.xml b/indra/newview/skins/default/xui/zh/floater_toybox.xml index fc6b6ea611..fc6b6ea611 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_toybox.xml +++ b/indra/newview/skins/default/xui/zh/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml index fe84872557..fe84872557 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml index 9e3f3cd47d..9e3f3cd47d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml index a3a7679957..a3a7679957 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml index aab5fa6028..aab5fa6028 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml index be6bf8bb27..be6bf8bb27 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_web_content.xml +++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml index 967e36ead7..967e36ead7 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml index 3942f72d76..3942f72d76 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_window_size.xml +++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml index 4cd05ebaa0..4cd05ebaa0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_world_map.xml +++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_avatar.xml b/indra/newview/skins/default/xui/zh/inspect_avatar.xml index ef10e5d2d0..ef10e5d2d0 100755..100644 --- a/indra/newview/skins/default/xui/zh/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/zh/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml index ca5ccc3349..ca5ccc3349 100755..100644 --- a/indra/newview/skins/default/xui/zh/inspect_group.xml +++ b/indra/newview/skins/default/xui/zh/inspect_group.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_object.xml b/indra/newview/skins/default/xui/zh/inspect_object.xml index 377b8b7c78..377b8b7c78 100755..100644 --- a/indra/newview/skins/default/xui/zh/inspect_object.xml +++ b/indra/newview/skins/default/xui/zh/inspect_object.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml index b8418fc8a1..b8418fc8a1 100755..100644 --- a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml index 3c8c3e4a31..3c8c3e4a31 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml index 41b3409627..ace1302250 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml @@ -15,5 +15,8 @@ <menu_item_call label="放大" name="Zoom In"/> <menu_item_call label="支付" name="Pay..."/> <menu_item_call label="物件檔案" name="Object Inspect"/> + <menu_item_check label="正常呈像" name="RenderNormally"/> + <menu_item_check label="不要呈像" name="DoNotRender"/> + <menu_item_check label="完全呈像" name="AlwaysRenderFully"/> <menu_item_call label="封鎖粒子所有人" name="Mute Particle"/> </context_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml index d9e6eff897..d9e6eff897 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml index cefb395256..cefb395256 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml index dc035bafa0..0e0d1cc3d2 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml @@ -14,5 +14,8 @@ <menu_item_call label="傾印 XML" name="Dump XML"/> <menu_item_call label="放大" name="Zoom In"/> <menu_item_call label="支付" name="Pay..."/> + <menu_item_check label="正常呈像" name="RenderNormally"/> + <menu_item_check label="不要呈像" name="DoNotRender"/> + <menu_item_check label="完全呈像" name="AlwaysRenderFully"/> <menu_item_call label="封鎖粒子所有人" name="Mute Particle"/> </context_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml index a644a45df6..a644a45df6 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml index 876fef16df..876fef16df 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml index d06207b19d..d06207b19d 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml index 300ff47b12..300ff47b12 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml index eb7093a23c..eb7093a23c 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml index bda640e5f3..bda640e5f3 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_edit.xml +++ b/indra/newview/skins/default/xui/zh/menu_edit.xml diff --git a/indra/newview/skins/default/xui/zh/menu_favorites.xml b/indra/newview/skins/default/xui/zh/menu_favorites.xml index a01412ce1c..a01412ce1c 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_favorites.xml +++ b/indra/newview/skins/default/xui/zh/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml index 5a38197e4c..5a38197e4c 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml index d4a5a69104..d4a5a69104 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/zh/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml index 3f6820cb32..3f6820cb32 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml index 85417d554e..85417d554e 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml index 4664fcb027..4664fcb027 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml index 636bdaae09..636bdaae09 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml index f4e886ff67..f4e886ff67 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml index abff0f64ac..abff0f64ac 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml index c48ee0c9be..c48ee0c9be 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml index 577e5988f8..577e5988f8 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml index b346e82b77..b346e82b77 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inventory.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml index 30bf5a7e75..30bf5a7e75 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml index a4461f8c6a..a4461f8c6a 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/zh/menu_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml index 3ad9c0ab31..3ad9c0ab31 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_land.xml +++ b/indra/newview/skins/default/xui/zh/menu_land.xml diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml index 7372b223cf..7372b223cf 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_landmark.xml +++ b/indra/newview/skins/default/xui/zh/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml index 4a1e2f4364..7ef9240e83 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_login.xml +++ b/indra/newview/skins/default/xui/zh/menu_login.xml @@ -15,6 +15,7 @@ <menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/> <menu_item_call label="回報錯誤" name="Report Bug"/> <menu_item_call label="關於 [APP_NAME]" name="About Second Life"/> + <menu_item_call label="查詢是否有新版" name="Check for Updates"/> </menu> <menu_item_check label="顯示除錯選單" name="Show Debug Menu"/> <menu label="除錯" name="Debug"> diff --git a/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml b/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml index 5396b2a866..a2f520d6ed 100644 --- a/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="menu_marketplace_sort"> + <menu_item_check label="依名稱排序" name="sort_by_name"/> + <menu_item_check label="依最近時間排序" name="sort_by_recent"/> <menu_item_check label="按存量排序（由少到多）" name="sort_by_stock_amount"/> <menu_item_check label="只顯示刊登資料夾" name="show_only_listing_folders"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml index d222d7f658..d222d7f658 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_mini_map.xml b/indra/newview/skins/default/xui/zh/menu_mini_map.xml index 7fd629471a..7fd629471a 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/zh/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml index 5f82685632..5f82685632 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/zh/menu_navbar.xml b/indra/newview/skins/default/xui/zh/menu_navbar.xml index d8356e6277..d8356e6277 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_navbar.xml +++ b/indra/newview/skins/default/xui/zh/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml index ce5f5b6e17..ce5f5b6e17 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml index b629f73584..b629f73584 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml index 4e4e55e6f4..4e4e55e6f4 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_object.xml +++ b/indra/newview/skins/default/xui/zh/menu_object.xml diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml index 9655732f2e..9655732f2e 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml index 258d0d6b20..258d0d6b20 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml index a4614710f4..a4614710f4 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml index 2456e9fee9..2456e9fee9 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml index 59854faeec..59854faeec 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml index b4b566f5ca..b4b566f5ca 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml index 1be5c69b94..1be5c69b94 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml index d25adaf8fb..d25adaf8fb 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml index 69f0eab7dc..69f0eab7dc 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml index 6cb0ac3c89..6cb0ac3c89 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml index 5b6e7335d6..5b6e7335d6 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_picks.xml b/indra/newview/skins/default/xui/zh/menu_picks.xml index 2e88ac2d39..2e88ac2d39 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_picks.xml +++ b/indra/newview/skins/default/xui/zh/menu_picks.xml diff --git a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml index 80922a757d..80922a757d 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml index 3733baf119..3733baf119 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_place.xml +++ b/indra/newview/skins/default/xui/zh/menu_place.xml diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml index 95f8917234..95f8917234 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml index 27f0c7ebdb..27f0c7ebdb 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml index f23d970b78..f23d970b78 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml index f77e7090c4..f77e7090c4 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml index 53ee6ee977..53ee6ee977 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml index e9817dd2bc..e9817dd2bc 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/zh/menu_slurl.xml b/indra/newview/skins/default/xui/zh/menu_slurl.xml index 2cea18105a..2cea18105a 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_slurl.xml +++ b/indra/newview/skins/default/xui/zh/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml index d188840588..d188840588 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml index bf60983896..bf60983896 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml index 90e8098348..90e8098348 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/zh/menu_text_editor.xml b/indra/newview/skins/default/xui/zh/menu_text_editor.xml index febc0b8b67..febc0b8b67 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/zh/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/zh/menu_toolbars.xml b/indra/newview/skins/default/xui/zh/menu_toolbars.xml index d318992dd5..d318992dd5 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/zh/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml index b07e9890ff..b07e9890ff 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml index 752634dc6b..752634dc6b 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_email.xml b/indra/newview/skins/default/xui/zh/menu_url_email.xml new file mode 100644 index 0000000000..9db99a2b6d --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_url_email.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Email Popup"> + <menu_item_call label="用外部客戶程式編纂電郵" name="email_open_external"/> + <menu_item_call label="複製電郵到剪貼簿" name="email_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml index de97bb731f..de97bb731f 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_group.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_http.xml b/indra/newview/skins/default/xui/zh/menu_url_http.xml index 861cbfb975..861cbfb975 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_http.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml index 8eaea68c6f..8eaea68c6f 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_map.xml b/indra/newview/skins/default/xui/zh/menu_url_map.xml index fbda20fd2f..fbda20fd2f 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_map.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml index ac366f92ef..ac366f92ef 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml index 330c28238f..330c28238f 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml index 6ce9a10d3e..6ce9a10d3e 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml index 2fb247f250..2fb247f250 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml index e3e4b4716d..e3e4b4716d 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index 9572ad49d3..41590d60c7 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -178,6 +178,7 @@ <menu_item_call label="回報臭蟲" name="Report Bug"/> <menu_item_call label="碰撞、推擠與打擊" name="Bumps, Pushes &amp; Hits"/> <menu_item_call label="關於 [APP_NAME]" name="About Second Life"/> + <menu_item_call label="查詢是否有新版" name="Check for Updates"/> </menu> <menu label="進階" name="Advanced"> <menu_item_call label="重新產出材質" name="Rebake Texture"/> @@ -191,7 +192,7 @@ <menu_item_call label="Lag 測量器" name="Lag Meter"/> <menu_item_check label="統計列" name="Statistics Bar"/> <menu_item_call label="場景負載統計資料" name="Scene Load Statistics"/> - <menu_item_check label="顯示化身的繪製重量" name="Avatar Rendering Cost"/> + <menu_item_check label="顯示化身複雜度資訊" name="Avatar Draw Info"/> </menu> <menu label="高亮顯示與可見度" name="Highlighting and Visibility"> <menu_item_check label="Cheesy 指標" name="Cheesy Beacon"/> @@ -314,8 +315,6 @@ <menu_item_check label="接點" name="Joints"/> <menu_item_check label="光線投射" name="Raycast"/> <menu_item_check label="風力向量" name="Wind Vectors"/> - <menu_item_check label="繪出複雜度" name="rendercomplexity"/> - <menu_item_check label="附件位元組" name="attachment bytes"/> <menu_item_check label="雕刻" name="Sculpt"/> <menu label="材質密度" name="Texture Density"> <menu_item_check label="無" name="None"/> @@ -421,13 +420,11 @@ <menu_item_check label="除錯字元可見性" name="Debug Character Vis"/> <menu_item_check label="顯示碰撞骨架" name="Show Collision Skeleton"/> <menu_item_check label="顯示用戶目標" name="Display Agent Target"/> - --> <menu_item_call label="傾印附件" name="Dump Attachments"/> <menu_item_call label="除錯化身材質" name="Debug Avatar Textures"/> <menu_item_call label="傾印本地材質" name="Dump Local Textures"/> </menu> <menu_item_check label="HTTP 材質" name="HTTP Textures"/> - <menu_item_check label="HTTP 收納區" name="HTTP Inventory"/> <menu_item_call label="壓縮圖像" name="Compress Images"/> <menu_item_call label="啟用記憶體洩漏視覺偵測器" name="Enable Visual Leak Detector"/> <menu_item_check label="輸出除錯小型傾印" name="Output Debug Minidump"/> diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml index 576f7f3b73..576f7f3b73 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml index 6184f956d1..6184f956d1 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml index c7d2853995..c7d2853995 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml index 8967475abb..8967475abb 100755..100644 --- a/indra/newview/skins/default/xui/zh/mime_types.xml +++ b/indra/newview/skins/default/xui/zh/mime_types.xml diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml index 8967475abb..8967475abb 100755..100644 --- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml index 8967475abb..8967475abb 100755..100644 --- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 371f5d9b39..3f08496a68 100755..100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -164,6 +164,10 @@ '[ERROR_CODE]' <usetemplate name="okbutton" yestext="確定"/> </notification> + <notification name="MerchantForceValidateListing"> + 為能建立你的刊登內容，我們修正了你刊登內容的層級架構。 + <usetemplate ignoretext="如果建立新的刊登時會修動內容物的層級架構，給我提醒" name="okignore" yestext="確定"/> + </notification> <notification name="ConfirmMerchantActiveChange"> 這個動作會改變此刊登的內容。 你確定要繼續嗎？ <usetemplate ignoretext="在我變更 Marketplace 的一項刊登內容之前，先跟我確認" name="okcancelignore" notext="取消" yestext="確定"/> @@ -211,11 +215,9 @@ 因為存量爲零，我們已經把你的刊登物下架。 你若希望重新刊登，必須先增加存量。 <usetemplate ignoretext="限量資料夾如果成空、導致刊登物下架，告知我" name="okignore" yestext="確定"/> </notification> - <notification name="CompileQueueSaveText"> - 上傳腳本文字時出問題，原因：[REASON]。 請稍候再試一次。 - </notification> - <notification name="CompileQueueSaveBytecode"> - 上傳已編譯腳本時出問題，原因：[REASON]。 請稍候再試一次。 + <notification name="AlertMerchantVersionFolderEmpty"> + 因為版本資料夾是空的，我們已經把你的刊登物下架。 你若希望重新刊登，必須先新增物項到該版本資料夾。 + <usetemplate ignoretext="版本資料夾如果成空、導致刊登物下架，告知我" name="okignore" yestext="確定"/> </notification> <notification name="WriteAnimationFail"> 寫入動作資料時出錯。 請稍候再試一次。 @@ -320,6 +322,14 @@ 你即將把 [COUNT] 個人踢出群組。 <usetemplate ignoretext="確定將多人踢出群組" name="okcancelignore" notext="取消" yestext="踢出"/> </notification> + <notification name="BanGroupMemberWarning"> + 你即將禁止[AVATAR_NAME]留在群組。 + <usetemplate ignoretext="確定禁止某人留在群組" name="okcancelignore" notext="取消" yestext="禁止"/> + </notification> + <notification name="BanGroupMembersWarning"> + 你即將禁止[COUNT]個人留在群組。 + <usetemplate ignoretext="確定要禁止多名成員續留此群組" name="okcancelignore" notext="取消" yestext="禁止"/> + </notification> <notification name="AttachmentDrop"> 你即將卸除你的附件。 你確定你要繼續？ @@ -404,7 +414,7 @@ <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> </notification> <notification name="ReturnAllTopObjects"> - 你確定要將所列的所有物件送返其所有人的收納區？ + 你確定要將所列的所有物件送返其所有人的收納區？ 這將送回這個地區全部的腳本物件！ <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> </notification> <notification name="DisableAllTopObjects"> @@ -587,16 +597,10 @@ （*警告* 這動作無法還原。） <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> </notification> - <notification name="SaveScriptFailReason"> - 儲存腳本時出問題，原因：[REASON]。 請稍後再嘗試儲存腳本。 - </notification> <notification name="SaveScriptFailObjectNotFound"> 無法儲存腳本，找不到它所屬的物件。 該物件可能超出範圍或已被刪除。 </notification> - <notification name="SaveBytecodeFailReason"> - 儲存編譯腳本時出問題，原因：[REASON]。 請稍後再嘗試儲存腳本。 - </notification> <notification name="StartRegionEmpty"> 你的起始地區尚未定義。 請在「開始位置」框裡輸入區域名，或選擇「我上一次位置」或「我的家」作為開始位置。 @@ -609,6 +613,10 @@ <notification name="CannotDownloadFile"> 無法下載檔案 </notification> + <notification label="" name="MediaFileDownloadUnsupported"> + 你要求下載檔案，在 [SECOND_LIFE] 裡未支援這動作。 + <usetemplate ignoretext="如果下載的檔案不受支援，給我提醒" name="okignore" yestext="確定"/> + </notification> <notification name="CannotWriteFile"> 無法寫入檔案 [[FILE]] </notification> @@ -1108,8 +1116,9 @@ 這異常狀況通常只是暫時的。 請稍待幾分鐘後，再自訂並儲存可穿裝扮。 </notification> <notification name="YouHaveBeenLoggedOut"> - 糟糕！ 你已被登出 [SECOND_LIFE] - [MESSAGE] + 糟糕！ 你已被登出 [SECOND_LIFE]。 + +[MESSAGE] <usetemplate name="okcancelbuttons" notext="結束退出" yestext="察看 IM 和聊天內容"/> </notification> <notification name="OnlyOfficerCanBuyLand"> @@ -1350,6 +1359,13 @@ <ignore name="ignore" text="服裝花太多時間下載"/> </form> </notification> + <notification name="RegionAndAgentComplexity"> + 你的[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 視覺複雜度]是[AGENT_COMPLEXITY]。 +[OVERLIMIT_MSG] + </notification> + <notification name="AgentComplexity"> + 你的[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 視覺複雜度]是[AGENT_COMPLEXITY]。 + </notification> <notification name="FirstRun"> [APP_NAME] 安裝完成。 @@ -1626,6 +1642,25 @@ SHA1 指紋：[MD5_DIGEST] 參見[[INFO_URL] 介紹此更新版的資訊] <usetemplate name="okbutton" yestext="確定"/> </notification> + <notification name="UpdateDownloadInProgress"> + 有更新版本！ +正在背景下載中，一完成下載我們會通知你重啟瀏覽器以便安裝。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="UpdateDownloadComplete"> + 一個更新版本已經下載完畢。 重啟時將會安裝。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="UpdateCheckError"> + 查詢是否有更新時出錯。 +請稍候再試一次。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="UpdateViewerUpToDate"> + 你的瀏覽器已是最新版！ +如果你急欲試用最新的功能和修補，請光臨「替代瀏覽器」網頁：http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> <notification name="DeedObjectToGroup"> 讓渡此物件將可讓這個群組： * 收取付給此物件的 L$ @@ -1730,6 +1765,13 @@ SHA1 指紋：[MD5_DIGEST] 你已達可同時加入的群組數上限。 請先離開某些群組再加入或新建新群組。 <usetemplate name="okbutton" yestext="確定"/> </notification> + <notification name="GroupLimitInfo"> + 基本帳戶的群組限制是[MAX_BASIC]，[https://secondlife.com/premium/ 付費]帳戶則是[MAX_PREMIUM]。 +如果你把帳戶降級，你必須先低於[MAX_BASIC]的群組限制，才可再加入更多群組。 + +[https://secondlife.com/my/account/membership.php 現在就升級！] + <usetemplate name="okbutton" yestext="關閉"/> + </notification> <notification name="KickUser"> 踢出這個居民並留給他什麼訊息？ <form name="form"> @@ -1930,7 +1972,7 @@ SHA1 指紋：[MD5_DIGEST] <usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/> </notification> <notification label="選擇領地" name="EstateTrustedExperienceRemove"> - 僅針對這個領地或針對 [ALL_ESTATES] 將它從金鑰清單中移除？ + 僅針對這個領地，還是針對 [ALL_ESTATES] 將它從金鑰清單中移除？ <usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/> </notification> <notification label="確認踢出" name="EstateKickUser"> @@ -2239,6 +2281,10 @@ SHA1 指紋：[MD5_DIGEST] 確認你真要支付 L$[AMOUNT] 給 [TARGET]。 <usetemplate ignoretext="付款前跟我確認（超過 L$200 的總額）" name="okcancelignore" notext="取消" yestext="支付"/> </notification> + <notification name="PayObjectFailed"> + 付款失敗：找不到物件。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> <notification name="OpenObjectCannotCopy"> 這物件中沒有任何准許你複製的物項。 </notification> @@ -2270,10 +2316,9 @@ SHA1 指紋：[MD5_DIGEST] [QUESTION] <usetemplate ignoretext="刪除物品前確認" name="okcancelignore" notext="取消" yestext="確定"/> </notification> - <notification name="HelpReportAbuseEmailLL"> - 使用這個工具舉報任何違反[http://secondlife.com/corporate/tos.php 服務條款]和[http://secondlife.com/corporate/cs.php 社群準則]的情事。 - -所有舉報的違規事件都有人調查，加以解決。 + <notification name="ConfirmUnlink"> + 這是一組包含聯結集的巨大選取項。 一旦你取消它的聯結，很可能不能再重新聯結。 為防萬一，建議你把聯結集複製到收納區。 + <usetemplate ignoretext="取消聯結集聯結時，跟我確認" name="okcancelignore" notext="取消" yestext="取消聯結"/> </notification> <notification name="HelpReportAbuseSelectCategory"> 請選擇適合這次違規舉報的類別。 @@ -3201,6 +3246,12 @@ SHA1 指紋：[MD5_DIGEST] <notification name="AttachmentSaved"> 附件已儲存。 </notification> + <notification name="PresetNotSaved"> + 儲存預設名稱[NAME]時出錯。 + </notification> + <notification name="PresetNotDeleted"> + 刪除預設名稱[NAME]時出錯。 + </notification> <notification name="UnableToFindHelpTopic"> 找不到這個元件的幫助主題。 </notification> @@ -3233,9 +3284,8 @@ SHA1 指紋：[MD5_DIGEST] 選取要分享的居民。 </notification> <notification name="MeshUploadError"> - [LABEL] 上傳失敗：[MESSAGE] [IDENTIFIER] - -詳見記錄檔。 + [LABEL] 上傳失敗：[MESSAGE] [IDENTIFIER] +[DETAILS]詳情見 SecondLife.log </notification> <notification name="MeshUploadPermError"> 請求網面上傳權限時出錯。 diff --git a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml index 42a4aa9e85..42a4aa9e85 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml index 7d16ac4129..7d16ac4129 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml index e0a49a0add..e0a49a0add 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml index fd91ea97d1..fd91ea97d1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml index 9f59bb32f8..9f59bb32f8 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml index fef692c1c5..fef692c1c5 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml index e4e7a661a7..e4e7a661a7 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml index 9833e9ef8b..9833e9ef8b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/zh/panel_chat_header.xml b/indra/newview/skins/default/xui/zh/panel_chat_header.xml index 7916bf5155..7916bf5155 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/zh/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml index 69340349bc..69340349bc 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml index 6f2dd89318..6f2dd89318 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml index ba63dada76..ba63dada76 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml index 55e72f5347..55e72f5347 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml index c074abb568..c074abb568 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml index a9e65419c2..a9e65419c2 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml index 6377bf4135..6377bf4135 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml index 32765a3e16..32765a3e16 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml index b06ece02ad..b06ece02ad 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml index f44d411908..f44d411908 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml index d107eea553..d107eea553 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml index 65f78f9273..65f78f9273 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml index 61e45f911e..61e45f911e 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml index 846ed72961..846ed72961 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml index 26fedb59be..26fedb59be 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml index faee42fd0e..faee42fd0e 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml index 849b82c71a..849b82c71a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml index f249100786..f249100786 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml index bc69f2ffc4..bc69f2ffc4 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml index e190bb5bd8..e190bb5bd8 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml index d8552f52f0..d8552f52f0 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml index 34319fcc01..34319fcc01 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml index 8e19fb5692..8e19fb5692 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml index f5111d629a..f5111d629a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml index 5ead7c9004..5ead7c9004 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml index e497e285c9..e497e285c9 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml index 4dd7ea6d93..4dd7ea6d93 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/zh/panel_experience_search.xml b/indra/newview/skins/default/xui/zh/panel_experience_search.xml index 9b0145748e..25b15d03ab 100644 --- a/indra/newview/skins/default/xui/zh/panel_experience_search.xml +++ b/indra/newview/skins/default/xui/zh/panel_experience_search.xml @@ -26,7 +26,7 @@ <icons_combo_box label="適度成人" name="maturity"> <icons_combo_box.item label="完全成人" name="Adult" value="42"/> <icons_combo_box.item label="適度成人" name="Mature" value="21"/> - <icons_combo_box.item label="一般" name="PG" value="13"/> + <icons_combo_box.item label="普級" name="PG" value="13"/> </icons_combo_box> <scroll_list name="search_results"> <columns label="名稱" name="experience_name"/> diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml index f468aba514..f468aba514 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml index 2b16b61dd1..2b16b61dd1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml index 1fb0b3f5bb..1fb0b3f5bb 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml index 250bbaab6a..250bbaab6a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml index 81d5573e1c..81d5573e1c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml index fec4bb572a..fec4bb572a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml index ba5f4f1bba..ba5f4f1bba 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml index 08a8c94876..08a8c94876 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml index b4b32c204a..b4b32c204a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml index e937368a2b..e937368a2b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_instant_message.xml b/indra/newview/skins/default/xui/zh/panel_instant_message.xml index cf9bc7fccb..cf9bc7fccb 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/zh/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml index b50aa24d3f..b50aa24d3f 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml index eea406170a..eea406170a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml index 5292e5fc38..5292e5fc38 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_login.xml +++ b/indra/newview/skins/default/xui/zh/panel_login.xml diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml index 0ad3d8506d..4765276158 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml @@ -6,6 +6,9 @@ <panel.string name="ItemcountCompleted"> [ITEM_COUNT] 物品 [FILTER] </panel.string> + <panel.string name="ItemcountUnknown"> + 已取得 [ITEM_COUNT] 物品 [FILTER] + </panel.string> <text name="ItemcountText"> 物品： </text> diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml index aad1348e46..aad1348e46 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_me.xml +++ b/indra/newview/skins/default/xui/zh/panel_me.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml index 0c11befcf5..0c11befcf5 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml index 4a1eaef3a1..4a1eaef3a1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml index da84d6fe02..da84d6fe02 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml index 7a11aa961b..7a11aa961b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml index bb52c13a11..bb52c13a11 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml +++ b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml index fc52168bb7..fc52168bb7 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml index 9489113d09..9489113d09 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml index c11a7a088b..c11a7a088b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml index 01a8210338..01a8210338 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml index a5d3afccb9..a5d3afccb9 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml index 8de0bb0e4d..8de0bb0e4d 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml index a698da0ab1..a698da0ab1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml index 8dd93543c0..8dd93543c0 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml index 92ec774f9b..92ec774f9b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml index cfb0180f9c..cfb0180f9c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml index 693cdcdeca..693cdcdeca 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml index da5918d553..b0e60218cf 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_people.xml +++ b/indra/newview/skins/default/xui/zh/panel_people.xml @@ -18,6 +18,7 @@ <string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/> <string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/> <string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/> + <string name="GroupCountWithInfo" value="你目前屬於 [COUNT] 個群組，可再加入 [REMAINING] 個。 [secondlife:/// 想要更多？]"/> <tab_container name="tabs"> <panel label="附近" name="nearby_panel"> <panel label="bottom_panel" name="nearby_buttons_panel"> diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml index cd4cdbf999..cd4cdbf999 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml index 98d36eaea0..98d36eaea0 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_picks.xml +++ b/indra/newview/skins/default/xui/zh/panel_picks.xml diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml index a364f732d8..a364f732d8 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml index 08cae610f6..08cae610f6 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_places.xml +++ b/indra/newview/skins/default/xui/zh/panel_places.xml diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml index 563c4fca3c..563c4fca3c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml index 8ab122ccc3..8ab122ccc3 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml index 170cdddb8c..170cdddb8c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml index 94eb3c1389..94eb3c1389 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml 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 b5cdddc252..57add4f9d6 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml @@ -89,8 +89,19 @@ <check_box label="收納物品贈送" name="inventory_offer"/> </panel> <panel name="log_settings"> + <text name="logging_label"> + 儲存： + </text> + <combo_box name="conversation_log_combo"> + <item label="活動記錄和交談記錄" name="log_and_transcripts" value="2"/> + <item label="僅活動記錄" name="log_only" value="1"/> + <item label="沒有活動記錄或交談記錄" name="no_log_or_transcript" value="0"/> + </combo_box> <button label="清空記錄…" name="clear_log"/> <button label="刪除交談內容記錄…" name="delete_transcripts"/> + <text name="log_location_label"> + 位置： + </text> <button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/> </panel> <button label="翻譯…" name="ok_btn"/> diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml index 6af4bb8970..6af4bb8970 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml index 20335d82ae..20335d82ae 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml index 2311eb99a7..8c4d2f9c18 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml @@ -1,14 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="顯像" name="Display panel"> + <text name="preset_text"> + （無） + </text> <text name="QualitySpeed"> 品質與速度： </text> - <text name="FasterText"> - 最快 - </text> - <text name="BetterText"> - 最佳 - </text> <text name="ShadersPrefText"> 低 </text> @@ -21,94 +18,17 @@ <text name="ShadersPrefText4"> 超高 </text> - <panel label="自訂圖形" name="CustomGraphics Panel"> - <text name="ShadersText"> - 著色器： - </text> - <check_box initial_value="true" label="清澈透明的水" name="TransparentWater"/> - <check_box initial_value="true" label="凹凸映射與光澤效果" name="BumpShiny"/> - <check_box initial_value="true" label="本地光線" name="LocalLights"/> - <check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/> - <check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/> - <check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/> - <check_box initial_value="true" label="環境光遮蔽" name="UseSSAO"/> - <check_box initial_value="true" label="景深" name="UseDoF"/> - <text name="shadows_label"> - 陰影： - </text> - <combo_box name="ShadowDetail"> - <combo_box.item label="無" name="0"/> - <combo_box.item label="日 / 月" name="1"/> - <combo_box.item label="日 / 月 + 投影物" name="2"/> - </combo_box> - <text name="reflection_label"> - 水文反射： - </text> - <combo_box name="Reflections"> - <combo_box.item label="最小" name="0"/> - <combo_box.item label="地形與樹木" name="1"/> - <combo_box.item label="全部靜態物件" name="2"/> - <combo_box.item label="全部化身與物件" name="3"/> - <combo_box.item label="一切" name="4"/> - </combo_box> - <slider label="化身物理：" name="AvatarPhysicsDetail"/> - <text name="AvatarPhysicsDetailText"> - 低 - </text> - <slider label="描繪距離：" name="DrawDistance"/> - <text name="DrawDistanceMeterText2"> - 公尺 - </text> - <slider label="最大粒子效果數量：" name="MaxParticleCount"/> - <slider label="非假冒化身上限：" name="MaxNumberAvatarDrawn"/> - <slider label="後處理品質：" name="RenderPostProcess"/> - <text name="MeshDetailText"> - 網面細節： - </text> - <slider label="物件：" name="ObjectMeshDetail"/> - <slider label="彈性幾何元件：" name="FlexibleMeshDetail"/> - <slider label="樹木：" name="TreeMeshDetail"/> - <slider label="化身：" name="AvatarMeshDetail"/> - <slider label="地形：" name="TerrainMeshDetail"/> - <slider label="天空：" name="SkyMeshDetail"/> - <text name="PostProcessText"> - 低 - </text> - <text name="ObjectMeshDetailText"> - 低 - </text> - <text name="FlexibleMeshDetailText"> - 低 - </text> - <text name="TreeMeshDetailText"> - 低 - </text> - <text name="AvatarMeshDetailText"> - 低 - </text> - <text name="TerrainMeshDetailText"> - 低 - </text> - <text name="SkyMeshDetailText"> - 低 - </text> - <text name="AvatarRenderingText"> - 化身呈像： - </text> - <check_box initial_value="true" label="化身假冒者" name="AvatarImpostors"/> - <check_box initial_value="true" label="硬體換膚" name="AvatarVertexProgram"/> - <check_box initial_value="true" label="化身衣服" name="AvatarCloth"/> - <text name="TerrainDetailText"> - 地形細節： - </text> - <radio_group name="TerrainDetailRadio"> - <radio_item label="低" name="0"/> - <radio_item label="高" name="2"/> - </radio_group> - --> - </panel> - <button label="套用" label_selected="套用" name="Apply"/> - <button label="重設" name="Defaults"/> - <button label="進階" name="Advanced"/> - <button label="硬體" label_selected="硬體" name="GraphicsHardwareButton"/> + <text name="FasterText"> + 最快 + </text> + <text name="BetterText"> + 最佳 + </text> + <check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/> + <check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/> + <button label="將設定存為預設值 …" name="PrefSaveButton"/> + <button label="載入預設..." name="PrefLoadButton"/> + <button label="刪除自訂配置…" name="PrefDeleteButton"/> + <button label="重設為我們建議的設定" name="Defaults"/> + <button label="進階設定…" name="AdvancedSettings"/> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml index 3a27477885..3a27477885 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml index aa2486e988..aa2486e988 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml index fcbed76d49..942bd27140 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml @@ -17,17 +17,17 @@ <radio_group name="preferred_browser_behavior"> <radio_item label="所有連結都用我的網頁瀏覽器（例如 Chrome、Firefox、IE）開啟" name="internal" tool_tip="使用系統預設的瀏覽器瀏覽幫助，開啟網頁。全螢幕模式下不建議這麼做。" value="0"/> <radio_item label="僅在開啟第二人生連結時使用內建瀏覽器" name="external" tool_tip="使用系統預設的瀏覽器瀏覽幫助，開啟網頁。僅在開啟 LindenLab/SecondLife 的連結時才會使用內建瀏覽器。" value="1"/> + <radio_item label="用內建瀏覽器開啟所有連結" name="external_all" tool_tip="使用內建的瀏覽器瀏覽幫助，開啟網頁。該瀏覽器將透過 [APP_NAME] 開啟新視窗。" value="2"/> </radio_group> <check_box initial_value="true" label="啟用外掛" name="browser_plugins_enabled"/> <check_box initial_value="true" label="接受 cookies" name="cookies_enabled"/> <check_box initial_value="true" label="啟用 Javascript" name="browser_javascript_enabled"/> - <check_box initial_value="false" label="啟用媒體瀏覽的突顯式視窗" name="media_popup_enabled"/> <text name="Software updates:"> 軟體更新： </text> <combo_box name="updater_service_combobox"> <combo_box.item label="自動安裝" name="Install_automatically"/> - <combo_box.item label="手動下載及安裝" name="Install_manual"/> + <combo_box.item label="讓我自己手動下載並安裝" name="Install_manual"/> </combo_box> <check_box label="願意在更新時搶先試用釋出候選版" name="update_willing_to_test"/> <text name="Proxy Settings:"> diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml index e57f08fd74..e57f08fd74 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml new file mode 100644 index 0000000000..cd2cbfdd5a --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="presets_pulldown"> + <text name="Graphic Presets"> + 顯像預設 + </text> + <button label="開啟顯像偏好設定" name="open_prefs_btn" tool_tip="打開顯像偏好設定"/> +</panel> diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml index 09043311da..39d0aa9593 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml @@ -57,12 +57,9 @@ <layout_panel name="media_address"> <line_editor name="media_address_url" tool_tip="媒體網址"/> <layout_stack name="media_address_url_icons"> - <layout_panel> + <layout_panel name="media_address_url_icons_wl"> <icon name="media_whitelist_flag" tool_tip="白名單已啟用"/> </layout_panel> - <layout_panel> - <icon name="media_secure_lock_flag" tool_tip="加密的瀏覽"/> - </layout_panel> </layout_stack> </layout_panel> <layout_panel name="media_play_position"> diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml index d5dd337795..d5dd337795 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml index 0bb59a7b14..0bb59a7b14 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_environment.xml b/indra/newview/skins/default/xui/zh/panel_region_environment.xml index 8f466af39e..8f466af39e 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml index f3c1c85379..f3c1c85379 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml index 0ce3b659b2..0ce3b659b2 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml index 85e759e445..85e759e445 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml index c64982b397..c64982b397 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml index eb32d39f78..eb32d39f78 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml index 40a2dd6926..40a2dd6926 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml index bc29058f77..bc29058f77 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml index cdd79da30c..cdd79da30c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml index 9c45c54a5e..094bf019b4 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml @@ -7,7 +7,7 @@ 將圖像儲存到收納區的費用為 L$[UPLOAD_COST]。 若要將圖像存為材質，請選擇一個正方格式。 </text> <combo_box label="解析度" name="texture_size_combo"> - <combo_box.item label="目前視窗" name="CurrentWindow"/> + <combo_box.item label="目前視窗(512x512)" name="CurrentWindow"/> <combo_box.item label="小（128x128）" name="Small(128x128)"/> <combo_box.item label="中（256x256）" name="Medium(256x256)"/> <combo_box.item label="大（512x512）" name="Large(512x512)"/> diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml index 691ab8bac7..691ab8bac7 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml index a5a1cbfb51..a5a1cbfb51 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml index 1f202572f5..1f202572f5 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml index fa4e24a605..fa4e24a605 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml index 4586d4eca1..4586d4eca1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml index 2de31eb526..2de31eb526 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml index 44d545a86d..44d545a86d 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml index 93c02900e2..93c02900e2 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml index 5ea6d818c7..03f83693d6 100644 --- a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml @@ -21,11 +21,11 @@ <combo_box.item label="材料" name="Materials"/> <combo_box.item label="媒體" name="Media"/> </combo_box> - <combo_box name="combobox mattype"> - <combo_box.item label="材質（漫反射圖）" name="Texture (diffuse)"/> - <combo_box.item label="凹凸度（正交）" name="Bumpiness (normal)"/> - <combo_box.item label="閃亮度（鏡反光）" name="Shininess (specular)"/> - </combo_box> + <radio_group name="radio_material_type"> + <radio_item label="材質（漫反射圖）" name="Texture (diffuse)" value="0"/> + <radio_item label="凹凸度（正交）" name="Bumpiness (normal)" value="1"/> + <radio_item label="閃亮度（鏡反光）" name="Shininess (specular)" value="2"/> + </radio_group> <texture_picker label="材質" name="texture control" tool_tip="點按以挑選圖片"/> <text name="label alphamode"> 半透明模式 diff --git a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml index 6c8a452014..6c8a452014 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml index 70ec028176..70ec028176 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml index 84018768a1..84018768a1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_world_map.xml +++ b/indra/newview/skins/default/xui/zh/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml index 0a3ef8c710..0a3ef8c710 100755..100644 --- a/indra/newview/skins/default/xui/zh/role_actions.xml +++ b/indra/newview/skins/default/xui/zh/role_actions.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml index 83a9bdf6a5..83a9bdf6a5 100755..100644 --- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml index 54ea7cab22..54ea7cab22 100755..100644 --- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml index 9c5798d256..9c5798d256 100755..100644 --- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml index 0884f1789b..0884f1789b 100755..100644 --- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index 6493864b92..2ce310b224 100755..100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -38,12 +38,9 @@ 顯像初始化失敗。 請更新你的顯像卡驅動程式！ </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </string> - <string name="AboutCompiler"> - 以 [COMPILER_VERSION] 版本 [COMPILER] 建置 - </string> <string name="AboutPosition"> 你的方位是 [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地區名：[REGION]，主機：<nolink>[HOSTNAME]</nolink> ([HOSTIP]) 第二人生URL：<nolink>[SLURL]</nolink> @@ -64,10 +61,9 @@ <string name="AboutLibs"> OpenGL 版本：[OPENGL_VERSION] -libcurl 版本： [LIBCURL_VERSION] J2C 解碼器版本： [J2C_VERSION] 音效驅動程式版本： [AUDIO_DRIVER_VERSION] -Qt Webkit 版本： [QT_WEBKIT_VERSION] +LLCEFLib/CEF版本：[LLCEFLIB_VERSION] 語音伺服器版本： [VOICE_VERSION] </string> <string name="AboutTraffic"> @@ -178,6 +174,12 @@ Qt Webkit 版本： [QT_WEBKIT_VERSION] <string name="create_account_url"> http://join.secondlife.com/?sourceid=[sourceid] </string> + <string name="AgniGridLabel"> + 第二人生主要網格(Agni) + </string> + <string name="AditiGridLabel"> + 第二人生Beta版測試網格(Aditi) + </string> <string name="ViewerDownloadURL"> http://secondlife.com/download </string> @@ -448,6 +450,9 @@ http://secondlife.com/viewer-access-faq 你不能對含超過 [AMOUNT] 個物項的資料夾作穿戴動作。 欲變更此上限，可到「進階」>「顯示除錯設定」>「WearFolderLimit」。 </string> <string name="TooltipPrice" value="L$[AMOUNT]："/> + <string name="TooltipSLIcon"> + 這將連結到位於SecondLife.com或LindenLab.com官方網域的一個網頁。 + </string> <string name="TooltipOutboxDragToWorld"> 你不能從 Marketplace 的刊登資料夾產生物件。 </string> @@ -467,7 +472,7 @@ http://secondlife.com/viewer-access-faq 限量物件數目超過 [AMOUNT]。 </string> <string name="TooltipOutboxCannotDropOnRoot"> - 你只能把物項或資料夾拖放到「所有」(ALL)頁籤 請選取該頁籤，再移動你的物項或資料夾。 + 你只能把物項或資料夾拖放到所有(ALL)或已取消聯結(UNASSOCIATED)頁籤。 請選取其中一個頁籤，再移動你的物項或資料夾。 </string> <string name="TooltipOutboxNoTransfer"> 至少一個物件無法出售或轉移 @@ -551,6 +556,9 @@ http://secondlife.com/viewer-access-faq 點按以執行 secondlife:// 指令 </string> <string name="CurrentURL" value="目前網址：[CurrentURL]"/> + <string name="TooltipEmail"> + 點按一下可編寫電郵 + </string> <string name="SLurlLabelTeleport"> 瞬間傳送到 </string> @@ -1073,7 +1081,7 @@ http://secondlife.com/viewer-access-faq <string name="AgentNameSubst"> （你） </string> - <string name="JoinAnExperience"/><!-- intentionally blank --> + <string name="JoinAnExperience"/> <string name="SilentlyManageEstateAccess"> 管理領出入許可名單時，不顯示警示 </string> @@ -1852,6 +1860,21 @@ http://secondlife.com/viewer-access-faq <string name="TodayOld"> 今日剛加入 </string> + <string name="av_render_everyone_now"> + 現在每個人都能看見你了。 + </string> + <string name="av_render_not_everyone"> + 你恐怕不能呈像給你周遭的所有人。 + </string> + <string name="av_render_over_half"> + 你恐怕不能呈像給你周遭一半以上的人。 + </string> + <string name="av_render_most_of"> + 你恐怕不能呈像給你周遭大部分的人。 + </string> + <string name="av_render_anyone"> + 你恐怕不能呈像給你周遭的任何人。 + </string> <string name="AgeYearsA"> [COUNT] 年 </string> @@ -1969,6 +1992,9 @@ http://secondlife.com/viewer-access-faq <string name="CompileQueueUnknownFailure"> 下載失敗，原因不明 </string> + <string name="CompileNoExperiencePerm"> + 略過體驗 [EXPERIENCE] 的腳本 [SCRIPT]。 + </string> <string name="CompileQueueTitle"> 重新編譯進度 </string> @@ -2014,9 +2040,6 @@ http://secondlife.com/viewer-access-faq <string name="GroupsNone"> 無 </string> - <string name="CompileNoExperiencePerm"> - 略過體驗 [EXPERIENCE] 的腳本 [SCRIPT]。 - </string> <string name="Group" value="（群組）"/> <string name="Unknown"> （未知） @@ -5384,18 +5407,6 @@ http://secondlife.com/viewer-access-faq <string name="UserDictionary"> [User] </string> - <string name="logging_calls_disabled_log_empty"> - 交談未留記錄。 若想開始留記錄，請到「偏好設定 > 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。 - </string> - <string name="logging_calls_disabled_log_not_empty"> - 將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 > 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。 - </string> - <string name="logging_calls_enabled_log_empty"> - 目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。 - </string> - <string name="loading_chat_logs"> - 載入中… - </string> <string name="experience_tools_experience"> 體驗 </string> @@ -5477,4 +5488,37 @@ http://secondlife.com/viewer-access-faq <string name="ExperiencePermissionShort12"> 權限 </string> + <string name="logging_calls_disabled_log_empty"> + 交談未留記錄。 若想開始留記錄，請到「偏好設定 > 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。 + </string> + <string name="logging_calls_disabled_log_not_empty"> + 將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 > 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。 + </string> + <string name="logging_calls_enabled_log_empty"> + 目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。 + </string> + <string name="loading_chat_logs"> + 載入中… + </string> + <string name="preset_combo_label"> + -空白清單- + </string> + <string name="Default"> + 預設 + </string> + <string name="none_paren_cap"> + （無） + </string> + <string name="no_limit"> + 無上限 + </string> + <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES"> + 該物理形狀包含太小的三角形。 請試著簡化該物理模型。 + </string> + <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH"> + 該物理形狀包含壞的確認資料。 請試著修正該物理模型。 + </string> + <string name="Mav_Details_MAV_UNKNOWN_VERSION"> + 物理形狀的版本不正確。 請設成正確的物理模型版本。 + </string> </strings> diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml index 61db294272..61db294272 100755..100644 --- a/indra/newview/skins/default/xui/zh/teleport_strings.xml +++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml |