Merge branch 'master' into master

diff --git a/README.md b/README.md
index 4382301221ae244ce03bdd12930b59f306e20670..a680f791b20868217a1bce94ce5eba97c355942f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2048,32 +2048,56 @@ Set and lock certain preferences.
 **CCK2 Equivalent:** `preferences`\
 **Preferences Affected:** See below
 
-| Preference | Type | Compatibility
-| --- | --- | ---
-| app.update.auto | boolean | Firefox 68, Firefox 68 ESR
-| browser.cache.disk.enable | boolean | Firefox 68, Firefox 68 ESR
-| browser.cache.disk.parent_directory | string | Firefox 68, Firefox 68 ESR
-| browser.fixup.dns_first_for_single_words | boolean | Firefox 68, Firefox 68 ESR
-| browser.search.update | boolean | Firefox 68, Firefox 68 ESR
-| browser.tabs.warnOnClose | boolean | Firefox 68, Firefox 68 ESR
-| browser.urlbar.suggest.bookmark | boolean | Firefox 68, Firefox 68 ESR
-| browser.urlbar.suggest.history | boolean | Firefox 68, Firefox 68 ESR
-| browser.urlbar.suggest.openpage | boolean | Firefox 68, Firefox 68 ESR
-| datareporting.policy.dataSubmissionPolicyBypassNotification | boolean | Firefox 68, Firefox 68 ESR
-| dom.disable_window_flip | boolean | Firefox 68, Firefox 68 ESR
-| dom.disable_window_move_resize | boolean | Firefox 68, Firefox 68 ESR
-| dom.event.contextmenu.enabled | boolean | Firefox 68, Firefox 68 ESR
-| dom.keyboardevent.keypress.hack.dispatch_non_printable_keys.addl | string | Firefox 68, Firefox 68 ESR
-| dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl | string | Firefox 68, Firefox 68 ESR
-| extensions.getAddons.showPane | boolean | Firefox 68, Firefox 68 ESR
-| media.gmp-gmpopenh264.enabled | boolean | Firefox 68, Firefox 68 ESR
-| media.gmp-widevinecdm.enabled | boolean | Firefox 68, Firefox 68 ESR
-| network.dns.disableIPv6 | boolean | Firefox 68, Firefox 68 ESR
-| network.IDN_show_punycode | boolean | Firefox 68, Firefox 68 ESR
-| places.history.enabled | boolean | Firefox 68, Firefox 68 ESR
-| security.default_personal_cert | string | Firefox 68, Firefox 68 ESR
-| security.ssl.errorReporting.enabled | boolean | Firefox 68, Firefox 68 ESR
-| ui.key.menuAccessKeyFocuses | boolean | Firefox 68, Firefox 68 ESR
+| Preference | Type | Compatibility | Default
+| --- | --- | --- | ---
+| app.update.auto | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, Firefox doesn't automatically install update.
+| browser.cache.disk.enable | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, don't store cache on the hard drive.
+| browser.cache.disk.parent_directory | string | Firefox 68, Firefox 68 ESR | Profile temporary directory
+|     If set, changes the location of the disk cache.
+| browser.fixup.dns_first_for_single_words | boolean | Firefox 68, Firefox 68 ESR | false
+|     If true, single words are sent to DNS, not directly to search.
+| browser.search.update | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, updates for search engines are not checked.
+| browser.tabs.warnOnClose | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, there is no warning when the browser is closed.
+| browser.urlbar.suggest.bookmark | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, bookmarks aren't suggested when typing in the URL bar.
+| browser.urlbar.suggest.history | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, history isn't suggested when typing in the URL bar.
+| browser.urlbar.suggest.openpage | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, open tabs aren't suggested when typing in the URL bar.
+| datareporting.policy.dataSubmissionPolicyBypassNotification | boolean | Firefox 68, Firefox 68 ESR | false
+|     If true, don't show the privacy policy tab on first run.
+| dom.disable_window_flip | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, web pages can focus and activate windows.
+| dom.disable_window_move_resize | boolean | Firefox 68, Firefox 68 ESR | false
+|     If true, web pages can't move or resize windows.
+| dom.event.contextmenu.enabled | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, web pages can't override context menus.
+| dom.keyboardevent.keypress.hack.dispatch_non_printable_keys.addl | string | Firefox 68, Firefox 68 ESR | N/A
+|     See https://support.mozilla.org/en-US/kb/dom-events-changes-introduced-firefox-66
+| dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl | string | Firefox 68, Firefox 68 ESR | N/A
+|     See https://support.mozilla.org/en-US/kb/dom-events-changes-introduced-firefox-66
+| extensions.getAddons.showPane | boolean | Firefox 68, Firefox 68 ESR | N/A
+|     If false, the Recommendations tab is not displayed in the Add-ons Manager.
+| media.gmp-gmpopenh264.enabled | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, the OpenH264  plugin is not downloaded.
+| media.gmp-widevinecdm.enabled | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, the Widevine plugin is not downloaded.
+| network.dns.disableIPv6 | boolean | Firefox 68, Firefox 68 ESR | false
+|     If true, IPv6 DNS lokoups are disabled.
+| network.IDN_show_punycode | boolean | Firefox 68, Firefox 68 ESR | false
+|     If true, display the punycode version of internationalized domain names. 
+| places.history.enabled | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, history is not enabled.
+| security.default_personal_cert | string | Firefox 68, Firefox 68 ESR | Ask Every Time
+|     If set to Select Automatically, Firefox automatically chooses the default personal certificate.
+| security.ssl.errorReporting.enabled | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, SSL errors cannot be sent to Mozilla.
+| ui.key.menuAccessKeyFocuses | boolean | Firefox 68, Firefox 68 ESR | true
+|     If false, the Alt key doesn't show the menubar on Windows.
 #### Windows
 ```
 Software\Policies\Mozilla\Firefox\Preferences\boolean_preference_name = 0x1 | 0x0
@@ -2707,6 +2731,7 @@ Add a menuitem to the help menu for specifying support information.
 ```
 Software\Policies\Mozilla\Firefox\SupportMenu\Title = "Support Menu"
 Software\Policies\Mozilla\Firefox\SupportMenu\URL = "http://example.com/support"
