Merging upstream version 126.0.

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

4 files changed, 31 insertions, 2 deletions

diff --git a/l10n-nn-NO/toolkit/crashreporter/crashreporter.ftl b/l10n-nn-NO/toolkit/crashreporter/crashreporter.ftl
index 8a418bfa1d..71acb941d9 100644
--- a/l10n-nn-NO/toolkit/crashreporter/crashreporter.ftl
+++ b/l10n-nn-NO/toolkit/crashreporter/crashreporter.ftl
@@ -2,8 +2,6 @@
 # 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 = Krasjrapportering
-crashreporter-crash-message = { -brand-short-name } fekk problem og krasja.
 crashreporter-plea = For å hjelpa oss å stilla diagnose og å ordna problemet, kan du senda oss ein krasjrapport.
 # $details (String) - the reason that a crash report cannot be submitted
 crashreporter-error-details = Detaljar: { $details }
@@ -26,3 +24,4 @@ crashreporter-crash-identifier = Krasj-ID: { $id }
 
 # Error strings
 
+crashreporter-error-no-home-dir = Manglar heimemappe
diff --git a/l10n-nn-NO/toolkit/toolkit/about/aboutWebauthn.ftl b/l10n-nn-NO/toolkit/toolkit/about/aboutWebauthn.ftl
index 689620530f..a2e26b48ce 100644
--- a/l10n-nn-NO/toolkit/toolkit/about/aboutWebauthn.ftl
+++ b/l10n-nn-NO/toolkit/toolkit/about/aboutWebauthn.ftl
@@ -28,13 +28,16 @@ about-webauthn-results-general-error = Feil!
 ## Labels
 
 about-webauthn-new-pin-label = Ny PIN-kode:
+about-webauthn-repeat-pin-label = Repeter ny PIN-kode:
 about-webauthn-current-pin-label = Gjeldande PIN-kode:
+about-webauthn-pin-required-label = Skriv inn PIN-koden din:
 about-webauthn-credential-list-subsection-title = Innloggingsdetaljar:
 about-webauthn-enrollment-name-label = Registreringsnamn (valfritt):
 about-webauthn-confirm-deletion-label = Du er i ferd med å slette:
 
 ## Buttons
 
+about-webauthn-current-set-pin-button = Vel PIN-kode
 about-webauthn-current-change-pin-button = Endre PIN-kode
 # List is a verb, as in "Show list of credentials"
 about-webauthn-list-credentials-button = List opp innloggingsdetaljar
@@ -55,6 +58,8 @@ about-webauthn-auth-option-up = Brukarnærvær
 about-webauthn-auth-option-clientpin = Klient PIN-kode
 about-webauthn-auth-option-rk = Resident-nøkkel
 about-webauthn-auth-option-plat = Plattformeining
+about-webauthn-auth-option-largeblobs = Store blobbar
+about-webauthn-auth-option-bioenroll = Biometrisk registrering
 # Shows when boolean value for an option is True. True should not be translated.
 about-webauthn-auth-option-true = True
 # Shows when boolean value of an option is False. False should not be translated.
diff --git a/l10n-nn-NO/toolkit/toolkit/contentanalysis/contentanalysis.ftl b/l10n-nn-NO/toolkit/toolkit/contentanalysis/contentanalysis.ftl
index 5ca96a7ded..9cd7027c5b 100644
--- a/l10n-nn-NO/toolkit/toolkit/contentanalysis/contentanalysis.ftl
+++ b/l10n-nn-NO/toolkit/toolkit/contentanalysis/contentanalysis.ftl
@@ -3,4 +3,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 contentanalysis-operationtype-clipboard = utklippstavle
+contentanalysis-operationtype-dropped-text = sleppt tekst
+#   $filename - The filename associated with the request, such as "aFile.txt"
+contentanalysis-customdisplaystring-description = opplasting av «{ $filename }»
+contentanalysis-warndialog-response-allow = Bruk innhald
 contentanalysis-warndialog-response-deny = Avbryt
+contentanalysis-inprogress-quit-title = Avslutte { -brand-shorter-name }?
+contentanalysis-inprogress-quit-yesbutton = Ja, avslutt
diff --git a/l10n-nn-NO/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-nn-NO/toolkit/toolkit/formautofill/formAutofill.ftl
index d83b50f3d5..102260e560 100644
--- a/l10n-nn-NO/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-nn-NO/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -11,13 +11,32 @@ autofill-options-link-osx = Innstillingar for autoutfylling av skjema
 
 ## The credit card capture doorhanger
 
+credit-card-capture-save-button =
+    .label = Lagre
+    .accessKey = L
+credit-card-capture-cancel-button =
+    .label = Ikkje no
+    .accessKey = k
+credit-card-capture-never-save-button =
+    .label = Aldri lagre kort
+    .accessKey = A
 
 # Used on the doorhanger when an credit card change is detected.
 
+credit-card-update-doorhanger-header = Oppdatere kortet?
+credit-card-update-doorhanger-description = Kort som skal oppdaterast:
+credit-card-capture-save-new-button =
+    .label = Lagre som nytt kort
+    .accessKey = L
+credit-card-capture-update-button =
+    .label = Oppdater eksisterende kort
+    .accessKey = O
 # Label for the button in the dropdown menu used to clear the populated form.
 autofill-clear-form-label = Tøm autoutfylt skjema
 # Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
 autofill-manage-addresses-label = Handsam adresser
+# Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
+autofill-manage-payment-methods-label = Handsam betalingsmåtar
 
 ## These are brand names and should only be translated when a locale-specific name for that brand is in common use