Merge pull request #45 from mozilla/DisableSecurityBypass_Policy

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index d67882d8bf15b5ccb1f359f41cc2b2d1539fce84..efe877ea39e626bbc6fbcbf3a7f30d75879e8058 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -7,7 +7,9 @@
       <string id="SUPPORTED_WINXPSP2">Microsoft Windows XP SP2 or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="SUPPORTED_WINXPSP2">Microsoft Windows XP SP2 or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>

+      <string id="Authentication_group">Authentication</string>

       <string id="Bookmarks_group">Bookmarks</string>
       <string id="Bookmarks_group">Bookmarks</string>

+      <string id="Certificates_group">Certificates</string>

       <string id="Popups_group">Popups</string>
       <string id="Cookies_group">Cookies</string>
       <string id="Addons_group">Addons</string>
       <string id="Popups_group">Popups</string>
       <string id="Cookies_group">Cookies</string>
       <string id="Addons_group">Addons</string>


@@ -15,6 +17,12 @@
       <string id="Homepage_group">Home page</string>
       <string id="Allow">Allow</string>
       <string id="Block">Block</string>
       <string id="Homepage_group">Home page</string>
       <string id="Allow">Allow</string>
       <string id="Block">Block</string>

+      <string id="Authentication_SPNEGO">SPNEGO</string>
+      <string id="Authentication_SPNEGO_Explain">List of sites that are permitted to engage in SPNEGO authentication with the browser.</string>
+      <string id="Authentication_Delegated">Delegated</string>
+      <string id="Authentication_Delegated_Explain">List of sites for which the browser may delegate user authorization to the server.</string>
+      <string id="Authentication_NTLM">NTLM</string>
+      <string id="Authentication_NTLM_Explain">List of sites trusted to use NTLM authentification.</string>

       <string id="BlockAboutAddons">Block About Addons</string>
       <string id="BlockAboutAddons_Explain" >Block access to the Add-ons Mananger (about:addons).</string>      
       <string id="BlockAboutConfig">Block About Config</string>
       <string id="BlockAboutAddons">Block About Addons</string>
       <string id="BlockAboutAddons_Explain" >Block access to the Add-ons Mananger (about:addons).</string>      
       <string id="BlockAboutConfig">Block About Config</string>


@@ -25,6 +33,10 @@
       <string id="BlockAboutSupport_Explain">Blocks access to the about:support page.</string>
       <string id="BlockSetDesktopBackground">Block Set Desktop Background</string>
       <string id="BlockSetDesktopBackground_Explain">Prevents usage of the &quot;Set Image as Desktop Background&quot; feature.</string>
       <string id="BlockAboutSupport_Explain">Blocks access to the about:support page.</string>
       <string id="BlockSetDesktopBackground">Block Set Desktop Background</string>
       <string id="BlockSetDesktopBackground_Explain">Prevents usage of the &quot;Set Image as Desktop Background&quot; feature.</string>

+      <string id="Certificates_ImportEnterpriseRoots">Import Enterprise Roots</string>
+      <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
+
+If this policy is not configured or disabled, Firefox will not read certificates from the Windows certificate store.</string>

       <string id="CreateMasterPassword">Create Master Password</string>
       <string id="CreateMasterPassword_Explain">If false, removes access to create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>
       <string id="CreateMasterPassword">Create Master Password</string>
       <string id="CreateMasterPassword_Explain">If false, removes access to create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>


@@ -41,14 +53,30 @@
       <string id="DisableFirefoxScreenshots_Explain">Prevents usage of the Firefox Screenshots feature.</string>
       <string id="DisableFirefoxStudies">Disable Firefox Studies</string>
       <string id="DisableFirefoxStudies_Explain">Prevents Firefox from running studies.</string>
       <string id="DisableFirefoxScreenshots_Explain">Prevents usage of the Firefox Screenshots feature.</string>
       <string id="DisableFirefoxStudies">Disable Firefox Studies</string>
       <string id="DisableFirefoxStudies_Explain">Prevents Firefox from running studies.</string>

+      <string id="DisableForgetButton">Disable Forget Button</string>
+      <string id="DisableForgetButton_Explain">If this policy is enabled, the &quot;Forget&quot; button is not available.
+
+If this policy is not configured or disabled, the &quot;Forget&quot; button is available.</string>

       <string id="DisableFormHistory">Disable Form History</string>
       <string id="DisableFormHistory_Explain">Don't remember search and form history.</string>
       <string id="DisablePocket">Disable Pocket</string>
       <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</string>
       <string id="DisableFormHistory">Disable Form History</string>
       <string id="DisableFormHistory_Explain">Don't remember search and form history.</string>
       <string id="DisablePocket">Disable Pocket</string>
       <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</string>

+      <string id="DisableProfileRefresh">Disable Profile Refresh</string>
+      <string id="DisableProfileRefresh_Explain">If this policy is enabled, the &quot;Refresh Firefox&quot; button is not available on the about:support page or on support.mozilla.org.
+
+If this policy is not configured or disabled, the &quot;Refresh Firefox&quot; button is available.</string>

       <string id="DisableSafeMode">Disable Safe Mode</string>
       <string id="DisableSafeMode_Explain">Prevents ability to restart in safe mode.</string>
       <string id="DisableSafeMode">Disable Safe Mode</string>
       <string id="DisableSafeMode_Explain">Prevents ability to restart in safe mode.</string>

