Rename AcceptThirdParty enums

diff --git a/README.md b/README.md
index a769b7311bf8afdddb2296a1ccfb2fa7fdb0f70a..f73e47824f8e8d6aed51c3e571d3e3f398f7bd7d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ This policy controls various settings related to cookies.
       "Allow": ["http://example.org/"], /* Domains where cookies are always allowed */
       "Block": ["http://example.edu/"], /* Domains where cookies are always blocked */
       "Default": [true|false], /* This sets the default value for "Accept cookies from websites" */
       "Allow": ["http://example.org/"], /* Domains where cookies are always allowed */
       "Block": ["http://example.edu/"], /* Domains where cookies are always blocked */
       "Default": [true|false], /* This sets the default value for "Accept cookies from websites" */

-      "AcceptThirdParty": ["all", "none", "from-visited"], /* This sets the default value for "Accept third-party cookies" */
+      "AcceptThirdParty": ["always", "never", "from-visited"], /* This sets the default value for "Accept third-party cookies" */

       "ExpireAtSessionEnd":  [true|false], /* This determines when cookies expire */
       "Locked": [true|false] /* If this is true, cookies preferences can't be changed */
     }
       "ExpireAtSessionEnd":  [true|false], /* This determines when cookies expire */
       "Locked": [true|false] /* If this is true, cookies preferences can't be changed */
     }

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 8324911dea9223b10a6a726667fd7fae8b3fcf1b..a18a28f0632fe3add600f2248fba95e4f4996164 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -159,12 +159,12 @@
         <enum id="Cookies_AcceptThirdParty" valueName="Cookies_AcceptThirdParty">
           <item displayName="$(string.Cookies_AcceptThirdParty_All)">
             <value>
         <enum id="Cookies_AcceptThirdParty" valueName="Cookies_AcceptThirdParty">
           <item displayName="$(string.Cookies_AcceptThirdParty_All)">
             <value>

-              <string>all</string>
+              <string>always</string>

             </value>
           </item>
           <item displayName="$(string.Cookies_AcceptThirdParty_None)">
             <value>
             </value>
           </item>
           <item displayName="$(string.Cookies_AcceptThirdParty_None)">
             <value>

-              <string>none</string>
+              <string>never</string>

             </value>
           </item>
           <item displayName="$(string.Cookies_AcceptThirdParty_FromVisited)">
             </value>
           </item>
           <item displayName="$(string.Cookies_AcceptThirdParty_FromVisited)">