Merging upstream version 126.0.

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

5 files changed, 16 insertions, 12 deletions

diff --git a/l10n-cak/browser/browser/screenshots.ftl b/l10n-cak/browser/browser/screenshots.ftl
index 7026bca553..50c083e320 100644
--- a/l10n-cak/browser/browser/screenshots.ftl
+++ b/l10n-cak/browser/browser/screenshots.ftl
@@ -5,10 +5,8 @@
 screenshot-toolbarbutton =
     .label = Chapoj ruwäch
     .tooltiptext = Tichap jun chapoj ruwäch
-
 screenshot-shortcut =
     .key = S
-
 screenshots-instructions = Taqirirej o tapitz'a' ri ruxaq richin nacha' ri k'ojlem. Tapitz'a' ESC richin niq'at.
 screenshots-cancel-button = Tiq'at
 screenshots-save-visible-button = Tiyak wachel
@@ -25,7 +23,6 @@ screenshots-cancel-button-title =
     .title = Tiq'at
 screenshots-retry-button-title =
     .title = Titojtob'ëx chik chapoj ruwachib'al
-
 screenshots-meta-key =
     { PLATFORM() ->
         [macos] ⌘
@@ -33,27 +30,30 @@ screenshots-meta-key =
     }
 screenshots-notification-link-copied-title = Ximonel Wachib'en
 screenshots-notification-link-copied-details = Xwachib'ëx pa molwuj ri ruximonel awachib'al. Tapitz'a' { screenshots-meta-key }-V richin natz'äm.
-
 screenshots-notification-image-copied-title = Xwachib'ëx chapoj
 screenshots-notification-image-copied-details = Xwachib'ëx pa molwuj ri ruchapoj awachib'al. Tapitz'a' { screenshots-meta-key }-V richin natz'äm.
-
 screenshots-request-error-title = Man nisamäj ta.
 screenshots-request-error-details = ¡Takuyu! Man yojtikïr ta niqayäk ri awachib'al. Tatojtob'ej jumej.
-
 screenshots-connection-error-title = Man yojtikïr ta yojok pari taq chapoj awachib'al.
 screenshots-connection-error-details = Tanik'oj awokem pa K'amaya'l. We yatok pa K'amaya'l, rik'in jub'a' xtuya' k'ayewal pa rusamaj ri { -screenshots-brand-name }.
-
 screenshots-login-error-details = Man xkatikïr ta xtayäk ri awachib'al ruma jun ruk'ayewal toq nisamäj ri { -screenshots-brand-name }. Tatojtob'ej chik pa jun mej.
-
 screenshots-unshootable-page-error-title = Man yojtikïr ta nichap ruwachib'al re ruxaq re'.
 screenshots-unshootable-page-error-details = Re re' man pa rub'eyal ta chi ruxaq Ajk'amaya'l, ruma ri' man yojtikïr ta niqachäp ruwachib'al.
-
 screenshots-empty-selection-error-title = Yalan ko'öl ri acha'oj
-
 screenshots-private-window-error-title = Echupun ri { -screenshots-brand-name } pa Ichinan Okem pa K'amaya'l
 screenshots-private-window-error-details = Takuyu' chi qe ruma ri k'ayewal. Tajin niqasamajij re rub'anikil re' richin ri ch'aqa' chik taq ruwäch.
-
 screenshots-generic-error-title = ¡Itz! Itzel xe'el ri { -screenshots-brand-name }.
 screenshots-generic-error-details = Man öj jikïl chi rij ri xk'ulwachitäj. ¿La nawajo' natojtob'ej chik o nachäp ruwachib'al jun chik ruxaq?
-
 screenshots-too-large-error-title = Ri chapoj ruwäch xqupïx ruma yalan nïm
+screenshots-component-retry-button =
+    .title = Titojtob'ëx chik chapoj ruwachib'al
+    .aria-label = Titojtob'ëx chik chapoj ruwachib'al
+screenshots-component-copy-button-label = Tiwachib'ëx
+screenshots-component-download-button-label = Tiqasäx
+
+## The below strings are used to capture keydown events so the strings should
+## not be changed unless the keyboard layout in the locale requires it.
+
+
+##
+
diff --git a/l10n-cak/mobile/android/chrome/browser.properties b/l10n-cak/mobile/android/chrome/browser.properties
index f4699b5ba0..66939888c9 100644
--- a/l10n-cak/mobile/android/chrome/browser.properties
+++ b/l10n-cak/mobile/android/chrome/browser.properties
@@ -42,3 +42,4 @@ userContextWork.label = Samaj
 userContextBanking.label = Yakb'äl pwaqil
 userContextShopping.label = Loq'oj
 
+
diff --git a/l10n-cak/mobile/android/chrome/passwordmgr.properties b/l10n-cak/mobile/android/chrome/passwordmgr.properties
index 21dd4d2259..b1997f88a0 100644
--- a/l10n-cak/mobile/android/chrome/passwordmgr.properties
+++ b/l10n-cak/mobile/android/chrome/passwordmgr.properties
@@ -20,3 +20,4 @@ passwordChangeTitle=Tijikib'äx ri ruk'exik ewan tzij
 # Strings used by PromptService.js
 username=Rub'i' winäq
 password=Ewan tzij
+
diff --git a/l10n-cak/mobile/android/mobile/android/aboutConfig.ftl b/l10n-cak/mobile/android/mobile/android/aboutConfig.ftl
index 38f2b111bb..283f12a0ba 100644
--- a/l10n-cak/mobile/android/mobile/android/aboutConfig.ftl
+++ b/l10n-cak/mobile/android/mobile/android/aboutConfig.ftl
@@ -26,3 +26,4 @@ config-context-menu-copy-pref-name =
     .label = Tiwachib'ëx ri b'i'aj
 config-context-menu-copy-pref-value =
     .label = Tiwachib'ëx retal
+
diff --git a/l10n-cak/mobile/android/mobile/android/geckoViewConsole.ftl b/l10n-cak/mobile/android/mobile/android/geckoViewConsole.ftl
index 88dc39c978..4a5726b926 100644
--- a/l10n-cak/mobile/android/mobile/android/geckoViewConsole.ftl
+++ b/l10n-cak/mobile/android/mobile/android/geckoViewConsole.ftl
@@ -20,3 +20,4 @@ console-timer-start = { $name }: xtikïr ri tz'etöy ramaj
 #   $name (String): user-defined name for the timer
 #   $duration (String): number of milliseconds
 console-timer-end = { $name }: { $duration }ms
+