Merging upstream version 125.0.1.

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

1 files changed, 1 insertions, 27 deletions

diff --git a/l10n-cak/toolkit/toolkit/neterror/netError.ftl b/l10n-cak/toolkit/toolkit/neterror/netError.ftl
index 704044e92c..bd82a4888c 100644
--- a/l10n-cak/toolkit/toolkit/neterror/netError.ftl
+++ b/l10n-cak/toolkit/toolkit/neterror/netError.ftl
@@ -35,11 +35,9 @@ neterror-error-reporting-automatic = Taya' kitzijol k'ayewal achi'el re ruwäch
 ## Specific error messages
 
 neterror-generic-error = { -brand-short-name } k'o jun achoq uma toq man nutikirisaj ta el re jun ruxaq k'amaya'l re'.
-
 neterror-load-error-try-again = Wakami rik'in jub'a' man wachel ta re ruxaq k'amaya'l re' o janila k'o yesamajin. Tatojtob'ej chik pa jun ti ramaj.
 neterror-load-error-connection = We man yatikïr ta yatok pa majun ruxaq, tanik'oj ri awokem pa ruk'amab'ey ri akematz'ib'.
 neterror-load-error-firewall = We ri asamajib'al o k'amab'ey tajin nichajïx ruma jun firewall o proxi, tajikib'a' chi ri { -brand-short-name } ya'on q'ij chi re chi nok pa k'amaya'l.
-
 neterror-captive-portal = K'o chi natikirsaj molojri'ïl pa re k'amab'ey re' chuwäch yatok pa k'amaya'l.
 
 ## TRR-only specific messages
@@ -47,6 +45,7 @@ neterror-captive-portal = K'o chi natikirsaj molojri'ïl pa re k'amab'ey re' chu
 ##   $hostname (String) - Hostname of the website to which the user was trying to connect.
 ##   $trrDomain (String) - Hostname of the DNS over HTTPS server that is currently in use.
 
+neterror-dns-not-found-trr-unknown-host2 = Man nilitäj ta ri ruxaq ruma ri { $trrDomain }.
 
 ## Native fallback specific messages
 ## Variables:
@@ -57,36 +56,24 @@ neterror-captive-portal = K'o chi natikirsaj molojri'ïl pa re k'amab'ey re' chu
 
 neterror-file-not-found-filename = Tanik'oj chi majun sachoj pa rub'i' ri yakb'äl achi'el rutz'ib'axik, achi'el chuqa' rokisaxik nimatz'ib'.
 neterror-file-not-found-moved = Tanik'oj we ri yakb'äl xsilöx el, xk'ex rub'i' o xyuj el
-
 neterror-access-denied = Rik'in jub'a' xyuj el, xsilöx el o ri niya'on q'ij chi ke ri yakb'äl niq'ato rutz'etik.
-
 neterror-unknown-protocol = Rik'in jub'a' rajowaxik nayäk qa jun chik kema' richin nijaqatäj re ochochib'äl re'.
-
 neterror-redirect-loop = Re jun k'ayewal re' nik'ulwachitäj ruma nachüp o e'aq'aton kik'ulik ri taq kaxlanwey.
-
 neterror-unknown-socket-type-psm-installed = Tanik'oj chi ruk'wan ri ichinan nuk'unel ri aq'inoj richin chajinïk, yakon.
 neterror-unknown-socket-type-server-config = Ke ri' rik'in jub'a' ruma ri pa rub'eyal runuk'ulem ruk'u'x samaj.
-
 neterror-not-cached-intro = Man niq'alajin ta chik pa { -brand-short-name } jumejyak ri wuj nik'utüx.
 neterror-not-cached-sensitive = .Achi'el jun rub'eyal richin nichajin, { -brand-short-name } man nuk'utuj ta chik pa ruyonil chajin taq wuj.
 neterror-not-cached-try-again = Tapitz'a' qa pa Titojtob'ëx chik richin nik'utüx chik ri ruwujil k'amaya'l.
-
 neterror-net-offline = Tapitz'a' “Titojtob'ëx chik” richin niq'ax pa majun okem chuqa' tok chik pa ruxaq.
-
 neterror-proxy-resolve-failure-settings = Tanik'oj runuk'ulem proxi richin najikib'a' chi ütz b'anikil.
 neterror-proxy-resolve-failure-connection = Tanik'oj chi ri asamajib'al k'o rokem richin nisamäj pa k'amab'ey.
 neterror-proxy-resolve-failure-firewall = We ri asamajib'al o k'amab'ey chajin ruma jun chupq'aq' o proxi, tajikib'a' chi ri { -brand-short-name } ya'on q'ij chi re richin nok pa k'amaya'l.
