Merge pull request #54 from mozilla/PopupBlocking_Policy

[policy-templates.git] / windows / en-US / firefox.adml

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index d3d981def38f25ba157341c78e6813e1eaffe48f..7e962f8e54b2d77f915288997be722058fcbfa89 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -108,7 +108,17 @@ If this policy is disabled or not configured, no extensions are uninstalled.</st
 If this policy is disabled or not configured, no extensions are locked.</string>
       <string id="RememberPasswords">Remember Passwords</string>
       <string id="RememberPasswords_Explain">Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted.</string>
 If this policy is disabled or not configured, no extensions are locked.</string>
       <string id="RememberPasswords">Remember Passwords</string>
       <string id="RememberPasswords_Explain">Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted.</string>

-      <string id="PopupsAllow_Explain">URLs to allow popups.</string>
+      <string id="PopupBlocking_Allow_Explain">If this policy is enabled, pop-up windows are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well.
+
+If this policy is disabled or not configured, the default pop-up policy is followed.</string>
+      <string id="PopupBlocking_Default">Allow pop-ups from websites</string>
+      <string id="PopupBlocking_Default_Explain">If this policy is disabled, pop-up windows are allowed from websites by default.
+
+If this policy is not configured or enabled, popups are not allowed from websites.</string>
+      <string id="PopupBlocking_Locked">Do not allow preferences to be changed</string>
+      <string id="PopupBlocking_Locked_Explain">If this policy is enabled pop-up preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change their pop-up preferences.</string>

       <string id="InstallAddons_Allow_Explain">If this policy is enabled, add-ons are always allowed for the URLS indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well.
 
 If this policy is disabled or not configured, the default add-on policy is followed.</string>
       <string id="InstallAddons_Allow_Explain">If this policy is enabled, add-ons are always allowed for the URLS indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well.
 
 If this policy is disabled or not configured, the default add-on policy is followed.</string>