]> git.p6c8.net - policy-templates.git/commitdiff
Merge pull request #585 from mozilla/DisabledCiphers
authorMichael Kaply <345868+mkaply@users.noreply.github.com>
Thu, 23 Apr 2020 20:56:39 +0000 (15:56 -0500)
committerGitHub <noreply@github.com>
Thu, 23 Apr 2020 20:56:39 +0000 (15:56 -0500)
Initial checkin of new policy DisabledCiphers

1  2 
README.md
mac/org.mozilla.firefox.plist
windows/de-DE/firefox.adml
windows/en-US/firefox.adml
windows/es-ES/firefox.adml
windows/firefox.admx
windows/fr-FR/firefox.adml
windows/it-IT/firefox.adml
windows/zh-TW/firefox.adml

diff --combined README.md
index 7152523797dd686dbf00263df7edb728ae3b7ce7,f57233966df8ce77a87bf04dd57ff63f3f7f921f..089b93ca5d660080c173926d1986aa217f4c63a8
+++ b/README.md
@@@ -23,6 -23,7 +23,7 @@@ Policies can be specified using the Gro
  | **[`DisableMasterPasswordCreation`](#disablemasterpasswordcreation)** | Remove the master password functionality.
  | **[`DisableAppUpdate`](#disableappupdate)** | Turn off application updates.
  | **[`DisableBuiltinPDFViewer`](#disablebuiltinpdfviewer)** | Disable the built in PDF viewer.
+ | **[`DisabledCiphers`](#disabledciphers)** | Disable ciphers.
  | **[`DisableDefaultBrowserAgent`](#disabledefaultbrowseragent)** | Prevent the default browser agent from taking any actions (Windows only).
  | **[`DisableDeveloperTools`](#disabledevelopertools)** | Remove access to all developer tools.
  | **[`DisableFeedbackCommands`](#disablefeedbackcommands)** | Disable the menus for reporting sites.
@@@ -690,6 -691,69 +691,69 @@@ Software\Policies\Mozilla\Firefox\Disab
    }
  }
  ```
+ ### DisabledCiphers
+ Disable specific cryptographic ciphers.
+ **Compatibility:** Firefox 68.8, Firefox ESR 76\
+ **CCK2 Equivalent:** N/A\
+ **Preferences Affected:** N/A
+ #### Windows (GPO)
+ ```
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_DHE_RSA_WITH_AES_128_CBC_SHA = 0x1 | 0x0
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_DHE_RSA_WITH_AES_256_CBC_SHA = 0x1 | 0x0
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA = 0x1 | 0x0
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0x1 | 0x0
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = 0x1 | 0x0
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 = 0x1 | 0x0
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_RSA_WITH_AES_128_CBC_SHA = 0x1 | 0x0
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_RSA_WITH_AES_256_CBC_SHA = 0x1 | 0x0
+ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_RSA_WITH_3DES_EDE_CBC_SHA = 0x1 | 0x0
+ ```
+ #### macOS
+ ```
+ <dict>
+   <key>DisabledCiphers</key>
+     <dict>
+       <key>TLS_DHE_RSA_WITH_AES_128_CBC_SHA</key>
+       <true/> | <false/>
+       <key>TLS_DHE_RSA_WITH_AES_256_CBC_SHA</key>
+       <true/> | <false/>
+       <key>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</key>
+       <true/> | <false/>
+       <key>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</key>
+       <true/> | <false/>
+       <key>TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</key>
+       <true/> | <false/>
+       <key>TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</key>
+       <true/> | <false/>
+       <key>TLS_RSA_WITH_AES_128_CBC_SHA</key>
+       <true/> | <false/>
+       <key>TLS_RSA_WITH_AES_256_CBC_SHA</key>
+       <true/> | <false/>
+       <key>TLS_RSA_WITH_3DES_EDE_CBC_SHA</key>
+       <true/> | <false/>
+     </dict>
+ </dict>
+ ```
+ #### policies.json
+ ```
+ {
+   "policies": {
+     "DisabledCiphers" {
+       "TLS_DHE_RSA_WITH_AES_128_CBC_SHA": true | false,
+       "TLS_DHE_RSA_WITH_AES_256_CBC_SHA": true | false,
+       "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA": true | false,
+       "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA": true | false,
+       "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256": true | false,
+       "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256": true | false,
+       "TLS_RSA_WITH_AES_128_CBC_SHA": true | false,
+       "TLS_RSA_WITH_AES_256_CBC_SHA": true | false,
+       "TLS_RSA_WITH_3DES_EDE_CBC_SHA": true | false
+     }
+   }
+ }
+ ```
  ### DisableDefaultBrowserAgent
  Prevent the default browser agent from taking any actions. Only applicable to Windows; other platforms don’t have the agent.
  
@@@ -2117,11 -2181,9 +2181,11 @@@ Set permissions associated with camera
  
  `Locked` prevents the user from changing preferences for the feature.
  
 -**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6\
 +`Default` specifies the default value for Autoplay. block-audio-video is not supported on Firefox ESR 68.
 +
 +**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6, Autoplay Default/Locked added in Firefox 76, Firefox ESR 68.8)\
  **CCK2 Equivalent:** N/A\
 -**Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`
 +**Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`,`media.autoplay.default`
  
  #### Windows (GPO)
  ```
@@@ -2144,8 -2206,6 +2208,8 @@@ Software\Policies\Mozilla\Firefox\Permi
  Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
  Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Allow\1 = "https://example.org"
  Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://example.edu"
 +Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Default = "allow-audio-video" | "block-audio" | "block-audio-video"
 +Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Locked = 0x1 | 0x0
  ```
  #### macOS
  ```
          <string>https://example.edu</string>
        </array>
        <key>BlockNewRequests</key>
 -      <true/>
 +      <true/> | <false/>
        <key>Locked</key>
 -      <true/>
 +      <true/> | <false/>
      </dict>
      <key>Microphone</key>
      <dict>
          <string>https://example.edu</string>
        </array>
        <key>BlockNewRequests</key>
 -      <true/>
 +      <true/> | <false/>
        <key>Locked</key>
 -      <true/>
 +      <true/> | <false/>
      </dict>
      <key>Location</key>
      <dict>
          <string>https://example.edu</string>
        </array>
        <key>BlockNewRequests</key>
 -      <true/>
 +      <true/> | <false/>
        <key>Locked</key>
 -      <true/>
 +      <true/> | <false/>
      </dict>
      <key>Notifications</key>
      <dict>
        <array>
          <string>https://example.edu</string>
        </array>
 +      <key>Default</key>
 +      <string>allow-audio-video | block-audio | block-audio-video</string>
 +      <key>Locked</key>
 +      <true/> | <false/>
      </dict>
    </dict>
  </dict>
        },
        "Autoplay": {
          "Allow": ["https://example.org"],
 -        "Block": ["https://example.edu"]
 +        "Block": ["https://example.edu"],
 +        "Default": "allow-audio-video" | "block-audio" | "block-audio-video",
 +        "Locked": true | false
        }
      }
    }
index 3aa4b0f4dd9ddbc6ac4cce69b8dae5c061520cfe,ec4d852336ae90b74618404662dc91027b798f3a..17343d3fb39f34c38141a5fc4c665b0b03548301
        <true/>
        <key>DisableBuiltinPDFViewer</key>
        <true/>
+       <key>DisabledCiphers</key>
+       <dict>
+               <key>TLS_DHE_RSA_WITH_AES_128_CBC_SHA</key>
+               <true/>
+               <key>TLS_DHE_RSA_WITH_AES_256_CBC_SHA</key>
+               <true/>
+               <key>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</key>
+               <true/>
+               <key>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</key>
+               <true/>
+               <key>TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</key>
+               <true/>
+               <key>TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</key>
+               <true/>
+               <key>TLS_RSA_WITH_AES_128_CBC_SHA</key>
+               <true/>
+               <key>TLS_RSA_WITH_AES_256_CBC_SHA</key>
+               <true/>
+               <key>TLS_RSA_WITH_3DES_EDE_CBC_SHA</key>
+               <true/>
+     </dict>
        <key>DisableDeveloperTools</key>
        <true/>
        <key>DisableFeedbackCommands</key>
                        <array>
                                <string>https://example.edu</string>
                        </array>
 +                      <key>Default</key>
 +                              <string>block-audio</string>
 +                      <key>Locked</key>
 +                      <true/>
                </dict>
        </dict>
        <key>PopupBlocking</key>
index 9ca80fc6ab1b999590713965bc2deb16d457d650,6b2aa39a72ec5d1fc1313d85e650093beeb99c73..c9b7b18d48eeb0b6ed7143f6415ee11a0393099f
@@@ -45,6 -45,7 +45,7 @@@
        <string id="Search_group">Suche</string>
        <string id="Preferences_group">Einstellungen</string>
        <string id="UserMessaging_group">Benutzer-Benachrichtigungen</string>
+       <string id="DisabledCiphers_group">Disabled Ciphers</string>
        <string id="Allow">Erlaubte Seiten</string>
        <string id="Block">Gesperrte Seiten</string>
        <string id="AppAutoUpdate">Automatisches Update</string>
@@@ -422,19 -423,6 +423,19 @@@ Wenn diese Richtlinieneinstellung deakt
        <string id="Autoplay_Block_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist die Automatische Wiedergabe für die genannten Quellen immer deaktiviert.
  
  Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert, wird die Standardeinstellung zur Automatischen Wiedergabe von Medien befolgt.</string>
 +      <string id="Autoplay_Default">Default autoplay level</string>
 +      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
 +
 +If this policy is disabled or not configured, audio is blocked by default.
 +
 +Note: Blocking audio and video does not work on the ESR.</string>
 +      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
 +      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
 +
 +If this policy is disabled or not configured, the user can change autoplay preferences.</string>
 +      <string id="AllowAudioVideo">Allow Audio and Video</string>
 +      <string id="BlockAudio">Block Audio</string>
 +      <string id="BlockAudioVideo">Block Audio and Video</string>
        <string id="FirefoxHome">Firefox Home anpassen</string>
        <string id="FirefoxHome_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können die Sektionen festgelegt werden, die der Anwender sieht und der Anwender kann diese nicht mehr anpassen.
  
@@@ -721,6 -709,42 +722,42 @@@ Wenn diese Richtlinie aktiviert oder ni
        <string id="UserMessaging_UrlbarInterventions_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, werden  basierend darauf, was der Benutzer in die Adressleiste eingibt, keine Aktionen empfohlen.
  
  Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, werden Aktionen empfohlen, die darauf basieren, was der Benutzer in die Adressleiste eingibt.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA">TLS_DHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA">TLS_DHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA">TLS_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA">TLS_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA">TLS_RSA_WITH_3DES_EDE_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled.</string>
        <string id="Preferences_Boolean_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist die Einstellung auf true gesperrt. Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Einstellung auf false gesperrt.
  
  Für eine Beschreibung der Einstellung, siehe:
@@@ -1019,9 -1043,6 +1056,9 @@@ https://github.com/mozilla/policy-templ
        <presentation id="List">
          <listBox refId="List"/>
        </presentation>
 +      <presentation id="Autoplay_Default">
 +        <dropdownList refId="Autoplay_Default"/>
 +      </presentation>
      </presentationTable>
    </resources>
  </policyDefinitionResources>
index 6458473206ab2d69d2e71fa0d9b817a2f36d78c1,c44ba4fb0c822cb2f5fbaeb3bdbad024eae7197e..7c5dae130b16c7f0c2b8824e2be59250be0dc13c
@@@ -45,6 -45,7 +45,7 @@@
        <string id="Search_group">Search</string>
        <string id="Preferences_group">Preferences</string>
        <string id="UserMessaging_group">User Messaging</string>
+       <string id="DisabledCiphers_group">Disabled Ciphers</string>
        <string id="Allow">Allowed Sites</string>
        <string id="Block">Blocked Sites</string>
        <string id="AppAutoUpdate">Application Autoupdate</string>
@@@ -422,19 -423,6 +423,19 @@@ If this policy is disabled or not confi
        <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.
  
  If this policy is disabled or not configured, the default autoplay policy is followed.</string>
 +      <string id="Autoplay_Default">Default autoplay level</string>
 +      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
 +
 +If this policy is disabled or not configured, audio is blocked by default.
 +
 +Note: Blocking audio and video does not work on the ESR.</string>
 +      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
 +      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
 +
 +If this policy is disabled or not configured, the user can change autoplay preferences.</string>
 +      <string id="AllowAudioVideo">Allow Audio and Video</string>
 +      <string id="BlockAudio">Block Audio</string>
 +      <string id="BlockAudioVideo">Block Audio and Video</string>
        <string id="FirefoxHome">Customize Firefox Home</string>
        <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.
  
@@@ -723,6 -711,42 +724,42 @@@ If this policy is enabled or not config
        <string id="UserMessaging_UrlbarInterventions_Explain">If this policy is disabled, actions will not be recommended based on what the user types in the URL bar.
  
  If this policy is enabled or not configured, actions will be recommended based on what the user types in the URL bar.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA">TLS_DHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA">TLS_DHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA">TLS_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA">TLS_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA">TLS_RSA_WITH_3DES_EDE_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled.</string>
        <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
  
  For a description of the preference, see:
@@@ -1020,9 -1044,6 +1057,9 @@@ https://github.com/mozilla/policy-templ
        <presentation id="List">
          <listBox refId="List"/>
        </presentation>
 +      <presentation id="Autoplay_Default">
 +        <dropdownList refId="Autoplay_Default"/>
 +      </presentation>
      </presentationTable>
    </resources>
  </policyDefinitionResources>
index 5c9d896c9ef382c7470e11279d34f94d98dc72aa,b52ea671048f1cb4cded1a8e356d02c9a86c01f2..9bed40af0687686c1c84b4b97a5da25dc172b600
@@@ -45,6 -45,7 +45,7 @@@
        <string id="Search_group">Búsqueda</string>
        <string id="Preferences_group">Preferencias</string>
        <string id="UserMessaging_group">User Messaging</string>
+       <string id="DisabledCiphers_group">Disabled Ciphers</string>
        <string id="Allow">Sitios permitidos</string>
        <string id="Block">Sitios bloqueados</string>
        <string id="AppAutoUpdate">Application Autoupdate</string>
@@@ -422,19 -423,6 +423,19 @@@ Si esta política está deshabilitada 
        <string id="Autoplay_Block_Explain">Si esta política está habilitada, la reproducción automática siempre se bloqueará para los orígenes indicados.
  
  Si esta política está deshabilitada o no está configurada, se seguirá la política predeterminada de reproducción automática.</string>
 +      <string id="Autoplay_Default">Default autoplay level</string>
 +      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
 +
 +If this policy is disabled or not configured, audio is blocked by default.
 +
 +Note: Blocking audio and video does not work on the ESR.</string>
 +      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
 +      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
 +
 +If this policy is disabled or not configured, the user can change autoplay preferences.</string>
 +      <string id="AllowAudioVideo">Allow Audio and Video</string>
 +      <string id="BlockAudio">Block Audio</string>
 +      <string id="BlockAudioVideo">Block Audio and Video</string>
        <string id="FirefoxHome">Personalizar inicio de Firefox</string>
        <string id="FirefoxHome_Explain">Si esta política está habilitada, podrá elegir las secciones que se muestran en la página de inicio de Firefox e impedir que el usuario las cambie.
  
@@@ -723,6 -711,42 +724,42 @@@ If this policy is enabled or not config
        <string id="UserMessaging_UrlbarInterventions_Explain">If this policy is disabled, actions will not be recommended based on what the user types in the URL bar.
  
  If this policy is enabled or not configured, actions will be recommended based on what the user types in the URL bar.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA">TLS_DHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA">TLS_DHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA">TLS_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA">TLS_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA">TLS_RSA_WITH_3DES_EDE_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled.</string>
        <string id="Preferences_Boolean_Explain">Si esta política está habilitada, la preferencia se bloquea en true. Si esta política está deshabilitada, la preferencia está bloqueada en false.
  
  Para una descripción de la preferencia, visite:
@@@ -1020,9 -1044,6 +1057,9 @@@ https://github.com/mozilla/policy-templ
        <presentation id="List">
          <listBox refId="List"/>
        </presentation>
 +      <presentation id="Autoplay_Default">
 +        <dropdownList refId="Autoplay_Default"/>
 +      </presentation>
      </presentationTable>
    </resources>
  </policyDefinitionResources>
diff --combined windows/firefox.admx
index 6a007d9e2924f0071f2893f40413bff618f4bb19,f18d859b45802c31d662284898f7de980067c742..77ed391a55fd44a59f5835a2bc897023db3a578d
@@@ -97,6 -97,9 +97,9 @@@
      <category displayName="$(string.UserMessaging_group)" name="UserMessaging">
        <parentCategory ref="firefox"/>
      </category>
+     <category displayName="$(string.DisabledCiphers_group)" name="DisabledCiphers">
+       <parentCategory ref="firefox"/>
+     </category>
    </categories>
    <policies>
      <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
          <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block" valuePrefix=""/>
        </elements>
      </policy>
 +    <policy name="Autoplay_Locked" class="Both" displayName="$(string.Autoplay_Locked)" explainText="$(string.Autoplay_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Autoplay" valueName="Locked">
 +      <parentCategory ref="Autoplay"/>
 +      <supportedOn ref="SUPPORTED_FF76"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
 +    <policy name="Autoplay_Default" class="Both" displayName="$(string.Autoplay_Default)" explainText="$(string.Autoplay_Default_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Autoplay"  presentation="$(presentation.Autoplay_Default)">
 +      <parentCategory ref="Autoplay"/>
 +      <supportedOn ref="SUPPORTED_FF76"/>
 +      <elements>
 +        <enum id="Autoplay_Default" valueName="Default">
 +          <item displayName="$(string.AllowAudioVideo)">
 +            <value>
 +              <string>allow-audio-video</string>
 +            </value>
 +          </item>
 +          <item displayName="$(string.BlockAudio)">
 +            <value>
 +              <string>block-audio</string>
 +            </value>
 +          </item>
 +          <item displayName="$(string.BlockAudioVideo)">
 +            <value>
 +              <string>block-audio-video</string>
 +            </value>
 +          </item>
 +        </enum>
 +      </elements>
 +    </policy>
      <policy name="DefaultDownloadDirectory" class="Both" displayName="$(string.DefaultDownloadDirectory)" explainText="$(string.DefaultDownloadDirectory_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Preferences_String)">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_FF68"/>
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA)" explainText="$(string.DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_DHE_RSA_WITH_AES_128_CBC_SHA">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA)" explainText="$(string.DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_DHE_RSA_WITH_AES_256_CBC_SHA">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA)" explainText="$(string.DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA)" explainText="$(string.DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256)" explainText="$(string.DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256)" explainText="$(string.DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA)" explainText="$(string.DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_RSA_WITH_AES_128_CBC_SHA">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA)" explainText="$(string.DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_RSA_WITH_AES_256_CBC_SHA">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA)" explainText="$(string.DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_RSA_WITH_3DES_EDE_CBC_SHA">
+       <parentCategory ref="DisabledCiphers"/>
+       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
    </policies>
  </policyDefinitions>
index a684fbc7fe6313f251ad78dc9247fd7dec8ac73b,c951f8055d93ad27712be48b27370ae9b4b0f1f0..fcb350432a13f33ca012bbf66ea29745c038b718
@@@ -45,6 -45,7 +45,7 @@@
        <string id="Search_group">Recherche</string>\r
        <string id="Preferences_group">Préférences</string>\r
        <string id="UserMessaging_group">User Messaging</string>\r
+       <string id="DisabledCiphers_group">Disabled Ciphers</string>\r
        <string id="Allow">Sites autorisés</string>\r
        <string id="Block">Sites bloqués</string>\r
        <string id="AppAutoUpdate">Application Autoupdate</string>\r
@@@ -422,19 -423,6 +423,19 @@@ If this policy is disabled or not confi
        <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.\r
  \r
  If this policy is disabled or not configured, the default autoplay policy is followed.</string>\r
 +      <string id="Autoplay_Default">Default autoplay level</string>\r
 +      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.\r
 +\r
 +If this policy is disabled or not configured, audio is blocked by default.\r
 +\r
 +Note: Blocking audio and video does not work on the ESR.</string>\r
 +      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>\r
 +      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.\r
 +\r
 +If this policy is disabled or not configured, the user can change autoplay preferences.</string>\r
 +      <string id="AllowAudioVideo">Allow Audio and Video</string>\r
 +      <string id="BlockAudio">Block Audio</string>\r
 +      <string id="BlockAudioVideo">Block Audio and Video</string>\r
        <string id="FirefoxHome">Customize Firefox Home</string>\r
        <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.\r
  \r
@@@ -723,6 -711,42 +724,42 @@@ If this policy is enabled or not config
        <string id="UserMessaging_UrlbarInterventions_Explain">If this policy is disabled, actions will not be recommended based on what the user types in the URL bar.\r
  \r
  If this policy is enabled or not configured, actions will be recommended based on what the user types in the URL bar.</string>\r
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA">TLS_DHE_RSA_WITH_AES_128_CBC_SHA</string>\r
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>\r
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA">TLS_DHE_RSA_WITH_AES_256_CBC_SHA</string>\r
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>\r
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</string>\r
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>\r
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</string>\r
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>\r
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</string>\r
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>\r
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</string>\r
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>\r
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA">TLS_RSA_WITH_AES_128_CBC_SHA</string>\r
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>\r
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA">TLS_RSA_WITH_AES_256_CBC_SHA</string>\r
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>\r
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA">TLS_RSA_WITH_3DES_EDE_CBC_SHA</string>\r
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled.\r
\r
+ If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled.</string>\r
        <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.\r
  \r
  For a description of the preference, see:\r
@@@ -1020,9 -1044,6 +1057,9 @@@ https://github.com/mozilla/policy-templ
        <presentation id="List">\r
          <listBox refId="List"/>\r
        </presentation>\r
 +      <presentation id="Autoplay_Default">\r
 +        <dropdownList refId="Autoplay_Default"/>\r
 +      </presentation>\r
      </presentationTable>\r
    </resources>\r
  </policyDefinitionResources>\r
index 50bc666a1055e176342a03158572c9b8a6ac8484,b46d4be43a648eda0f4f0a71a0a181b271eab58f..4e5d70ba62a3369b0f2a462485178ca428ddd6fd
@@@ -45,6 -45,7 +45,7 @@@
        <string id="Search_group">Ricerca</string>
        <string id="Preferences_group">Preferenze</string>
        <string id="UserMessaging_group">Messaggi utente</string>
+       <string id="DisabledCiphers_group">Disabled Ciphers</string>
        <string id="Allow">Siti consentiti</string>
        <string id="Block">Siti bloccati</string>
        <string id="AppAutoUpdate">Aggiornamento automatico applicazione</string>
@@@ -422,19 -423,6 +423,19 @@@ Se questo criterio è disabilitato o no
        <string id="Autoplay_Block_Explain">Se questo criterio è abilitato, la riproduzione automatica sarà sempre bloccata per le origini indicate.
  
  Se questo criterio è disabilitato o non configurato, viene seguito il criterio predefinito per la riproduzione automatica.</string>
 +      <string id="Autoplay_Default">Default autoplay level</string>
 +      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
 +
 +If this policy is disabled or not configured, audio is blocked by default.
 +
 +Note: Blocking audio and video does not work on the ESR.</string>
 +      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
 +      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
 +
 +If this policy is disabled or not configured, the user can change autoplay preferences.</string>
 +      <string id="AllowAudioVideo">Allow Audio and Video</string>
 +      <string id="BlockAudio">Block Audio</string>
 +      <string id="BlockAudioVideo">Block Audio and Video</string>
        <string id="FirefoxHome">Personalizza pagina iniziale di Firefox</string>
        <string id="FirefoxHome_Explain">Se questo criterio è abilitato, è possibile scegliere le sezioni visualizzate nella pagina iniziale di Firefox e impedire all'utente di modificarle.
  
@@@ -723,6 -711,42 +724,42 @@@ Se questo criterio è abilitato o non c
        <string id="UserMessaging_UrlbarInterventions_Explain">Se questo criterio è disabilitato, non saranno consigliate azioni basate su quanto l'utente ha digitato nella barra degli indirizzi.
  
  Se questo criterio è abilitato o non configurato, saranno consigliate azioni basate su quanto l'utente ha digitato nella barra degli indirizzi.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA">TLS_DHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA">TLS_DHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA">TLS_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA">TLS_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA">TLS_RSA_WITH_3DES_EDE_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled.</string>
        <string id="Preferences_Boolean_Explain">Se questo criterio è abilitato, la preferenza è impostata a Vero e resa non modificabile. Se questo criterio è disabilitato, la preferenza è impostata a Falso e resa non modificabile.
  
  Per una descrizione della preferenza, si veda:
@@@ -1020,9 -1044,6 +1057,9 @@@ https://github.com/mozilla/policy-templ
        <presentation id="List">
          <listBox refId="List"/>
        </presentation>
 +      <presentation id="Autoplay_Default">
 +        <dropdownList refId="Autoplay_Default"/>
 +      </presentation>
      </presentationTable>
    </resources>
  </policyDefinitionResources>
index e38eb94a75125a08438d09a42ae2878295f8d968,7c07f39d378b028f34ad2deec786ae0d6373c573..b1da63f3a2c7fe49016cf8d9ddd620c62f601b45
@@@ -45,6 -45,7 +45,7 @@@
        <string id="Search_group">搜尋</string>
        <string id="Preferences_group">偏好設定</string>
        <string id="UserMessaging_group">顯示給使用者的訊息</string>
+       <string id="DisabledCiphers_group">Disabled Ciphers</string>
        <string id="Allow">允許的網站</string>
        <string id="Block">封鎖的網站</string>
        <string id="AppAutoUpdate">應用程式自動更新</string>
@@@ -420,19 -421,6 +421,19 @@@ Mozilla 建議您不要停用 Telemetry
        <string id="Autoplay_Block_Explain">若啟用此原則,將永遠針對指定的來源封鎖自動播放。
  
  若停用或不設定此原則,將遵循預設自動播放原則。</string>
 +      <string id="Autoplay_Default">Default autoplay level</string>
 +      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
 +
 +If this policy is disabled or not configured, audio is blocked by default.
 +
 +Note: Blocking audio and video does not work on the ESR.</string>
 +      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
 +      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
 +
 +If this policy is disabled or not configured, the user can change autoplay preferences.</string>
 +      <string id="AllowAudioVideo">Allow Audio and Video</string>
 +      <string id="BlockAudio">Block Audio</string>
 +      <string id="BlockAudioVideo">Block Audio and Video</string>
        <string id="FirefoxHome">自訂 Firefox 首頁</string>
        <string id="FirefoxHome_Explain">若啟用此原則,將可以設定要在 Firefox 首頁顯示哪些段落,並防止使用者更改設定。
  
        <string id="UserMessaging_UrlbarInterventions_Explain">若停用此原則,將不會在使用者在網址列輸入時推薦操作行為。
  
  若啟用或不設定此原則,則會根據使用者在網址列輸入的內容推薦操作行為。</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA">TLS_DHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA">TLS_DHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</string>
+       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_Explain">If this policy is disabled, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is disabled.
+ If this policy is enabled or not configured, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA">TLS_RSA_WITH_AES_128_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA">TLS_RSA_WITH_AES_256_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is enabled.</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA">TLS_RSA_WITH_3DES_EDE_CBC_SHA</string>
+       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled.
+ If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled.</string>
        <string id="Preferences_Boolean_Explain">若啟用此原則,偏好設定將鎖定為 true。若停用此原則,偏好設定則鎖定為 false。
  
  若需要偏好設定的詳細說明,請參考:
@@@ -1018,9 -1042,6 +1055,9 @@@ https://github.com/mozilla/policy-templ
        <presentation id="List">
          <listBox refId="List"/>
        </presentation>
 +      <presentation id="Autoplay_Default">
 +        <dropdownList refId="Autoplay_Default"/>
 +      </presentation>
      </presentationTable>
    </resources>
  </policyDefinitionResources>

patrick-canterino.de