Merge pull request #987 from gregstoll/master

[policy-templates.git] / windows / zh-TW / firefox.adml

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index c3023bf4d946527601f0278c62ef431f48e25b3b..6d857639ade33d281d7a49a2d26f105ecd27c579 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="4.1" schemaVersion="1.0" >
+<policyDefinitionResources revision="4.7" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
   <displayName/>
   <description/>
   <resources >


@@ -279,10 +279,17 @@
 若停用或不設定此原則，則會收集並上傳 Telemetry 資料。
 
 Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可幫助為企業使用者打造更好的產品。</string>
 若停用或不設定此原則，則會收集並上傳 Telemetry 資料。
 
 Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可幫助為企業使用者打造更好的產品。</string>

-      <string id="DisplayBookmarksToolbar">顯示書籤工具列</string>
+      <string id="DisplayBookmarksToolbar">顯示書籤工具列（已棄用）</string>

       <string id="DisplayBookmarksToolbar_Explain">若啟用此原則，預設將顯示書籤工具列。使用者還是可以將其隱藏。
 
 若停用或不設定此原則，則預設不會顯示書籤工具列。</string>
       <string id="DisplayBookmarksToolbar_Explain">若啟用此原則，預設將顯示書籤工具列。使用者還是可以將其隱藏。
 
 若停用或不設定此原則，則預設不會顯示書籤工具列。</string>

+      <string id="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+      <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+      <string id="DisplayBookmarksToolbar_Always">Always</string>
+      <string id="DisplayBookmarksToolbar_Never">Never</string>
+      <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>

       <string id="DisplayMenuBar">顯示選單列（已棄用）</string>
       <string id="DisplayMenuBar_Explain">若啟用此原則，預設將顯示選單列。使用者還是可以將其隱藏。
 
       <string id="DisplayMenuBar">顯示選單列（已棄用）</string>
       <string id="DisplayMenuBar_Explain">若啟用此原則，預設將顯示選單列。使用者還是可以將其隱藏。
 


@@ -939,6 +946,10 @@ If this policy is disabled or not configured, Firefox will to the download folde
       <string id="GoToIntranetSiteForSingleWordEntryInAddressBar_Explain">If this policy is enabled, typing single word entries in the address bar will attempt to navigate to intranet sites first, falling back to search if the DNS request fails.
 
 If this policy is disabled or not configured, typing single word entries in the address bar will search.</string>
       <string id="GoToIntranetSiteForSingleWordEntryInAddressBar_Explain">If this policy is enabled, typing single word entries in the address bar will attempt to navigate to intranet sites first, falling back to search if the DNS request fails.
 
 If this policy is disabled or not configured, typing single word entries in the address bar will search.</string>

+      <string id="AppUpdatePin">Pin updates to a specific version</string>
+      <string id="AppUpdatePin_Explain">If this policy is enabled, you can specify a Firefox version as xx. or xx.xx. and Firefox will not be updated beyond that major or minor version.
+
+If this policy is disabled or not configured, Firefox will update normally.</string>

       <string id="Preferences_Boolean_Explain">若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。
 
 若需要偏好設定的詳細說明，請參考：
       <string id="Preferences_Boolean_Explain">若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。
 
 若需要偏好設定的詳細說明，請參考：


@@ -1246,6 +1257,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>

+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>

       <presentation id="String">
         <textBox refId="String">
           <label/>
       <presentation id="String">
         <textBox refId="String">
           <label/>