Policy for DisableTelemetry. Also fix some wording

diff --git a/README.md b/README.md
index ea6126c7084b18c74adfc1825ff7e08598319120..9de8ec98c6182fbaafcde6584225410da42cca23 100644 (file)
--- a/README.md
+++ b/README.md
@@ -240,6 +240,15 @@ This policy prevents system add-ons from being updated or installed.
   }
 }
 ```
   }
 }
 ```

+### DisableTelemetry
+This policy prevents the upload of telemetry data. Mozilla strongly recommends that you do NOT disable telemetry if you do not have a business need to do so.
+```
+{
+  "policies": {
+    "DisableTelemetry": true
+  }
+}
+```

 ### DisplayBookmarksToolbar
 This policy turns on the bookmarks toolbar by default. A user can still turn it off and it will stay off.
 ```
 ### DisplayBookmarksToolbar
 This policy turns on the bookmarks toolbar by default. A user can still turn it off and it will stay off.
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index efe877ea39e626bbc6fbcbf3a7f30d75879e8058..c31d9da25a8c6ef5faf46e1e81de60f216ed1bea 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -36,7 +36,7 @@
       <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.
 
       <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>
+If this policy is disabled or not configured, 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>


@@ -56,7 +56,7 @@ If this policy is not configured or disabled, Firefox will not read certificates
       <string id="DisableForgetButton">Disable Forget Button</string>
       <string id="DisableForgetButton_Explain">If this policy is enabled, the &quot;Forget&quot; button is not available.
 
       <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>
+If this policy is disabled or not configured, 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="DisableFormHistory">Disable Form History</string>
       <string id="DisableFormHistory_Explain">Don't remember search and form history.</string>
       <string id="DisablePocket">Disable Pocket</string>


@@ -66,19 +66,25 @@ If this policy is not configured or disabled, the &quot;Forget&quot; button is a
       <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.
 
       <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>
+If this policy is disabled or not configured, 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="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.
 
       <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>
+If this policy is disabled or not configured, 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.
 
       <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>
+If this policy is disabled or not configured, 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="DisableSysAddonUpdate">Disable System Addon Updates</string>
       <string id="DisableSysAddonUpdate_Explain">Prevent the browser from installing and updating system addons.</string>

+      <string id="DisableTelemetry">Disable Telemetry</string>
+      <string id="DisableTelemetry_Explain">If this policy is enabled, telemetry is not uploaded.
+
+If this policy is disabled or not configured, telemetry is collected and uploaded.
+
+Mozilla strongly recommends that you do NOT disable telemetry if you do not have a business need to do so.</string>

       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>
       <string id="DisplayBookmarksToolbar_Explain">Causes the bookmarks toolbar to be displayed by default.</string>
       <string id="DisplayMenuBar">Display Menu Bar</string>
       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>
       <string id="DisplayBookmarksToolbar_Explain">Causes the bookmarks toolbar to be displayed by default.</string>
       <string id="DisplayMenuBar">Display Menu Bar</string>


@@ -91,10 +97,10 @@ If this policy is not configured or disabled, a user can choose to visit a harmf
       <string id="AddonsAllow_Explain">URLs to allow addons.</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.
 
       <string id="AddonsAllow_Explain">URLs to allow addons.</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>
+If this policy is disabled or not configured, 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.
 
       <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>
+If this policy is disabled or not configured, 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.
 
       <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.
 


@@ -102,18 +108,18 @@ If this policy is not configured or enabled, cookies are accepted from websites.
       <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.
 
       <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>
+This setting is ignored if this policy is disabled or not configured 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.
 
       <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>
+This setting is ignored if this policy is disabled or not configured 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.
 
       <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>
+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="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>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index d560c6007f7e541a03a7838ba846d2f54d08b40d..549a7384f0d7c4443ddaaf775a61f818851ad866 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -362,6 +362,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="DisableTelemetry" class="Both" displayName="$(string.DisableTelemetry)" explainText="$(string.DisableTelemetry_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableTelemetry">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>

     <policy name="DisplayBookmarksToolbar" class="Both" displayName="$(string.DisplayBookmarksToolbar)" explainText="$(string.DisplayBookmarksToolbar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayBookmarksToolbar">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
     <policy name="DisplayBookmarksToolbar" class="Both" displayName="$(string.DisplayBookmarksToolbar)" explainText="$(string.DisplayBookmarksToolbar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayBookmarksToolbar">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>