+Software\Policies\Mozilla\Firefox\SupportMenu\AccessKey = "S"
 ```
 #### macOS
 ```

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 6c0690035c9a1e2a3cbc995d06de4d26479a0238..9c8faed48efc95d8e3d36fdcc67fd951bb4813c6 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -15,7 +15,7 @@
       <string id="SUPPORTED_FF6801">Firefox 68.0.1 o posterior, Firefox 68.0.1 ESR o posterior</string>
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR o posterior</string>
       <string id="SUPPORTED_FF69">Firefox 69 o posterior, Firefox 68.1 ESR o posterior</string>
-      <string id="SUPPORTED_FF69">Firefox 70 o posterior, Firefox 68.2 ESR o posterior</string>
+      <string id="SUPPORTED_FF70">Firefox 70 o posterior, Firefox 68.2 ESR o posterior</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permisos</string>
       <string id="Camera_group">Camera</string>
@@ -736,7 +736,7 @@ Si esta política está deshabilitada o no está configurada, no se añadirá ni
         <dropdownList refId="SSLVersion"/>
       </presentation>
       <presentation id="SupportMenu">
-        <text>Title:</text>
+        <text>Título:</text>
         <textBox refId="SupportMenuTitle">
           <label/>
         </textBox>
@@ -744,7 +744,7 @@ Si esta política está deshabilitada o no está configurada, no se añadirá ni
         <textBox refId="SupportMenuURL">
           <label/>
         </textBox>
-        <text>Access key:</text>
+        <text>Clave de acceso:</text>
         <textBox refId="SupportMenuAccessKey">
           <label/>
         </textBox>