Add support for emptying bookmarks. Fixes #817.

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

diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 109a28ab0049486c5209643d663592b4d7385b7b..e87c35c0677e6f813aee8c9c6b46e79f95573a12 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"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="2.11" schemaVersion="1.0">
+<policyDefinitionResources revision="3.3" schemaVersion="1.0">

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


@@ -40,6 +40,7 @@
    <string id="SUPPORTED_FF88">Firefox 88 或更新版本、Firefox 78.10 ESR 或更新版本</string>
    <string id="SUPPORTED_FF89">Firefox 89 或更新版本、Firefox 78.11 ESR 或更新版本</string>
    <string id="SUPPORTED_FF90">Firefox 90 或更新版本、Firefox 78.12 ESR 或更新版本</string>
    <string id="SUPPORTED_FF88">Firefox 88 或更新版本、Firefox 78.10 ESR 或更新版本</string>
    <string id="SUPPORTED_FF89">Firefox 89 或更新版本、Firefox 78.11 ESR 或更新版本</string>
    <string id="SUPPORTED_FF90">Firefox 90 或更新版本、Firefox 78.12 ESR 或更新版本</string>

+   <string id="SUPPORTED_FF91">Firefox 91 或更新版本</string>

    <string id="firefox">Firefox</string>
 <string id="Permissions_group">权限</string>
    <string id="Camera_group">摄像头</string>
    <string id="firefox">Firefox</string>
 <string id="Permissions_group">权限</string>
    <string id="Camera_group">摄像头</string>


@@ -835,6 +836,16 @@ If this policy is disabled or not configured, onboarding messages will be shown
 若禁用或不设定此原则，则不修改偏好设定。
 
 若需要建立原则的详细信息，请参考 https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 </string>
 若禁用或不设定此原则，则不修改偏好设定。
 
 若需要建立原则的详细信息，请参考 https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 </string>

+      <string id="Bookmarks">Bookmarks (JSON)</string>
+      <string id="Bookmarks_Explain">If this policy is enabled, you can use JSON to configure bookmarks, including [] to clear all bookmarks.
+
+If this policy is disabled or not configured, the individual bookmark policies are used.
+
+If this policy is enabled along with individual bookmarks, those bookmarks will not be added.
+
+This policy has no effect on Managed Bookmarks.
+
+For detailed information on the JSON, see https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks.</string>

    <string id="ManagedBookmarks">受管理的书签</string>
    <string id="ManagedBookmarks_Explain">若启用此原则，您可以使用 JSON 文件来指定受管理的书签。
 
    <string id="ManagedBookmarks">受管理的书签</string>
    <string id="ManagedBookmarks_Explain">若启用此原则，您可以使用 JSON 文件来指定受管理的书签。
 


@@ -855,6 +866,10 @@ If this policy is enabled or not configured, application updates may be installe
 If this policy is disabled or not configured, any site that invokes an external protocol will ask the user for permission.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#autolaunchprotocolsfromorigins.</string>
 If this policy is disabled or not configured, any site that invokes an external protocol will ask the user for permission.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#autolaunchprotocolsfromorigins.</string>

+    <string id="WindowsSSO">Windows SSO</string>
+    <string id="WindowsSSO_Explain">If this policy is enabled, Firefox will use credentials stored in Windows to sign in to Microsoft, work, and school accounts.
+
+If this policy is disabled or not configured, credentials must be entered manually.</string>

    <string id="Preferences_Boolean_Explain">若启用此原则，偏好设定将锁定为 true。 若禁用此原则，偏好设定则锁定为false。
 
 若需要偏好设置的详细说明，请参考：
    <string id="Preferences_Boolean_Explain">若启用此原则，偏好设定将锁定为 true。 若禁用此原则，偏好设定则锁定为false。
 
 若需要偏好设置的详细说明，请参考：


@@ -1038,6 +1053,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
 <textBox refId="SearchEngine_PostData">
      <label>POST 数据：</label>
     </textBox>
 <textBox refId="SearchEngine_PostData">
      <label>POST 数据：</label>
     </textBox>

+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>

    </presentation>
    <presentation id="SearchEngines_Default">
 <textBox refId="SearchEngines_Default">
    </presentation>
    <presentation id="SearchEngines_Default">
 <textBox refId="SearchEngines_Default">