+      <string id="DisableSecurityBypass_InvalidCertificate">Prevent overriding certificate errors</string>
+      <string id="DisableSecurityBypass_InvalidCertificate_Explain">If this policy is enabled, the &quot;Add Exception&quot; button is not available when a certificate is invalid. This prevents the user from overriding the certificate error.
+
+If this policy is not configured or disabled, certificate errors can be overridden.</string>
+      <string id="DisableSecurityBypass_SafeBrowsing">Prevent overriding safe browsing errors</string>
+      <string id="DisableSecurityBypass_SafeBrowsing_Explain">If this policy is enabled, a user can not bypass the warning and visit a harmful site.
+
+If this policy is not configured or disabled, a user can choose to visit a harmful site.</string>

       <string id="DisableSysAddonUpdate">Disable System Addon Updates</string>
       <string id="DisableSysAddonUpdate_Explain">Prevent the browser from installing and updating system addons.</string>
       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>
       <string id="DisableSysAddonUpdate">Disable System Addon Updates</string>
       <string id="DisableSysAddonUpdate_Explain">Prevent the browser from installing and updating system addons.</string>
       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>


@@ -61,8 +89,31 @@
       <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="AddonsAllow_Explain">URLs to allow addons.</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="AddonsAllow_Explain">URLs to allow addons.</string>

-      <string id="CookiesAllow_Explain">URLs to allow cookies.</string>
-      <string id="CookiesBlock_Explain">URLs to block cookies.</string>
+      <string id="Cookies_Allow_Explain">If this policy is enabled, cookies are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+
+If this policy is not configured or disabled, the default cookie policy is followed.</string>
+      <string id="Cookies_Block_Explain">If this policy is enabled, cookies are blocked for the URLS indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well.
+
+If this policy is not configured or disabled, cookies are not blocked by default.</string>
+      <string id="Cookies_Default">Accept cookies from websites</string>
+      <string id="Cookies_Default_Explain">If this policy is disabled, cookies are not accepted from websites by default.
+
+If this policy is not configured or enabled, cookies are accepted from websites.</string>
+      <string id="Cookies_AcceptThirdParty">Accept third-party cookies</string>
+      <string id="Cookies_AcceptThirdParty_Explain">If this policy is enabled and cookies are allowed, you can set when to accept third-party cookies.
+
+This setting is ignored if this policy is not configured or disabled or if cookies are not allowed.</string>
+      <string id="Cookies_AcceptThirdParty_All">Always</string>
+      <string id="Cookies_AcceptThirdParty_None">Never</string>
+      <string id="Cookies_AcceptThirdParty_FromVisited">From visited</string>
+      <string id="Cookies_ExpireAtSessionEnd">Keep cookies until Firefox is closed</string>
+      <string id="Cookies_ExpireAtSessionEnd_Explain">If this policy is enabled and cookies are allowed, they will expire when Firefox is closed.
+
+This setting is ignored if this policy is not configured or disabled or if cookies are not allowed.</string>
+      <string id="Cookies_Locked">Do not allow preferences to be changed</string>
+      <string id="Cookies_Locked_Explain">If this policy is enabled cookie preferences cannot be changed by the user.
+
+If this policy is not configured or disabled, the user can change their cookie preferences.</string>

       <string id="FlashAllow_Explain">URLs to allow Flash.</string>
       <string id="FlashBlock_Explain">URLs to block Flash.</string>
       <string id="Bookmark1">Bookmark 1</string>
       <string id="FlashAllow_Explain">URLs to allow Flash.</string>
       <string id="FlashBlock_Explain">URLs to block Flash.</string>
       <string id="Bookmark1">Bookmark 1</string>


@@ -101,10 +152,15 @@ If this policy is disabled, tracking protection is disabled and locked in both t
 If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it.</string>
     </stringTable>
     <presentationTable>
 If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it.</string>
     </stringTable>
     <presentationTable>

+      <presentation id="Authentication">
+        <listBox refId="Authentication"/>
+      </presentation>
+      <presentation id="Permissions"><listBox refId="Permissions"/></presentation>

       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
       <presentation id="AddonsAllow"><listBox refId="AddonsAllowDesc">Allow add-ons for websites</listBox></presentation>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
       <presentation id="AddonsAllow"><listBox refId="AddonsAllowDesc">Allow add-ons for websites</listBox></presentation>

-      <presentation id="CookiesAllow"><listBox refId="CookiesAllowDesc">Allow cookies for websites</listBox></presentation>
-      <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
+      <presentation id="Cookies_AcceptThirdParty">
+        <dropdownList refId="Cookies_AcceptThirdParty"/>
+      </presentation>

       <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
       <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
       <presentation id="TrackingProtection">
       <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
       <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
       <presentation id="TrackingProtection">