summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/zh')
-rw-r--r--indra/newview/skins/default/xui/zh/floater_about_land.xml1
-rw-r--r--indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml35
-rw-r--r--indra/newview/skins/default/xui/zh/floater_edit_ext_day_cycle.xml84
-rw-r--r--indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml25
-rw-r--r--indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml1
-rw-r--r--indra/newview/skins/default/xui/zh/floater_my_environments.xml20
-rw-r--r--indra/newview/skins/default/xui/zh/floater_settings_picker.xml19
-rw-r--r--indra/newview/skins/default/xui/zh/menu_inventory.xml9
-rw-r--r--indra/newview/skins/default/xui/zh/menu_inventory_add.xml7
-rw-r--r--indra/newview/skins/default/xui/zh/menu_save_settings.xml9
-rw-r--r--indra/newview/skins/default/xui/zh/menu_settings_add.xml6
-rw-r--r--indra/newview/skins/default/xui/zh/menu_settings_gear.xml10
-rw-r--r--indra/newview/skins/default/xui/zh/menu_viewer.xml24
-rw-r--r--indra/newview/skins/default/xui/zh/notifications.xml40
-rw-r--r--indra/newview/skins/default/xui/zh/panel_region_environment.xml104
-rw-r--r--indra/newview/skins/default/xui/zh/panel_region_estate.xml22
-rw-r--r--indra/newview/skins/default/xui/zh/panel_settings_sky_atmos.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/panel_settings_sky_clouds.xml13
-rw-r--r--indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml27
-rw-r--r--indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/panel_settings_water.xml19
-rw-r--r--indra/newview/skins/default/xui/zh/strings.xml24
22 files changed, 404 insertions, 99 deletions
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 badd00bc6d..cf6dd11b98 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -462,5 +462,6 @@
</panel>
</panel>
<panel label="體驗" name="land_experiences_panel"/>
+ <panel label="環境" name="land_environment_panel"/>
</tab_container>
</floater>
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
deleted file mode 100644
index 4aafb31952..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="刪除環境自訂配置">
- <string name="title_water">
- 刪除水的自訂配置
- </string>
- <string name="title_sky">
- 刪除天空自訂配置
- </string>
- <string name="title_day_cycle">
- 刪除日循環
- </string>
- <string name="label_water">
- 自訂配置:
- </string>
- <string name="label_sky">
- 自訂配置:
- </string>
- <string name="label_day_cycle">
- 日循環:
- </string>
- <string name="msg_confirm_deletion">
- 確定要刪除所選自訂配置?
- </string>
- <string name="msg_sky_is_referenced">
- 無法刪除日循環有所指涉的自訂配置。
- </string>
- <string name="combo_label">
- -選擇一個自訂配置-
- </string>
- <text name="label">
- 自訂配置:
- </text>
- <button label="刪除" name="delete"/>
- <button label="取消" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_ext_day_cycle.xml
new file mode 100644
index 0000000000..2b2f7757eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_edit_ext_day_cycle.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="env_edit_extdaycycle" title="編輯日循環">
+ <string name="title_new">
+ 新建一個日循環
+ </string>
+ <string name="title_edit">
+ 編輯日循環
+ </string>
+ <string name="hint_new">
+ 為日循環定名,調整各項控制確定細節,再點按「儲存」。
+ </string>
+ <string name="hint_edit">
+ 若要編輯你的日循環,請調整下方各項控制,再點按「儲存」。
+ </string>
+ <string name="time_label">
+ ([HH]:[MM])
+ </string>
+ <string name="sky_track_label">
+ 天空[ALT]
+ </string>
+ <layout_stack name="outer_stack">
+ <layout_panel name="name_and_import">
+ <text name="label">
+ 日循環名稱:
+ </text>
+ <button label="匯入" name="btn_import" tool_tip="從磁碟匯入舊設定。"/>
+ </layout_panel>
+ <layout_panel name="content">
+ <layout_stack name="content_stack">
+ <layout_panel name="timeline_track_selection">
+ <panel name="timeline_layers">
+ <button label="天空 4" name="sky4_track"/>
+ <button label="天空 3" name="sky3_track"/>
+ <button label="天空 2" name="sky2_track"/>
+ <button label="地面水平" name="sky1_track"/>
+ <button label="水文" name="water_track"/>
+ </panel>
+ <panel name="timeline">
+ <text name="p0" value="0%[DSC]"/>
+ <text name="p1" value="25%[DSC]"/>
+ <text name="p2" value="50%[DSC]"/>
+ <text name="p3" value="75%[DSC]"/>
+ <text name="p4" value="100%[DSC]"/>
+ <multi_slider initial_value="0" name="WLTimeSlider"/>
+ <multi_slider initial_value="0" name="WLDayCycleFrames"/>
+ <text name="current_time" value="[PRCNT]%[DSC]"/>
+ <layout_stack name="progress_control">
+ <layout_panel name="skip_back">
+ <button name="skip_back_btn" tool_tip="倒轉"/>
+ </layout_panel>
+ <layout_panel name="skip_forward">
+ <button name="skip_forward_btn" tool_tip="快轉"/>
+ </layout_panel>
+ </layout_stack>
+ <button label="新增幀" name="add_frame"/>
+ <button label="載入幀" name="btn_load_frame"/>
+ <button label="刪除幀" name="delete_frame"/>
+ </panel>
+ </layout_panel>
+ <layout_panel name="frame_edit_controls">
+ <text name="icn_lock_edit">
+ 從上方的時間線選擇一個關鍵幀以編輯設定。
+ </text>
+ </layout_panel>
+ <layout_panel name="frame_settings_water">
+ <tab_container name="water_tabs">
+ <panel label="水文" name="water_panel"/>
+ </tab_container>
+ </layout_panel>
+ <layout_panel name="frame_settings_sky">
+ <tab_container name="sky_tabs">
+ <panel label="大氣與照明" name="atmosphere_panel"/>
+ <panel label="雲彩" name="clouds_panel"/>
+ <panel label="日與月" name="moon_panel"/>
+ </tab_container>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="buttons">
+ <button label="儲存" name="save_btn"/>
+ <button label="取消" name="cancel_btn"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml
new file mode 100644
index 0000000000..9246cbfd27
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Fixed Environment" title="固定環境">
+ <string name="edit_sky">
+ 編輯天空:
+ </string>
+ <string name="edit_water">
+ 編輯水文:
+ </string>
+ <layout_stack name="floater_stack">
+ <layout_panel name="info_panel">
+ <button label="載入" name="btn_load" tool_tip="從收納區載入設定"/>
+ <button label="匯入" name="btn_import" tool_tip="從磁碟匯入舊設定。"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <layout_stack name="button_bar_ls">
+ <layout_panel name="save_btn_lp">
+ <button label="儲存" name="btn_commit"/>
+ </layout_panel>
+ <layout_panel name="revert_btn_lp">
+ <button label="取消" name="btn_cancel" tool_tip="恢復上一個已儲存版本"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
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 9001615d89..ae05396cc5 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
@@ -12,6 +12,7 @@
<check_box label="聲音" name="check_sound"/>
<check_box label="材質" name="check_texture"/>
<check_box label="快照" name="check_snapshot"/>
+ <check_box label="設定" name="check_settings"/>
<button label="全部" label_selected="全部" name="All"/>
<button label="無" label_selected="無" name="None"/>
<check_box label="固定顯示資料夾" name="check_show_empty"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_my_environments.xml b/indra/newview/skins/default/xui/zh/floater_my_environments.xml
new file mode 100644
index 0000000000..be33d456da
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_my_environments.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="地點" name="my_environments" title="我的環境">
+ <layout_stack>
+ <layout_panel label="過濾器" name="filter_panel">
+ <check_box label="日" name="chk_days"/>
+ <check_box label="天空" name="chk_skies"/>
+ <check_box label="水文" name="chk_water"/>
+ </layout_panel>
+ <layout_panel label="環境" name="list_panel">
+ <check_box initial_value="false" label="顯示空資料夾" name="chk_showfolders"/>
+ </layout_panel>
+ <layout_panel name="pnl_control">
+ <panel label="bottom_panel" name="pnl_bottom">
+ <menu_button name="btn_gear" tool_tip="更多選項"/>
+ <menu_button name="btn_newsettings" tool_tip="製作新的設定"/>
+ <button name="btn_del" tool_tip="刪除這個設定"/>
+ </panel>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_settings_picker.xml b/indra/newview/skins/default/xui/zh/floater_settings_picker.xml
new file mode 100644
index 0000000000..dba6034b5a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_settings_picker.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="settings picker" title="選擇:設定">
+ <floater.string name="choose_picture">
+ 點按以挑選圖片
+ </floater.string>
+ <floater.string name="pick title">
+ 精選地點:
+ </floater.string>
+ <layout_stack name="test_stack">
+ <layout_panel name="temp">
+ <filter_editor label="材質過濾器" name="flt_inventory_search"/>
+ <check_box initial_value="false" label="顯示資料夾" name="chk_showfolders"/>
+ </layout_panel>
+ <layout_panel name="temp">
+ <button label="確定" label_selected="確定" name="btn_select"/>
+ <button label="取消" label_selected="取消" name="btn_cancel"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 2ed078841e..4db6b4512d 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -10,7 +10,6 @@
<menu_item_call label="啟用" name="Marketplace Activate"/>
<menu_item_call label="停用" name="Marketplace Deactivate"/>
<menu_item_call label="分享" name="Share"/>
- <menu_item_call label="購買" name="Task Buy"/>
<menu_item_call label="打開" name="Task Open"/>
<menu_item_call label="播放" name="Task Play"/>
<menu_item_call label="屬性" name="Task Properties"/>
@@ -42,6 +41,11 @@
<menu_item_call label="新頭髮" name="New Hair"/>
<menu_item_call label="新眼睛" name="New Eyes"/>
</menu>
+ <menu label="新的設定" name="New Settings">
+ <menu_item_call label="新的天空" name="New Sky"/>
+ <menu_item_call label="新的水文" name="New Water"/>
+ <menu_item_call label="新的日循環" name="New Day Cycle"/>
+ </menu>
<menu label="作這一用途的預設值:" name="upload_def">
<menu_item_call label="圖像上傳" name="Image uploads"/>
<menu_item_call label="聲音上傳" name="Sound uploads"/>
@@ -103,6 +107,9 @@
<menu_item_call label="編輯" name="Wearable Edit"/>
<menu_item_call label="添加" name="Wearable Add"/>
<menu_item_call label="脫下" name="Take Off"/>
+ <menu_item_call label="僅套用到我自己" name="Settings Apply Local"/>
+ <menu_item_call label="套用到地段" name="Settings Apply Parcel"/>
+ <menu_item_call label="套用到地區" name="Settings Apply Region"/>
<menu_item_call label="複製到 Marketplace 刊登" name="Marketplace Copy"/>
<menu_item_call label="移到 Marketplace 刊登" name="Marketplace Move"/>
<menu_item_call label="-- 無選項 --" name="--no options--"/>
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..013ac094b4 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
@@ -5,9 +5,7 @@
<menu_item_call label="聲音(L$[COST])..." name="Upload Sound"/>
<menu_item_call label="動作(L$[COST])..." name="Upload Animation"/>
<menu_item_call label="模型…" name="Upload Model"/>
- <menu_item_call label="模型精靈…" name="Upload Model Wizard"/>
<menu_item_call label="批量(每檔案 L$[COST] )..." name="Bulk Upload"/>
- <menu_item_call label="設定預設上傳權限" name="perm prefs"/>
</menu>
<menu_item_call label="新資料夾" name="New Folder"/>
<menu_item_call label="新腳本" name="New Script"/>
@@ -33,4 +31,9 @@
<menu_item_call label="新頭髮" name="New Hair"/>
<menu_item_call label="新眼睛" name="New Eyes"/>
</menu>
+ <menu label="新的設定" name="New Settings">
+ <menu_item_call label="新的天空" name="New Sky"/>
+ <menu_item_call label="新的水文" name="New Water"/>
+ <menu_item_call label="新的日循環" name="New Day Cycle"/>
+ </menu>
</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_save_settings.xml b/indra/newview/skins/default/xui/zh/menu_save_settings.xml
new file mode 100644
index 0000000000..9a70f38115
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_save_settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="save_settings_menu">
+ <menu_item_check label="儲存" name="save_settings"/>
+ <menu_item_check label="另存為" name="save_as_new_settings"/>
+ <menu_item_check label="確定套用" name="commit_changes"/>
+ <menu_item_check label="僅套用到我自己" name="apply_local"/>
+ <menu_item_check label="套用到地段" name="apply_parcel"/>
+ <menu_item_check label="套用到地區" name="apply_region"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_settings_add.xml b/indra/newview/skins/default/xui/zh/menu_settings_add.xml
new file mode 100644
index 0000000000..4e11741241
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_settings_add.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add">
+ <menu_item_call label="新的天空" name="New Sky"/>
+ <menu_item_call label="新的水文" name="New Water"/>
+ <menu_item_call label="新的日循環" name="New Day Cycle"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_settings_gear.xml b/indra/newview/skins/default/xui/zh/menu_settings_gear.xml
new file mode 100644
index 0000000000..342f9d50b4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_settings_gear.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_gear">
+ <menu_item_call label="編輯" name="edit_settings"/>
+ <menu_item_call label="僅套用到我自己" name="Settings Apply Local"/>
+ <menu_item_call label="套用到地段" name="Settings Apply Parcel"/>
+ <menu_item_call label="套用到地區" name="Settings Apply Region"/>
+ <menu_item_call label="複製" name="copy_settings"/>
+ <menu_item_call label="貼上" name="paste_settings"/>
+ <menu_item_call label="覆製 UUID" name="copy_uuid"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index a8ac7cbf0e..39d4a7c4f7 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -75,30 +75,14 @@
<menu_item_check label="地段屬性" name="Parcel Properties"/>
<menu_item_check label="進階選單" name="Show Advanced Menu"/>
</menu>
- <menu label="太陽" name="Sun">
+ <menu label="環境" name="Environment">
<menu_item_check label="日出" name="Sunrise"/>
<menu_item_check label="中午" name="Noon"/>
<menu_item_check label="日落" name="Sunset"/>
<menu_item_check label="午夜" name="Midnight"/>
- <menu_item_check label="使用地區設定" name="Use Region Settings"/>
- </menu>
- <menu label="環境編輯器" name="Environment Editor">
- <menu_item_call label="環境設定…" name="Environment Settings"/>
- <menu label="水的自訂配置" name="Water Presets">
- <menu_item_call label="新的自訂配置…" name="new_water_preset"/>
- <menu_item_call label="編輯自訂配置…" name="edit_water_preset"/>
- <menu_item_call label="刪除自訂配置…" name="delete_water_preset"/>
- </menu>
- <menu label="天空自訂配置" name="Sky Presets">
- <menu_item_call label="新的自訂配置…" name="new_sky_preset"/>
- <menu_item_call label="編輯自訂配置…" name="edit_sky_preset"/>
- <menu_item_call label="刪除自訂配置…" name="delete_sky_preset"/>
- </menu>
- <menu label="日的自訂配置" name="Day Presets">
- <menu_item_call label="新的自訂配置…" name="new_day_preset"/>
- <menu_item_call label="編輯自訂配置…" name="edit_day_preset"/>
- <menu_item_call label="刪除自訂配置…" name="delete_day_preset"/>
- </menu>
+ <menu_item_check label="使用共享環境" name="Use Shared Environment"/>
+ <menu_item_call label="我的環境…" name="my_environs"/>
+ <menu_item_check label="暫停雲彩" name="pause_clouds"/>
</menu>
</menu>
<menu label="建造" name="BuildTools">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index ea635d0e5d..b1b35f0614 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -1912,6 +1912,10 @@ SHA1 指紋:[MD5_DIGEST]
若不勾選這選項,可能會移除地段所有人為防止惡意騷擾及為維護隱私、保護幼未成年居民不接觸成年限制級內容的限制措施。 若有必要請與地段所有人溝通。
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="EstateParcelEnvironmentOverride">
+ 取消勾選這選項,可能會移除地段所有人之前新增到地段的任何自定環境。 若有必要請與地段所有人溝通。
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="RegionEntryAccessBlocked">
你所欲前往的地區含有超過你目前偏好的分級的內容。 你可以到「我自己 &gt; 偏好設定 &gt; 一般設定」變更你的偏好設定。
<usetemplate name="okbutton" yestext="確定"/>
@@ -4338,4 +4342,40 @@ SHA1 指紋:[MD5_DIGEST]
[REASON]
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="FailedToFindSettings">
+ 無法從資料庫載入[NAME]的設定。
+ </notification>
+ <notification name="FailedToLoadSettingsApply">
+ 無法將設定套用到環境。
+ </notification>
+ <notification name="FailedToBuildSettingsDay">
+ 無法將設定套用到環境。
+ </notification>
+ <notification name="NoEnvironmentSettings">
+ 這區域不支援環境設定。
+ </notification>
+ <notification name="WLImportFail">
+ 無法從[FILE]匯入舊的風光(Windlight)設定。
+ </notification>
+ <notification name="WLParcelApplyFail">
+ 無法設定此地段的環境。
+請輸入或選擇一個你有權修改的地段。
+ </notification>
+ <notification name="SettingsUnsuported">
+ 這地區不支援設定。
+請移位到支援設定的地區,再試一次。
+ </notification>
+ <notification name="SettingsConfirmLoss">
+ 你即將針對名爲&quot;[NAME]&quot;的[TYPE]放棄變更。
+確定繼續?
+ <usetemplate ignoretext="確定放棄變更?" name="okcancelignore" notext="否" yestext="是"/>
+ </notification>
+ <notification name="SettingsMakeNoTrans">
+ 你即將把無法轉移的設定匯入這個日循環。 如果繼續,將使得你正在編輯的設定也變成無法轉移。
+
+這個改變無法取消復原。
+
+確定繼續?
+ <usetemplate ignoretext="確定要把設定變成無法轉移?" name="okcancelignore" notext="否" yestext="是"/>
+ </notification>
</notifications>
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 afea391dda..16f9dc83a0 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_environment.xml
@@ -1,33 +1,77 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="環境" name="panel_env_info">
- <text name="water_settings_title">
- 選擇你希望到你地區的訪客所能看到的水和天空 / 日循環設定。 詳情
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="使用第二人生預設值" name="use_sl_default_settings"/>
- <radio_item label="使用以下設定" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="water_settings_title">
- 水的設定
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-選擇一個自訂配置-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- 天空/日循環
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="固定天空" name="my_sky_settings"/>
- <radio_item label="日循環" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-選擇一個自訂配置-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-選擇一個自訂配置-" name="item0"/>
- </combo_box>
- </panel>
- <button label="套用" name="apply_btn"/>
- <button label="取消" name="cancel_btn"/>
+ <string name="str_label_use_default">
+ 使用預設設定
+ </string>
+ <string name="str_label_use_region">
+ 使用地區設定
+ </string>
+ <string name="str_unknow_inventory">
+ 未知
+ </string>
+ <string name="str_altitude_desription">
+ 天空 [INDEX]([ALTITUDE]m)
+ </string>
+ <string name="str_no_parcel">
+ 未選擇地段。 環境設定已停用。
+ </string>
+ <string name="str_cross_region">
+ 跨越地區不提供環境設定。
+ </string>
+ <string name="str_legacy">
+ 這地區不提供環境設定。
+ </string>
+ <layout_stack>
+ <layout_panel name="pnl_environment_disabled">
+ <text name="txt_environment_disabled">
+ ...
+ </text>
+ </layout_panel>
+ <layout_panel name="pnl_environment_config">
+ <layout_stack>
+ <layout_panel name="pnl_environment_current">
+ <radio_group name="rdg_environment_select">
+ <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/>
+ <radio_item label="來自收納區的設定" name="rdo_use_inv_setting"/>
+ <radio_item label="自定環境" name="rdo_use_custom_setting"/>
+ </radio_group>
+ <line_editor name="edt_inventory_name">
+ 未知
+ </line_editor>
+ <button label="編輯環境" name="btn_edit"/>
+ </layout_panel>
+ <layout_panel name="pnl_environment_length">
+ <text name="lbl_apparent_time">
+ [HH]:[MM][AP] ([PRC]%)
+ </text>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="pnl_environment_altitudes">
+ <panel name="cnt_panel">
+ <multi_slider initial_value="100" name="sld_altitudes">
+ <slider name="sld1" value="200"/>
+ <slider name="sld2" value="400"/>
+ <slider name="sld3" value="600"/>
+ </multi_slider>
+ <text name="ground">
+ 地面
+ </text>
+ <text name="alt1">
+ 天空 [INDEX]([ALTITUDE]m)
+ </text>
+ <text name="alt2">
+ 天空 [INDEX]([ALTITUDE]m)
+ </text>
+ <text name="alt3">
+ 天空 [INDEX]([ALTITUDE]m)
+ </text>
+ </panel>
+ </layout_panel>
+ <layout_panel name="pnl_environment_buttons">
+ <check_box label="地段所有人可強制設定環境" name="chk_allow_override"/>
+ <button label="套用" name="btn_apply"/>
+ <button label="重設" name="btn_cancel"/>
+ </layout_panel>
+ </layout_stack>
</panel>
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 3825e7ab23..4be4f0aac1 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -29,22 +29,22 @@
領地管理員:
</text>
<text name="allow_resident_label">
- 永遠允許:
+ 永遠准許:
</text>
- <button label="添加..." name="add_estate_manager_btn"/>
- <button label="移除..." name="remove_estate_manager_btn"/>
- <button label="添加..." name="add_allowed_avatar_btn"/>
- <button label="移除..." name="remove_allowed_avatar_btn"/>
+ <button label="新增…" name="add_estate_manager_btn"/>
+ <button label="移除…" name="remove_estate_manager_btn"/>
+ <button label="新增…" name="add_allowed_avatar_btn"/>
+ <button label="移除…" name="remove_allowed_avatar_btn"/>
<text name="allow_group_label">
- 永遠允許的群組:
+ 永遠准許的群組:
</text>
<text name="ban_resident_label">
- 永遠封鎖:
+ 永遠禁入:
</text>
- <button label="添加..." name="add_allowed_group_btn"/>
- <button label="移除..." name="remove_allowed_group_btn"/>
- <button label="添加..." name="add_banned_avatar_btn"/>
- <button label="移除..." name="remove_banned_avatar_btn"/>
+ <button label="新增…" name="add_allowed_group_btn"/>
+ <button label="移除…" name="remove_allowed_group_btn"/>
+ <button label="新增…" name="add_banned_avatar_btn"/>
+ <button label="移除…" name="remove_banned_avatar_btn"/>
<button label="送出訊息到領地..." name="message_estate_btn"/>
<button label="由領地將居民踢出..." name="kick_user_from_estate_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/zh/panel_settings_sky_atmos.xml
new file mode 100644
index 0000000000..a352055d6d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_atmos.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="大氣與照明" name="panel_settings_sky_atmos"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/zh/panel_settings_sky_clouds.xml
new file mode 100644
index 0000000000..e27e2278df
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_clouds.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="雲彩" name="panel_settings_sky_clouds">
+ <layout_stack>
+ <layout_panel>
+ <slider label="X" name="cloud_density_x"/>
+ <slider label="Y" name="cloud_density_y"/>
+ <slider label="D" name="cloud_density_d"/>
+ <slider label="X" name="cloud_detail_x"/>
+ <slider label="Y" name="cloud_detail_y"/>
+ <slider label="D" name="cloud_detail_d"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml
new file mode 100644
index 0000000000..4b043ccaa2
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="密度" name="panel_settings_sky_density">
+ <layout_stack>
+ <layout_panel>
+ <slider label="Rayleigh指數函數項:" name="rayleigh_exponential"/>
+ <slider label="Rayleigh指數函數比例:" name="rayleigh_exponential_scale"/>
+ <slider label="Rayleigh線性項:" name="rayleigh_linear"/>
+ <slider label="Rayleigh常數項:" name="rayleigh_constant"/>
+ <slider label="Rayleigh最大高度:" name="rayleigh_max_altitude"/>
+ </layout_panel>
+ <layout_panel>
+ <slider label="Mie指數函數項:" name="mie_exponential"/>
+ <slider label="Mie指數函數比例:" name="mie_exponential_scale"/>
+ <slider label="Mie線性項:" name="mie_linear"/>
+ <slider label="Mie常數項:" name="mie_constant"/>
+ <slider label="Mie異性因子:" name="mie_aniso_factor"/>
+ <slider label="Mie最大高度:" name="mie_max_altitude"/>
+ </layout_panel>
+ <layout_panel>
+ <slider label="吸收指數函數項:" name="absorption_exponential"/>
+ <slider label="吸收指數函數比例:" name="absorption_exponential_scale"/>
+ <slider label="吸收線性項:" name="absorption_linear"/>
+ <slider label="吸收常數項:" name="absorption_constant"/>
+ <slider label="吸收最大高度:" name="absorption_max_altitude"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml
new file mode 100644
index 0000000000..594f7e89d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="日與月" name="panel_settings_sky_hbodies"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_settings_water.xml b/indra/newview/skins/default/xui/zh/panel_settings_water.xml
new file mode 100644
index 0000000000..59687c001b
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_settings_water.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="水文" name="panel_settings_water">
+ <layout_stack name="water_stack1">
+ <layout_panel>
+ <text name="FresnelOffsetText">
+ 菲涅耳偏距:
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <layout_stack name="water_stack2">
+ <layout_panel>
+ <slider label="X:" name="water_normal_scale_x"/>
+ <slider label="Y:" name="water_normal_scale_y"/>
+ <slider label="Z:" name="water_normal_scale_z"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 24d8dc60cb..57da57a82c 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -632,6 +632,15 @@ http://secondlife.com/viewer-access-faq
<string name="BUTTON_HELP">
顯示幫助
</string>
+ <string name="TooltipNotecardNotAllowedTypeDrop">
+ 這類物項無法附著
+到本地區的記事卡。
+ </string>
+ <string name="TooltipNotecardOwnerRestrictedDrop">
+ 只有帶有不受限制的
+「下一個所有人」權限的物件
+才可附著到記事卡。
+ </string>
<string name="Searching">
搜尋中...
</string>
@@ -780,6 +789,9 @@ http://secondlife.com/support 求助解決問題。
<string name="symbolic link">
聯結
</string>
+ <string name="settings blob">
+ 設定
+ </string>
<string name="symbolic folder link">
資料夾聯結
</string>
@@ -2483,6 +2495,9 @@ http://secondlife.com/support 求助解決問題。
<string name="RegionSettings">
地區設定
</string>
+ <string name="NoEnvironmentSettings">
+ 這區域不支援環境設定。
+ </string>
<string name="ClassifiedClicksTxt">
點按:[TELEPORT] 瞬間傳送,[MAP] 地圖,[PROFILE] 檔案
</string>
@@ -4825,6 +4840,15 @@ http://secondlife.com/support 求助解決問題。
<string name="Female - Wow">
女性 - 哇塞
</string>
+ <string name="New Daycycle">
+ 新的日循環
+ </string>
+ <string name="New Water">
+ 新的水文
+ </string>
+ <string name="New Sky">
+ 新的天空
+ </string>
<string name="/bow">
/彎腰點頭
</string>