Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 46 insertions, 0 deletions

diff --git a/l10n-es-MX/toolkit/crashreporter/crashreporter.ftl b/l10n-es-MX/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..0c44c9f6fc
--- /dev/null
+++ b/l10n-es-MX/toolkit/crashreporter/crashreporter.ftl
@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+crashreporter-title = Reporte de fallos
+crashreporter-crash-message = { -brand-short-name } tuvo un problema y se cerró.
+crashreporter-plea = Ayúdanos a diagnosticar el problema para poder repararlo enviando el reporte de fallos generado.
+# $details (String) - the reason that a crash report cannot be submitted
+crashreporter-error-details = Detalles: { $details }
+crashreporter-no-run-message = Esta aplicación se está ejecutando después de un fallo para reportarlo con su creador. No deberías ejecutarlo directamente.
+crashreporter-button-details = Detalles…
+crashreporter-view-report-title = Contenido del reporte
+crashreporter-comment-prompt = Ingresa tu comentario (público)
+crashreporter-report-info = Este reporte también contiene información técnica sobre el estado de la aplicación al ocurrir el fallo.
+crashreporter-submit-status = Tu reporte de fallo se enviará antes que salgas o reinicies.
+crashreporter-submit-in-progress = Enviando el reporte de fallos…
+crashreporter-submit-success = Reporte enviado satisfactoriamente
+crashreporter-submit-failure = Ocurrió un problema al enviar el reporte de fallos.
+crashreporter-resubmit-status = Enviando reportes de fallos pendientes…
+crashreporter-button-quit = Salir de { -brand-short-name }
+crashreporter-button-restart = Reiniciar { -brand-short-name }
+crashreporter-button-ok = Aceptar
+crashreporter-button-close = Cerrar
+# $id (String) - the crash id from the server, typically a UUID
+crashreporter-crash-identifier = ID del fallo: { $id }
+
+# Error strings
+
diff --git a/l10n-es-MX/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-es-MX/toolkit/toolkit/formautofill/formAutofill.ftl
index 3753055248..1efb223bcc 100644
--- a/l10n-es-MX/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-es-MX/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -14,6 +14,8 @@ autofill-options-link-osx = Preferencias de llenado automático de formularios
 
 # Used on the doorhanger when an credit card change is detected.
 
+# Label for the button in the dropdown menu used to clear the populated form.
+autofill-clear-form-label = Limpiar formularios de autollenado
 
 ## These are brand names and should only be translated when a locale-specific name for that brand is in common use
 
@@ -26,3 +28,19 @@ autofill-card-network-mastercard = MasterCard
 autofill-card-network-mir = MIR
 autofill-card-network-unionpay = Union Pay
 autofill-card-network-visa = Visa
+# The warning text that is displayed for informing users what categories are
+# about to be filled.  The text would be, for example,
+#   Also autofills organization, phone, email.
+# Variables:
+#   $categories - one or more of the categories, see autofill-category-X below
+autofill-phishing-warningmessage-extracategory = También llenar automáticamente { $categories }
+# Variation when all are in the same category.
+# Variables:
+#   $categories - one or more of the categories
+autofill-phishing-warningmessage = Rellena { $categories } automáticamente
+# Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
+autofill-category-address = dirección
+autofill-category-name = nombre
+autofill-category-organization = organización
+autofill-category-tel = teléfono
+autofill-category-email = correo