Merge pull request #49 from mozilla/InstallAddons_Updates

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index c31d9da25a8c6ef5faf46e1e81de60f216ed1bea..e3971c466cc90ce8ebc5b79569e374304c1b60d8 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -13,10 +13,11 @@
       <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>

+      <string id="Extensions_group">Extensions</string>

       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>

-      <string id="Allow">Allow</string>
-      <string id="Block">Block</string>
+      <string id="Allow">Allowed Sites</string>
+      <string id="Block">Blocked Sites</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_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>


@@ -91,10 +92,30 @@ Mozilla strongly recommends that you do NOT disable telemetry if you do not have
       <string id="DisplayMenuBar_Explain">Causes the menu bar to be displayed by default.</string>
       <string id="DontCheckDefaultBrowser">Don't Check Default Browser</string>
       <string id="DontCheckDefaultBrowser_Explain">Don't check for the default browser on startup.</string>
       <string id="DisplayMenuBar_Explain">Causes the menu bar to be displayed by default.</string>
       <string id="DontCheckDefaultBrowser">Don't Check Default Browser</string>
       <string id="DontCheckDefaultBrowser_Explain">Don't check for the default browser on startup.</string>

+      <string id="Extensions_Install">Install</string>
+      <string id="Extensions_Install_Explain">If this policy is enabled, you can specify a list of extension URLs or paths that will be installed when Firefox is started.
+Anytime this list is changed, the extensions will be reinstalled.
+
+If this policy is disabled or not configured, no extensions are installed.</string>
+      <string id="Extensions_Uninstall">Uninstall</string>
+      <string id="Extensions_Uninstall_Explain">If this policy is enabled, you can specify a list of extension IDs that will be uninstalled.
+Anytime this list is changed, the extensions will be uninstalled.
+
+If this policy is disabled or not configured, no extensions are uninstalled.</string>
+      <string id="Extensions_Locked">Locked</string>
+      <string id="Extensions_Locked_Explain">If this policy is enabled, you can specify a list of extension IDs that the user will be unable to uninstall or disable.
+
+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="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="AddonsAllow_Explain">URLs to allow addons.</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_Default">Allow add-on installs from websites</string>
+      <string id="InstallAddons_Default_Explain">If this policy is disabled, add-ons cannot be installed.
+
+If this policy is not configured or enabled, add-ons can be installed.</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 disabled or not configured, the default cookie policy is followed.</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 disabled or not configured, the default cookie policy is followed.</string>


@@ -120,8 +141,23 @@ This setting is ignored if this policy is disabled or not configured or if cooki
       <string id="Cookies_Locked_Explain">If this policy is enabled cookie preferences cannot be changed by the user.
 
 If this policy is disabled or not configured, the user can change their cookie preferences.</string>
       <string id="Cookies_Locked_Explain">If this policy is enabled cookie preferences cannot be changed by the user.
 
 If this policy is disabled or not configured, 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="FlashPlugin_Allow_Explain">If this policy is enabled, Flash is activated by default for the URLS indicated unless Flash is completely disabled. If a top level domain is specified (http://example.org), Flash is allowed for all subdomains as well.
+
+If this policy is disabled or not configured, the default Flash policy is followed.</string>
+      <string id="FlashPlugin_Block_Explain">If this policy is enabled, Flash is blocked for the URLS indicated. If a top level domain is specified (http://example.org), Flas is blocked from all subdomains as well.
+
+If this policy is disabled or not configured, the default Flash policy is followed.</string>
+      <string id="FlashPlugin_Default">Activate Flash on websites</string>
+      <string id="FlashPlugin_Default_Explain">If this policy is enabled, Flash is always activates on websites.
+
+If this policy is disabled, Flash is never activated on websites, even if they are in the specified in the Allow list.
+
+If this policy is not configured Flash, Flash is click to play.</string>
+      <string id="FlashPlugin_Locked">Do not allow preferences to be changed</string>
+      <string id="FlashPlugin_Locked_Explain">If this policy is enabled Flash preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change their Flash preferences.</string>
+

       <string id="Bookmark1">Bookmark 1</string>
       <string id="Bookmark2">Bookmark 2</string>
       <string id="Bookmark3">Bookmark 3</string>
       <string id="Bookmark1">Bookmark 1</string>
       <string id="Bookmark2">Bookmark 2</string>
       <string id="Bookmark3">Bookmark 3</string>


@@ -161,14 +197,14 @@ If this policy is enabled, private browsing is enabled by default in both the br
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>

+      <presentation id="Extensions">
+        <listBox refId="Extensions"/>
+      </presentation>

       <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></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="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </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">
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
       </presentation>
       <presentation id="TrackingProtection">
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
       </presentation>