-
 neterror-proxy-connect-failure-settings = Tanik'oj chi ri runuk'ulem proxi ja ri' ri ütz.
 neterror-proxy-connect-failure-contact-admin = Katoyon rik'in ri runuk'samajel k'amab'ey richin nanik'oj chi ri ruk'u'x samaj proxi tajin nisamäj.
-
 neterror-content-encoding-error = Tab'ana' utzil, taya' rutzijol chi rij re k'ayewal re' chi ke ri rajaw ruxaq k'amaya'l.
-
 neterror-unsafe-content-type = Tab'ana' utzil, taya' rutzijol chi rij re k'ayewal re' chi ke ri rajaw ruxaq k'amaya'l.
-
 neterror-nss-failure-not-verified = Man tikirel ta nik'ut pe ri ruxaq tajin natojtob'ej najäq ruma man tikirel ta nijikib'äx nitz'et chi e qitzij ri taq tzij.
 neterror-nss-failure-contact-website = Tab'ana' utzil, taya' rutzijol chi rij re k'ayewal re' chi ke ri rajaw ruxaq k'amaya'l.
-
 # Variables:
 # $hostname (String) - Hostname of the website to which the user was trying to connect.
 certerror-intro = { -brand-short-name } xrïl jun nïy ritzelanel jikomal ruma ri' toq man xub'än ta chik <b>{ $hostname }</b>. We natz'et re ruxaq re', ri ojqanela' yetikïr nikitojtob'ej nikeleq'aj awetamab'al achi'el ewan taq atzij, ataqoya'l o rutzij ri ch'utit'im pwäq.
@@ -100,53 +87,40 @@ certerror-expired-cert-intro = { -brand-short-name } xrïl jun k'ayewal chuqa' m
 # $hostname (String) - Hostname of the website to which the user was trying to connect.
 # $mitm (String) - The name of the software intercepting communications between you and the website (or “man in the middle”)
 certerror-mitm = <b>{ $hostname }</b> rik'in jub'a' jun ütz ruxaq k'amaya'l, po man tikirel ta ri ütz okem. Re k'ayewal re' nik'ulwachïx ruma <b>{ $mitm }</b>, ri jun kema' pan akematz'ib' o pan ak'amab'ey.
-
 neterror-corrupted-content-intro = Ri ruxaq wuj tajin natojtob'ej natz'ët man tikirel ta nik'ut pe ruma xilitäj jun sachoj toq yeq'alajisäx pe ri taq tzij.
 neterror-corrupted-content-contact-website = Tab'ana' utzil, taya' rutzijol chi rij re k'ayewal re' chi ke ri rajaw ruxaq k'amaya'l.
-
 # Do not translate "SSL_ERROR_UNSUPPORTED_VERSION".
 neterror-sslv3-used = Q'axinäq chi etamab'äl: SSL_ERROR_UNSUPPORTED_VERSION
-
 # Variables:
 # $hostname (String) - Hostname of the website to which the user was trying to connect.
 neterror-inadequate-security-intro = <b>{ $hostname }</b> nrokisaj k'ak'a' samaj richin jikomal, ri e ojer chuqa' man k'ayew ta yeq'eleb'ëx. Jun q'eleb'enel chanin nuya' rutzijol ri etamab'äl, ri nina'ojïx chi echajin. Ri runuk'samajel ruxaq k'amaya'l k'o chi nutz'ët nab'ey ri ruk'u'x samaj chuwäch nitikïr nutz'ët ri ruxaq k'amaya'l.
 # Do not translate "NS_ERROR_NET_INADEQUATE_SECURITY".
 neterror-inadequate-security-code = Runimatz'ib' sachoj: NS_ERROR_NET_INADEQUATE_SECURITY
-
 # Variables:
 # $hostname (String) - Hostname of the website to which the user was trying to connect.
 # $now (Date) - The current datetime, to be formatted as a date
 neterror-clock-skew-error = Ri akematz'ib' nuna'ojij chi jun { DATETIME($now, dateStyle: "medium") }, ri nuq'ät { -brand-short-name } richin ütz nok. Titz'et <b>{ $hostname }</b>, Tak'exa' ri ruch'utiq'ijub'al akematz'ib' pa runuk'ulem ruq'inoj q'ijul, ramaj chuqa' rub'anikil q'ijul k'o wakami, k'a ri' tak'exa' <b>{ $hostname }</b>.
-
 neterror-network-protocol-error-intro = Man tikirel ta nik'ut ri ruxaq nawajo' natz'ët ruma xilitäj jun sachoj chi rij rub'eyal nisamäj k'amab'ey.
 neterror-network-protocol-error-contact-website = Katzijon rik'in ri rajaw ajk'amaya'l ruxaq richin naya' rutzijol re k'ayewal re'.
