Merging upstream version 125.0.1.

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

7 files changed, 64 insertions, 13 deletions

diff --git a/l10n-nb-NO/toolkit/chrome/global/narrate.properties b/l10n-nb-NO/toolkit/chrome/global/narrate.properties
index f034336dc7..3d777200fe 100644
--- a/l10n-nb-NO/toolkit/chrome/global/narrate.properties
+++ b/l10n-nb-NO/toolkit/chrome/global/narrate.properties
@@ -8,6 +8,12 @@
 # %S is the keyboard shortcut for the listen command
 listen-label = Lytt (%S)
 back = Tilbake
+
+# "Listen, which allows users to listen to Firefox reading the text,
+# instead of having to read it themselves." This is the name
+# of the feature and it is the label for the popup button.
+# %S is the keyboard shortcut for the listen command
+read-aloud-label = Les høyt (%S)
 # %S is the keyboard shortcut for the skip back command
 previous-label = Tilbake (%S)
 # %S is the keyboard shortcut for the start command
diff --git a/l10n-nb-NO/toolkit/crashreporter/crashreporter.ftl b/l10n-nb-NO/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..70a988da6d
--- /dev/null
+++ b/l10n-nb-NO/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 = Krasjrapportering
+crashreporter-crash-message = Et uventet problem har oppstått i { -brand-short-name } og programmet har derfor krasjet.
+crashreporter-plea = For å hjelpe oss å løse og reparere problemet kan du sende oss en krasjrapport.
+# $details (String) - the reason that a crash report cannot be submitted
+crashreporter-error-details = Detaljer: { $details }
+crashreporter-no-run-message = Dette programmet kjører etter at et programkrasj oppstår for å rapportere problemet til programutviklerne.  Det bør ikke kjøres direkte.
+crashreporter-button-details = Detaljer …
+crashreporter-view-report-title = Rapportinnhold
+crashreporter-comment-prompt = Legg til en kommentar (kommentarer vises offentlig)
+crashreporter-report-info = Denne rapporten inneholder også informasjon om tilstanden til programmet da det krasjet.
+crashreporter-submit-status = Krasjrapporten sendes før du avslutter eller starter på nytt.
+crashreporter-submit-in-progress = Sender rapporten …
+crashreporter-submit-success = Rapporten er sendt!
+crashreporter-submit-failure = Et problem oppstod ved sending av rapporten.
+crashreporter-resubmit-status = Sender rapporter som tidligere mislyktes på nytt …
+crashreporter-button-quit = Avslutt { -brand-short-name }
+crashreporter-button-restart = Start { -brand-short-name } på nytt
+crashreporter-button-ok = OK
+crashreporter-button-close = Lukk
+# $id (String) - the crash id from the server, typically a UUID
+crashreporter-crash-identifier = Krasj-ID: { $id }
+
+# Error strings
+
diff --git a/l10n-nb-NO/toolkit/toolkit/about/aboutLogging.ftl b/l10n-nb-NO/toolkit/toolkit/about/aboutLogging.ftl
index 43c872ff90..c53900b342 100644
--- a/l10n-nb-NO/toolkit/toolkit/about/aboutLogging.ftl
+++ b/l10n-nb-NO/toolkit/toolkit/about/aboutLogging.ftl
@@ -5,7 +5,7 @@
 # This is the title of the page
 about-logging-title = Om logging
 about-logging-page-title = Loggbehandler
-about-logging-current-log-file = Current Log File:
+about-logging-current-log-file = Gjeldende loggfil:
 about-logging-new-log-file = Ny loggfil:
 about-logging-currently-enabled-log-modules = Aktiverte loggmoduler for øyeblikket:
 about-logging-log-tutorial = See <a data-l10n-name="logging">HTTP Logging</a> for instructions on how to use this tool.
diff --git a/l10n-nb-NO/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-nb-NO/toolkit/toolkit/formautofill/formAutofill.ftl
index ff6406c39d..2577036d37 100644
--- a/l10n-nb-NO/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-nb-NO/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -47,6 +47,8 @@ credit-card-capture-save-new-button =
 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 = Behandle adresser
 # Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
