Merge branch 'mozilla:master' into master

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

diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 41e1b4ab1dd7abf0dd1994446ba00b580e545b24..d24202837bbec6b3bbb66f96cad7b15f229aa9fa 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="5.8" schemaVersion="1.0">
+<policyDefinitionResources revision="5.9" schemaVersion="1.0">

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


@@ -1076,6 +1076,16 @@ If this policy is disabled or not configured, the user can change their Firefox
       <string id="PrintingEnabled_Explain">If this policy is disabled, printing is disabled.
 
 If this policy is enabled or not configured, printing is enabled.</string>
       <string id="PrintingEnabled_Explain">If this policy is disabled, printing is disabled.
 
 If this policy is enabled or not configured, printing is enabled.</string>

+      <string id="ManualAppUpdateOnly">Manual Update Only</string>
+      <string id="ManualAppUpdateOnly_Explain">If this policy is enabled, users will not be prompted to install updates and Firefox will not check for updates in the background. The user must manually check and install updates from the About dialog.
+
+If this policy is disabled or not configured, the browser receives updates.
+
+This policy is not recommended for most users.</string>
+      <string id="AllowFileSelectionDialogs">Allow File Selection Dialogs</string>
+      <string id="AllowFileSelectionDialogs_Explain">If this policy is disabled, users will not be able to open file selection dialogs. In most cases, Firefox will act as if the user clicked the cancel button.
+
+If this policy is enabled or not configured, users can open file selection dialogs.</string>

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