-
 certerror-expired-cert-second-para = Rik'in jub'a' ri rijiqitzijib'al ajk'amaya'l ruxaq xik'o yan ruq'ijul, nuq'ät { -brand-short-name } richin ütz nok. We natz'ët re ruxaq re', ri ojqanela' yetikïr nikitojtob'ej nikeleq'aj ri awetamab'al achi'el ewan taq atzij, kib'i' ataqoya'l o rub'anikil at'impwäq.
 certerror-expired-cert-sts-second-para = Rik'in jub'a' ri riqitzijib'al ajk'amaya'l ruxaq xk'is ruq'ijul, ri man nuya' taq q'ij chi ri { -brand-short-name } ütz nok.
-
 certerror-what-can-you-do-about-it-title = ¿Achike yatikïr nab'än chi rij?
-
 certerror-unknown-issuer-what-can-you-do-about-it-website = Rik'in jub'a' ja ri ajk'amaya'l ruxaq k'o ruk'ayewal, ruma ri' majun yatikïr nab'än.
 certerror-unknown-issuer-what-can-you-do-about-it-contact-admin = We at k'o pa jun to'öy runimamoloj k'amab'ey, o nawokisaj jun rukema' chapöy chikopil, yatikïr yatzijon kik'in ri to'onel kimoloj richin yatkito'. Chuqa' yatikïr naya' rutzijol chi re ri ajrunuk'samajel ajk'amaya'l ruxaq chi rij ri k'ayewal.
-
 # Variables:
 # $hostname (String) - Hostname of the website to which the user was trying to connect.
 # $now (Date) - The current datetime, to be formatted as a date
 certerror-expired-cert-what-can-you-do-about-it-clock = Ri ruch'utiq'ijub'al akematz'ib' b'anon runuk'ulem richin { DATETIME($now, dateStyle: "medium") }. Tajikib'a' chi ri akematz'ib' b'anon ütz runuk'ulem ri ruq'ijul, ruramaj chuqa' rub'anikil ruq'ijul aq'inoj, k'a ri' tak'exa' <b>{ $hostname }</b>.
 certerror-expired-cert-what-can-you-do-about-it-contact-website = We ütz chik runuk'ulem ri ach'utiq'ijub'al, rik'in jub'a' man ütz rub'anon runuk'ulem ri ajk'amaya'l ruxaq, majun yatikïr nab'än richin nab'än rutzil. Yatikïr naya' rutzijol chi re ri runuk'samajel ajk'amaya'l ruxaq chi rij ri k'ayewal.
-
 certerror-bad-cert-domain-what-can-you-do-about-it = Rik'in jub'a' ja ri ajk'amaya'l ruxaq k'o ruk'ayewal, ruma ri' majun yatikïr nab'än. Yatikïr naya' rutzijol chi re ri ajrunuk'samajel ajk'amaya'l ruxaq chi rij ri k'ayewal.
-
 certerror-mitm-what-can-you-do-about-it-antivirus = We ri achapöy chikopil yerutz'ajnik'oj ewan kisik'ixik taq okem (ri eb'ina'am “web scanning” o “https scanning”), yatikïr nachüp ri rub'anikil ri'. We man ütz ta nub'än, yatikïr nayüj chuqa' nayäk chik ri chapöy chikopil.
 certerror-mitm-what-can-you-do-about-it-corporate = We at k'o pa ruk'amab'ey nimak'ayij, katzijon pa ri Kematz'ib'il ch'akulal.
 # Variables:
 # $mitm (String) - The name of the software intercepting communications between you and the website (or “man in the middle”)
 certerror-mitm-what-can-you-do-about-it-attack = We man ruk'ulun ta chawe ri <b>{ $mitm }</b>, rik'in jub'a' yatkiq'eleb'ej ruma ri' man ütz ta yatok pa ri ruxaq k'amaya'l.
-
 # Variables:
 # $mitm (String) - The name of the software intercepting communications between you and the website (or “man in the middle”)
 certerror-mitm-what-can-you-do-about-it-attack-sts = We man ruk'ulun ta chawe ri <b>{ $mitm }</b>, rik'in jub'a' yatkiq'eleb'ej ruma ri' majun yatikïr nab'än richin yatok pa ri ruxaq k'amaya'l.
-
 # Variables:
 # $hostname (String) - Hostname of the website to which the user was trying to connect.
 certerror-what-should-i-do-bad-sts-cert-explanation = <b>{ $hostname }</b>k'o jun runa'ojil jikomal b'ina'am HTTP Jikïl Ruk'waxik Jikomal (HSTS), ri nuq'ajuj chi ri { -brand-short-name } xa xe nitikïr nok pa ütz jikomal. Man yatikïr ta natz'aqatisaj jun man relik ta richin natz'ët re ruxaq re'.