@@ -63,3 +65,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 = Fyller også automatisk ut { $categories }
+# Variation when all are in the same category.
+# Variables:
+#   $categories - one or more of the categories
+autofill-phishing-warningmessage = Fyller ut automatisk { $categories }
+# Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
+autofill-category-address = adresse
+autofill-category-name = navn
+autofill-category-organization = organisasjon
+autofill-category-tel = telefon
+autofill-category-email = e-post
diff --git a/l10n-nb-NO/toolkit/toolkit/global/datetimebox.ftl b/l10n-nb-NO/toolkit/toolkit/global/datetimebox.ftl
index 6bfe27b4db..79479f800b 100644
--- a/l10n-nb-NO/toolkit/toolkit/global/datetimebox.ftl
+++ b/l10n-nb-NO/toolkit/toolkit/global/datetimebox.ftl
@@ -2,9 +2,10 @@
 # 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/.
 
+
 ## Placeholders for date and time inputs
 
-datetime-year-placeholder = yyyy
+datetime-year-placeholder = åååå
 datetime-month-placeholder = mm
 datetime-day-placeholder = dd
 datetime-time-placeholder = --
diff --git a/l10n-nb-NO/toolkit/toolkit/global/processTypes.ftl b/l10n-nb-NO/toolkit/toolkit/global/processTypes.ftl
index 44fea153a8..20b2a1167f 100644
--- a/l10n-nb-NO/toolkit/toolkit/global/processTypes.ftl
+++ b/l10n-nb-NO/toolkit/toolkit/global/processTypes.ftl
@@ -8,28 +8,21 @@
 ##
 
 process-type-web = Nettinnhold
-
 # process used to run privileged about pages,
 # such as about:home
 process-type-privilegedabout = Priviligerte About-sider
-
 # process used to run privileged mozilla pages,
 # such as accounts.firefox.com
 process-type-privilegedmozilla = Privilegert Mozilla-innhold
-
 process-type-extension = Utvidelse
-
 # process used to open file:// URLs
 process-type-file = Lokal fil
-
 # process used to isolate a webpage from other web pages
 # to improve security
 process-type-webisolated = Isolert nettinnhold
-
 # process used to isolate a ServiceWorker to improve
 # performance
 process-type-webserviceworker = Isolert Service Worker
-
 # process preallocated; may change to other types
 process-type-prealloc = Førtildele
 
@@ -39,19 +32,22 @@ process-type-prealloc = Førtildele
 
 process-type-default = Hoved
 process-type-tab = Fane
-
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
-
 # process used to perform network operations
 process-type-socket = Socket
-
 # process used to decode media
 process-type-rdd = RDD
-
 # process used to run some IPC actor in their own sandbox
 process-type-utility = Isolert IPC-aktør
+process-type-utility-actor-audio-decoder-generic = Verktøy generisk lyddekoder
+process-type-utility-actor-audio-decoder-applemedia = Verktøy AppleMedia
+process-type-utility-actor-audio-decoder-wmf = Verktøy Windows Media Foundation
+process-type-utility-actor-mf-media-engine = Verktøy Media Foundation Engine
+process-type-utility-actor-js-oracle = Verktøy JavaScript Oracle
+process-type-utility-actor-windows-utils = Verktøy Windows Utils
+process-type-utility-actor-windows-file-dialog = Verktøy Windows fildialogvindu
 
 ##
 ## Other
diff --git a/l10n-nb-NO/toolkit/toolkit/global/textActions.ftl b/l10n-nb-NO/toolkit/toolkit/global/textActions.ftl
index bddd738867..445cb6f44a 100644
--- a/l10n-nb-NO/toolkit/toolkit/global/textActions.ftl
+++ b/l10n-nb-NO/toolkit/toolkit/global/textActions.ftl
@@ -62,3 +62,5 @@ text-action-spell-dictionaries =
     .accesskey = S
 text-action-search-text-box-clear =
     .title = Tøm
+text-action-highlight-selection =
+    .label = Uthev valg