Merge pull request #987 from gregstoll/master

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

diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 758a8c9e01a1cc04437d00a3b2c08397b480e793..0469c728cce33c25279cd4de6a01a25f8d878b01 100644 (file)
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="4.1" schemaVersion="1.0">
+<policyDefinitionResources revision="4.7" schemaVersion="1.0">
  <displayName/>
  <description/>
  <resources>
@@ -279,10 +279,17 @@
 若禁用或不设定此原则，则会收集并上传 Telemetry 资料。 
 
 Mozilla 建议您不要禁用 Telemetry。 透过 Telemetry 收集到的信息可帮助为企业用户打造更好的产品。 </string>
-   <string id="DisplayBookmarksToolbar">显示书签工具栏</string>
+   <string id="DisplayBookmarksToolbar">显示书签工具栏（已弃用）</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">若启用此原则，默认将显示菜单列。 用户还是可以将其隐藏。 
 
@@ -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="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。
 
 若需要偏好设置的详细说明，请参考：
@@ -1245,7 +1256,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
    </presentation>
    <presentation id="DisplayMenuBar">
 <dropdownList refId="DisplayMenuBar"/>
-   </presentation>
+   </presentation>\
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
    <presentation id="String">
 <textBox refId="String">
      <label/>