From a1ba797c464b67e01a9bb8c6f8e00af256894ff0 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 7 Dec 2025 02:35:41 +0100
Subject: [PATCH] =?UTF-8?q?FIRE-36181=20Chinese=20Translation=20Update,=20?=
 =?UTF-8?q?by=20=E5=B0=8F=E6=BB=A2=20Zi=20Ying?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 .../xui/zh/floater_preview_texture.xml        |  2 +-
 .../default/xui/zh/floater_about_land.xml     | 20 +++----
 .../default/xui/zh/floater_display_name.xml   |  2 +-
 .../xui/zh/floater_fs_asset_blacklist.xml     |  2 +-
 .../zh/floater_fs_splash_screen_settings.xml  |  2 +-
 .../skins/default/xui/zh/floater_inspect.xml  |  5 +-
 .../zh/floater_inventory_item_properties.xml  |  3 +-
 .../default/xui/zh/floater_marketplace.xml    | 12 ++++
 .../xui/zh/floater_pathfinding_console.xml    |  3 +
 .../xui/zh/floater_preview_texture.xml        |  4 +-
 .../skins/default/xui/zh/menu_viewer.xml      |  2 +-
 .../skins/default/xui/zh/notifications.xml    | 10 +++-
 .../default/xui/zh/panel_classified_info.xml  |  4 +-
 .../default/xui/zh/panel_landmark_info.xml    |  7 ++-
 .../default/xui/zh/panel_place_profile.xml    |  5 +-
 .../xui/zh/panel_preferences_firestorm.xml    |  4 +-
 .../xui/zh/panel_preferences_general.xml      | 10 ++++
 .../default/xui/zh/panel_preferences_move.xml |  8 +++
 .../xui/zh/panel_preferences_privacy.xml      | 16 ++---
 .../xui/zh/panel_profile_classified.xml       |  6 +-
 .../default/xui/zh/panel_sound_devices.xml    |  3 +
 .../skins/default/xui/zh/panel_status_bar.xml |  4 +-
 .../xui/zh/panel_teleport_history_item.xml    |  6 ++
 .../default/xui/zh/sidepanel_item_info.xml    |  5 +-
 .../newview/skins/default/xui/zh/strings.xml  | 59 +++++++------------
 25 files changed, 120 insertions(+), 84 deletions(-)

diff --git a/indra/newview/skins/ansastorm/xui/zh/floater_preview_texture.xml b/indra/newview/skins/ansastorm/xui/zh/floater_preview_texture.xml
index 7aec58e0e2..01b87cea5d 100644
--- a/indra/newview/skins/ansastorm/xui/zh/floater_preview_texture.xml
+++ b/indra/newview/skins/ansastorm/xui/zh/floater_preview_texture.xml
@@ -7,7 +7,7 @@
 		複製到庫存
 	</floater.string>
 	<floater.string name="DateTime">
-		[weekday,datetime,slt], [day,datetime,slt]. [month,datetime,slt] [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
+		[year,datetime,slt], [month,datetime,slt]. [day,datetime,slt] [weekday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</floater.string>
 	<text name="desc txt">
 		描述:
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 1ba1dd125d..265682b129 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="土地資訊">
-	<floater.string name="maturity_icon_general">
-		"Parcel_PG_Dark"
-	</floater.string>
-	<floater.string name="maturity_icon_moderate">
-		"Parcel_M_Dark"
-	</floater.string>
-	<floater.string name="maturity_icon_adult">
-		"Parcel_R_Dark"
-	</floater.string>
 	<floater.string name="Hours">
 		[HOURS]小時
 	</floater.string>
@@ -16,13 +7,13 @@
 		小時
 	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] 分鐘
+		[MINUTES]分
 	</floater.string>
 	<floater.string name="Minute">
-		分鐘
+		分
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] 秒
+		[SECONDS]秒
 	</floater.string>
 	<floater.string name="Remaining">
 		剩餘時間
@@ -71,8 +62,11 @@
 			<panel.string name="no_selection_text">
 				未選擇地塊。
 			</panel.string>
+			<panel.string name="time_stamp_template_ampm">
+				[year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [ampm,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+			</panel.string>
 			<panel.string name="time_stamp_template">
-				[wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
+				[year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
 			</panel.string>
 			<panel.string name="error_resolving_uuid">
 				地塊ID無法確定。
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 8de22080b5..c58406a758 100644
--- a/indra/newview/skins/default/xui/zh/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Display Name" title="變更顯示名">
 	<floater.string name="LockOutDateFormat">
-		[month,datetime,slt] [day,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [timezone,datetime,slt]
+		[year,datetime,slt] [month,datetime,slt] [day,datetime,slt] [ampm,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</floater.string>
 	<text name="info_text">
 		你為你的化身取的名字叫做「顯示名」。 一星期可以修改一次。
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_asset_blacklist.xml b/indra/newview/skins/default/xui/zh/floater_fs_asset_blacklist.xml
index 95955f92ba..f1442c469f 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_asset_blacklist.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_asset_blacklist.xml
@@ -37,7 +37,7 @@
 		未知地塊
 	</floater.string>
 	<floater.string name="DateFormatString">
-		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
+		[year,datetime,local].[mthnum,datetime,local].[day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</floater.string>
 	<filter_editor label="篩選資源封鎖清單" name="filter_input" />
 	<fs_scroll_list name="result_list">
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_splash_screen_settings.xml b/indra/newview/skins/default/xui/zh/floater_fs_splash_screen_settings.xml
index 4e1c232a27..56dfbe08cc 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_splash_screen_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_splash_screen_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="splash_screen_settings" title="登入啟動畫面設定">
 	<text name="description">
-		在這裡配置登入啟動畫面的顯示選項。這些設定將在您下次重新啟動查看器時生效。
+		在這裡配置登入啟動畫面的顯示選項。這些設定將在您下次重新啟動檢視器時生效。
 	</text>
 	<text name="section_visibility">
 		區域可見性：
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
index 4f4ad3f831..7bae5832aa 100644
--- a/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="inspect" title="檢查物件">
+	<floater.string name="timeStampAMPM">
+		[year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [ampm,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+	</floater.string>
 	<floater.string name="timeStamp">
-		[wkday,datetime,slt] [day,datetime,slt]. [mth,datetime,slt] [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+		[year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
 	</floater.string>
 	<floater.string name="Group">
 		（群組）
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 8a228371e5..f1474808ef 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
@@ -5,7 +5,8 @@
 	<floater.string name="public">（公開）</floater.string>
 	<floater.string name="you_can">你可以：</floater.string>
 	<floater.string name="owner_can">所有者可以：</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+	<floater.string name="acquiredDate">[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
+	<floater.string name="acquiredDateAMPM">[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [ampm,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
 	<text name="LabelItemNameTitle">名稱：</text>
 	<text name="LabelItemDescTitle">描述：</text>
 	<text name="LabelCreatorTitle">創造者：</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_marketplace.xml b/indra/newview/skins/default/xui/zh/floater_marketplace.xml
index d13a46e9ed..f2aaf3fd0c 100644
--- a/indra/newview/skins/default/xui/zh/floater_marketplace.xml
+++ b/indra/newview/skins/default/xui/zh/floater_marketplace.xml
@@ -10,5 +10,17 @@
 			<icon name="media_secure_lock_flag" tool_tip="安全瀏覽" />
 			<button tool_tip="在外部瀏覽器中打開當前網址" name="popexternal" />
 		</layout_panel>
+		<layout_panel name="external_controls">
+			<text name="plugin_fail_text">
+網頁瀏覽器插件正在載入中。
+若插件載入失敗，請訪問以下連結取得故障排除指南：
+
+https://wiki.firestormviewer.org/fs_search_issues
+
+及
+
+https://wiki.firestormviewer.org/fs_media
+			</text>
+		</layout_panel>
 	</layout_stack>
 </floater>
\ No newline at end of file
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 fb64cc4e9e..b256bf1920 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="尋路檢視 / 測試">
+	<floater.string name="no_havok">
+		路徑尋路導航網格生成失敗
+	</floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		找不到尋路函式庫的實作。
 	</floater.string>
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 7aa747c530..d1e92872c5 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
@@ -7,10 +7,10 @@
 		複製到庫存
 	</floater.string>
 	<floater.string name="DateTime">
-		[weekday,datetime,slt], [day,datetime,slt]. [month,datetime,slt] [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
+		[year,datetime,slt], [month,datetime,slt] [day,datetime,slt] [weekday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</floater.string>
 	<floater.string name="UploaderDateTime">
-		由 [UPLOADER] 上傳於 [DATE_TIME]。
+		由[UPLOADER]上傳於[DATE_TIME]。
 	</floater.string>
 	<text name="desc txt">
 		描述:
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index acabd679e5..c55d659c7c 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -630,7 +630,7 @@
 			</menu>
 			<menu_item_call label="強制參數為預設值" name="Force Params to Default" />
 			<menu_item_check label="動畫資訊" name="Animation Info" />
-			<menu_item_check label="顯示注視點" name="Show Look At" />
+			<menu_item_check label="顯示注視目標" name="Show Look At" />
 			<menu_item_check label="顯示目標選擇指示" name="Show Point At" />
 			<menu_item_check label="旋軸的更新除錯" name="Debug Joint Updates" />
 			<menu_item_check label="停用細節層次" name="Disable LOD" />
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index f112f50a45..b5cc234d44 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -665,7 +665,7 @@
 		<usetemplate name="okcancelbuttons" notext="稍後" yestext="現在退出"/>
 	</notification>
 	<notification name="ChangeLanguage">
-		重新啟動 [APP_NAME] 後將換成新的語言。
+		重新啟動 [APP_NAME] 後將換成新的語言或時間格式。
 	</notification>
 	<notification name="GoToAuctionPage">
 		前往 [CURRENT_GRID] 網頁去檢視拍賣細節或競拍？
@@ -2717,6 +2717,12 @@ URL:[UNTRUSTED_URL]
 	<notification name="TooManyWearables">
 		你不能對含超過 [AMOUNT] 個物件的檔案夾作穿戴操作。  欲變更此上限，可到「進階」&gt;「顯示除錯設定」&gt;「WearFolderLimit」。
 	</notification>
+	<notification name="CantLinkNotecard">
+		請先儲存記事卡，之後才能連結到此。
+	</notification>
+	<notification name="CantLinkMaterial">
+		請先儲存材質，之後才能連結到此。
+	</notification>
 	<notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay">
 		你已開啟「請勿打擾」。 你將不會收到任何付款購買的物件。
 
@@ -5804,7 +5810,7 @@ https://wiki.firestormviewer.org/antivirus_whitelisting
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="FSLargeOutfitsWarningInThisSession">
-		检测到大量装扮：[AMOUNT]。这可能会导致查看器卡顿或连接断开。请考虑将装扮数量限制在[MAX]以内，以提升性能。 这只是一个建议，如果你的电脑运行正常，你可以放心忽略它。
+		检测到大量装扮：[AMOUNT]。这可能会导致檢視器卡顿或连接断开。请考虑将装扮数量限制在[MAX]以内，以提升性能。 这只是一个建议，如果你的电脑运行正常，你可以放心忽略它。
 		<usetemplate ignoretext="装扮过多警告" name="okignore" yestext="确定" />
 	</notification>
 	<notification name="PrimfeedLoginRequestFailed">
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 2bb6c912bd..ee304f347f 100644
--- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
@@ -10,10 +10,10 @@
 		[PRICE] L$
 	</panel.string>
 	<panel.string name="click_through_text_fmt">
-		[TELEPORT] 瞬間傳送，[MAP] 地圖，[PROFILE] 檔案
+		[TELEPORT]瞬間傳送，[MAP]地圖，[PROFILE]檔案
 	</panel.string>
 	<panel.string name="date_fmt">
-		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+		[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]
 	</panel.string>
 	<panel.string name="auto_renew_on">
 		已啟用
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 e576a6a51e..58718dbb38 100644
--- a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
@@ -15,11 +15,14 @@
 	<string name="server_forbidden_text">
 		權限不足，無法取得此位置的資訊。  請向地塊所有者尋找你的權限。
 	</string>
+	<string name="acquired_date_ampm">
+		[year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [ampm,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+	</string>
 	<string name="acquired_date">
-		[wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
+		[year,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
 	</string>
 	<string name="information_text">
-		流量：[TRAFFIC] 區域：[AREA] 平方公尺
+		流量：[TRAFFIC]區域：[AREA]平方公尺
 	</string>
 	<layout_stack name="place_info_sidetray_main">
 		<layout_panel name="header_container">
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 2c6837d264..a028b0128b 100644
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
@@ -38,8 +38,11 @@
 	<string name="server_forbidden_text">
 		權限不足，無法取得此位置的資訊。  請向地塊所有者尋找你的權限。
 	</string>
+	<string name="acquired_date_ampm">
+		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [ampm,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local]
+	</string>
 	<string name="acquired_date">
-		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
 	<layout_stack name="place_info_sidetray_main">
 		<layout_panel name="header_container">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
index fda2c2febd..490765f459 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_firestorm.xml
@@ -61,7 +61,7 @@
 			<text name="PitchFromMousePositionText">度</text>
 			<slider label="水平傾斜角度：" tool_tip="我的頭部在水平方向上跟隨滑鼠的最大傾斜角度" name="YawFromMousePositionSlider" />
 			<text name="YawFromMousePositionText">度</text>
-			<text name="note_lookat">注視點設定在隱私索引標籤中</text>
+			<text name="note_lookat">注視目標設定在隱私索引標籤中</text>
 			<check_box label="禁用化身眼睛的隨機移動" name="FSStaticEyes" />
 			<text name="BeamPrefs">選擇光束效果</text>
 			<button name="BeamColor_delete" label="刪除" tool_tip="刪除此顏色預設" />
@@ -69,7 +69,7 @@
 			<button name="BeamColor_new" label="建立.." tool_tip="建立新的顏色預設" />
 			<button name="BeamColor_refresh" label="更新" tool_tip="更新預設列表" />
 			<slider name="FSMaxBeamsPerSecond" label="頻率：" tool_tip="每秒更新光束的頻率。預設為 40" />
-			<check_box label="啟用選擇光束" name="SLPartBeam" />
+			<check_box label="啟用選擇光束" name="SLPartBeam" tool_tip="停用此設定將停止在本端渲染選擇光束，但不會阻止向其他化身傳送選擇光束。若需完全隱藏選擇提示，請前往：偏好設定 → 隱私 → 注視目標 → 不分享我的目標選擇指示" />
 			<check_box label="將選擇傳送到聊天視窗" name="FSParticleChat" tool_tip="將選擇的資料（起始時間、結束時間和全域坐標）傳送到聊天頻道 9000。" />
 			<combo_box name="FSBeamShape_combo" tool_tip="選擇光束的形狀" />
 			<button name="delete_beam" label="刪除" width="75" tool_tip="刪除此形狀" />
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 888f4723f4..ee9b0680a5 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -21,6 +21,16 @@
 	<text name="language_textbox2">
 		（須重新啟動）
 	</text>
+	<text name="time_format_textbox">
+		時間格式：
+	</text>
+	<combo_box name="time_format_combobox">
+		<combo_box.item label="上午 1:00" name="12H"/>
+		<combo_box.item label="13:00" name="24H"/>
+	</combo_box>
+	<text name="time_format_textbox2">
+		（需重新啟動）
+	</text>
 	<check_box label="顯示 IME 文字輸入" name="use_ime" tool_tip="使用國際輸入法編輯器（IME），僅在需要特定語言如日語或中文時使用。" />
 	<text name="maturity_desired_prompt">
 		我能進入區域的內容分級：
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 705c1412bf..131a81341a 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -24,6 +24,14 @@
 			<text name="ignorecameraconstraints_requires_restart">(需要重新啟動)</text>
 			<check_box label="始終以不透明方式顯示相機控制視窗" name="FSAlwaysOpaqueCameraControls" />
 			<check_box label="在瞬間傳送後重新顯示暫時隱藏的物件" name="FSTempDerenderUntilTeleport" tool_tip="啟用後，瞬間傳送後暫時隱藏的物件將保持隱藏，直到下一次瞬間傳送。禁用後，這些物件將保持隱藏，直到對話結束或在元素封鎖清單視窗中手動重新顯示。" />
+			<text name="mouse_warp_lbl">
+				滑鼠歸位：
+			</text>
+			<combo_box name="mouse_warp_combo" tooltip="控制在Alt縮放和滑鼠觀察模式下，滑鼠是否自動跳轉至螢幕中心。">
+				<combo_box.item label="自動" name="0"/>
+				<combo_box.item label="開啟" name="1"/>
+				<combo_box.item label="關閉" name="2"/>
+			</combo_box>
 		</panel>
 		<panel label="第一人稱視角" name="tab-mouselook">
 			<check_box label="啟用第一人稱視角" name="EnableMouselook" tool_tip="允許第一人稱視角和使用滑鼠控制相機" />
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 caa8607340..827d1ce015 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
@@ -39,8 +39,8 @@
 			<check_box label="在記錄檔案名中新增日期" name="LogFileNamewithDate" tool_tip="在聊天和訊息記錄中新增日期，格式為聊天-YYYY-MM-DD和'私聊檔案名'-YYYY-MM。" />
 			<check_box label="使用內建的紀錄檢視器" name="FSUseBuiltInHistory" tool_tip="使用內建的紀錄檢視器檢視記錄。如果禁用，記錄將在作業系統中定義的文字編輯器中打開。" />
 		</panel>
-		<panel label="注視點" name="tab-lookat">
-			<check_box label="顯示誰在看誰：" name="showlookat" tool_tip="注視點允許您的檢視器知道您的眼睛、頭部和化身的朝向。它也可以用來確定化身的相機焦點。" />
+		<panel label="注視目標" name="tab-lookat">
+			<check_box label="顯示誰在看誰：" name="showlookat" tool_tip="注視目標允許您的檢視器知道您的眼睛、頭部和化身的朝向。它也可以用來確定化身的相機焦點。" />
 			<text name="lookatshownames" tool_tip="顯示凝視時顯示的名稱格式">顯示名稱：</text>
 			<combo_box name="lookatshownames_combobox">
 				<combo_box.item label="無" name="None" />
@@ -49,13 +49,13 @@
 				<combo_box.item label="繼承名稱" name="Legacy_Name" />
 				<combo_box.item label="使用者名稱" name="User_Name" />
 			</combo_box>
-			<check_box label="不顯示自己的注視點" name="LookAtHideOwn" tool_tip="不顯示自己的注視點" />
-			<check_box label="從化身到注視點繪製一條直線" name="ExodusLookAtLines" tool_tip="從化身到注視點繪製一條直線" />
-			<text name="mylookat">我的注視點：</text>
-			<check_box label="不向其他人公開我的注視點" name="privatelookat" tool_tip="不向其他人公開您的注視點" />
-			<check_box label="不共享注視點，包括自己" name="privateLocalLookat" tool_tip="防止您化身的頭部看向到您的相機對準的點。無論是否啟用此選項，其他人都不一定能看到頭部的移動" />
+			<check_box label="不顯示自己的注視目標" name="LookAtHideOwn" tool_tip="不顯示自己的注視目標" />
+			<check_box label="從化身到注視目標繪製一條直線" name="ExodusLookAtLines" tool_tip="從化身到注視目標繪製一條直線" />
+			<text name="mylookat">我的注視目標：</text>
+			<check_box label="不向其他人公開我的注視目標" name="privatelookat" tool_tip="不向其他人公開您的注視目標" />
+			<check_box label="不共享注視目標，包括自己" name="privateLocalLookat" tool_tip="防止您化身的頭部看向到您的相機對準的點。無論是否啟用此選項，其他人都不一定能看到頭部的移動" />
 			<check_box label="不共享我的目標選擇指示" name="privatepointat" tool_tip="不向其他人顯示選擇指示" />
-			<check_box label="限制與頭部的距離限制：" name="LimitLookAt" tool_tip="將你的注視點鎖定在目標的頭部周圍。" />
+			<check_box label="限制與頭部的距離限制：" name="LimitLookAt" tool_tip="將你的注視目標鎖定在目標的頭部周圍。" />
 		</panel>
 		<panel label="自動回復 1" name="tab-autoresponse-1">
 			<text name="autorespond_toggle_location_tip">注意：要啟用自動回覆訊息，請在「通訊」選單中設定您的在線狀態</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_classified.xml b/indra/newview/skins/default/xui/zh/panel_profile_classified.xml
index a9816cadf8..d5955da225 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile_classified.xml
@@ -7,13 +7,13 @@
 		一般普級內容
 	</panel.string>
 	<panel.string name="l$_price">
-		[PRICE] L$
+		[PRICE]L$
 	</panel.string>
 	<panel.string name="click_through_text_fmt">
-		[TELEPORT] 瞬間傳送，[MAP] 地圖，[PROFILE] 檔案
+		[TELEPORT]瞬間傳送，[MAP]地圖，[PROFILE]檔案
 	</panel.string>
 	<panel.string name="date_fmt">
-		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+		[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]
 	</panel.string>
 	<panel.string name="auto_renew_on">
 		已啟用
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 5b2ed6cdd9..6d232a366b 100644
--- a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
@@ -9,6 +9,9 @@
 	<string name="name_default_system_device">
 		預設系統裝置
 	</string>
+	<string name="device_not_loaded">
+		裝置未載入
+	</string>
 	<text name="Input">
 		輸入
 	</text>
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 2e6b29879a..2c2cd01cfb 100644
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -10,10 +10,10 @@
 		[hour, datetime, slt]:[min, datetime, slt]:[second, datetime, slt] [timezone, datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
-		[weekday, datetime, slt], [day, datetime, slt]. [month, datetime, slt] [year, datetime, slt]
+		[year, datetime, slt], [month, datetime, slt] [day, datetime, slt] [weekday, datetime, slt]
 	</panel.string>
 	<panel.string name="buycurrencylabel">
-		[AMT] L$
+		[AMT]L$
 	</panel.string>
 	<panel name="menu_search_panel">
 		<search_editor label="搜尋選項" name="search_menu_edit" tool_tip="在這裡輸入你想搜尋的字詞。 若在選項中有全文配對到結果，將會顯示部分結果。" />
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 864ffa4ede..c3b3cc82c8 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
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="teleport_history_item">
+	<panel.string name="DateFmt">
+		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc], [hour,datetime,utc]:[min,datetime,utc]
+	</panel.string>
+	<panel.string name="DateFmtAMPM">
+		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc], [ampm,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc]
+	</panel.string>
 	<button name="profile_btn" tool_tip="顯示物件資訊" />
 </panel>
\ No newline at end of file
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 2ea8dfb628..37eda09817 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
@@ -18,8 +18,11 @@
 	<panel.string name="owner_can">
 		所有者可以：
 	</panel.string>
+	<panel.string name="acquiredDateAMPM">
+		[year,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [ampm,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+	</panel.string>
 	<panel.string name="acquiredDate">
-		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+		[year,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
 	</panel.string>
 	<panel.string name="origin_inventory">
 		（庫存）
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index e09df881d4..8f7c158229 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -115,10 +115,10 @@ Voice Server Version: [VOICE_VERSION]
 		Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
 	</string>
 	<string name="AboutTime">
-		[month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt] SLT
+		[year, datetime, slt] [month, datetime, slt] [day, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt] SLT
 	</string>
 	<string name="LocalTime">
-		[month, datetime, local] [day, datetime, local] [year, datetime, local] [hour, datetime, local]:[min, datetime, local]:[second,datetime, local]
+		[year, datetime, local] [month, datetime, local] [day, datetime, local] [hour, datetime, local]:[min, datetime, local]:[second,datetime, local]
 	</string>
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		取得伺服器發行檔案URL失敗.
@@ -2642,7 +2642,7 @@ support@secondlife.com.
 	</string>
 	<!-- god tools -->
 	<string name="GodToolsObjectOwnedBy">
-		物件 [OBJECT] 所有者為 [OWNER]
+		物件[OBJECT]所有者為[OWNER]
 	</string>
 	<!-- groups -->
 	<string name="GroupsNone">
@@ -2655,7 +2655,7 @@ support@secondlife.com.
 	<string name="SummaryForTheWeek" value="本週總結，開始於 " />
 	<string name="NextStipendDay" value="下一個津貼日是 " />
 	<string name="GroupPlanningDate">
-		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc]
 	</string>
 	<string name="GroupIndividualShare" value="                      群組       個人份額" />
 	<string name="GroupColumn" value="                      群組" />
@@ -2943,14 +2943,14 @@ support@secondlife.com.
 	</string>
 	<!-- script editor -->
 	<string name="CursorPos">
-		橫排 [LINE], 豎排 [COLUMN]
+		橫排[LINE], 豎排[COLUMN]
 	</string>
 	<!-- panel dir browser -->
 	<string name="PanelDirCountFound">
-		找到 [COUNT]
+		找到[COUNT]
 	</string>
 	<string name="PanelDirTimeStr">
-		[hour12,datetime,slt]:[min,datetime,slt] [ampm,datetime,slt]
+		[ampm,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]
 	</string>
 	<!-- panel dir events -->
 	<string name="PanelDirEventsDateText">
@@ -2963,28 +2963,6 @@ support@secondlife.com.
 	<string name="PanelContentsNewScript">
 		新指令碼
 	</string>
-	<!-- panel preferences general -->
-	<string name="DoNotDisturbModeResponseDefault">
-		該居民處於「請勿打擾」狀態，不會立即看到你的訊息。
-	</string>
-	<string name="AutoResponseModeDefault">
-		當前居民已開啟 [APP_NAME] 檢視器的' '自動回復模式' 這意味著對方目前不想被打擾，你傳送的私聊資訊仍會顯示在對方的聊天界面中，以便對方稍後檢視。
-	</string>
-	<string name="AutoResponseModeNonFriendsDefault">
-		當前居民已開啟 [APP_NAME] 檢視器的' '自動回復模式' 這意味著對方目前不想被打擾，你傳送的私聊資訊仍會顯示在對方的聊天界面中，以便對方稍後檢視。
-	</string>
-	<string name="RejectTeleportOffersResponseDefault">
-		當前居民已開啟 [APP_NAME] 檢視器的' '禁止接收瞬間傳送請求和邀請模式' 這意味著對方目前不想受到傳送請求或邀請的打擾，但你仍可繼續傳送私聊資訊。
-	</string>
-	<string name="RejectFriendshipRequestsResponseDefault">
-		當前居民已開啟 [APP_NAME] 檢視器的' '拒絕所有好友請求模式' 這意味著對方被好友邀請打擾。但你仍可繼續傳送私聊資訊。
-	</string>
-	<string name="MutedAvatarsResponseDefault">
-		你已被當前居民阻止向其傳送任何資訊。
-	</string>
-	<string name="AwayAvatarResponseDefault">
-		當前居民不在電腦前，你傳送的私聊資訊仍會顯示在對方的聊天界面中，以便對方稍後檢視。
-	</string>
 	<!-- Mute -->
 	<string name="MuteByName">
 		(姓名)
@@ -3150,7 +3128,7 @@ support@secondlife.com.
 		支付額
 	</string>
 	<string name="GroupMoneyStartDate">
-		交易開始於 [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+		交易開始於[year,datetime,utc] [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc],
 	</string>
 	<!-- Viewer menu -->
 	<string name="AcquiredItems">
@@ -5573,13 +5551,13 @@ support@secondlife.com.
 	</string>
 	<!-- birth date format shared by avatar inspector and profile panels -->
 	<string name="AvatarBirthDateFormat">
-		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc]
 	</string>
 	<string name="AvatarBirthDateFormatShort">
 		[mthnum,datetime,utc]/[day,datetime,utc]
 	</string>
 	<string name="AvatarBirthDateFormat_legacy">
-		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+		[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]
 	</string>
 	<string name="DefaultMimeType">
 		無/無
@@ -7434,17 +7412,20 @@ SecondLife.com網站的「支援」部分
 	<string name="GroupNoticesPanelDateString">
 		[year,datetime,local]/[mthnum,datetime,local]/[day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
+	<string name="GroupNoticesPanelDateStringAMPM">
+		[year,datetime,local]/[mthnum,datetime,local]/[day,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [timezone,datetime,local]
+	</string>
 	<string name="GroupNoticesToastDateString">
-		[wkday,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [timezone,datetime,slt]
+		[year,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringLocal">
-		[mthnum,datetime,local]/[day,datetime,local]/[year,datetime,local] [hour,datetime,local]:[min,datetime,local]
+	<string name="GroupNoticesToastDateStringAMPM">
+		[year,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [wkday,datetime,slt] [ampm,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringUTC">
-		[mth,datetime,utc]/[day,datetime,utc]/[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
+	<string name="NotificationItemDateString">
+		[year,datetime,utc]/[mth,datetime,utc]/[day,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
 	</string>
-	<string name="NotificationItemDateStringSLT">
-		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt] [timezone,datetime,slt]
+	<string name="NotificationItemDateStringAMPM">
+	[year,datetime,utc]/[mth,datetime,utc]/[day,datetime,utc] [ampm,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
 	</string>
 	<string name="Pie_av_render_normally">
 		正常