[tor-commits] [translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties

translation at torproject.org translation at torproject.org
Fri Apr 3 09:23:09 UTC 2020


commit 11f690c3a2f44311e27928185e842ff60c7bfbe9
Author: Translation commit bot <translation at torproject.org>
Date:   Fri Apr 3 09:23:06 2020 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
---
 ach/torbutton.properties   | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 af/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ar/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ast/torbutton.properties   | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 az/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 be/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 bg/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 bn-BD/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 br/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 bs/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ca/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 cs/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 cy/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 da/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 de/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 el/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 en-GB/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 en-US/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 en/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 eo/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 es-AR/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 es-ES/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 es-MX/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 et/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 eu/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 fa/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 fi/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 fr/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 fy-NL/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ga-IE/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 gd/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 gl/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 gu-IN/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 he/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 hi-IN/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 hr/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 hu/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 hy-AM/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ia/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 id/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 is/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 it/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ja/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ka/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 kab/torbutton.properties   | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 kk/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 km/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 kn/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ko/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 lt/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 lv/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 mk/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ml/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 mr/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ms/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 my/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 nb-NO/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ne/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 nl-BE/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 nl/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 nn-NO/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 oc/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 or/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 pa-IN/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 pl/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 pt-BR/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 pt-PT/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ro/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ru/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 si/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 sk/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 sl/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 son/torbutton.properties   | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 sq/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 sr/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 sv-SE/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 sw/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ta/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 te/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 th/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 tr/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 uk/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 ur/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 uz/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 vi/torbutton.properties    | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 zh-CN/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 zh-HK/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 zh-TW/torbutton.properties | 65 ++++++++++++++++++++++++++++++++++++++++++++--
 88 files changed, 5544 insertions(+), 176 deletions(-)

diff --git a/ach/torbutton.properties b/ach/torbutton.properties
index 375067b365..507fa8d95d 100644
--- a/ach/torbutton.properties
+++ b/ach/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/af/torbutton.properties b/af/torbutton.properties
index 12d042d857..798cf481ca 100644
--- a/af/torbutton.properties
+++ b/af/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Klil om Tor aan te sit
 torbutton.panel.tooltip.enabled = Klik om Tor af te sit
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Nie nou nie
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/ar/torbutton.properties b/ar/torbutton.properties
index 5a4ff34d9e..e29e29cac5 100644
--- a/ar/torbutton.properties
+++ b/ar/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = بلد غير معروف
 torbutton.circuit_display.guard = حارس
 torbutton.circuit_display.guard_note = لا يمكن تغيير العقدة الخارسة
 torbutton.circuit_display.learn_more = تعرّف على المزيد
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = يضيف متصفح تور هذا الهامش لجعل عرض وارتفاع نافذتك غير مميزين، لتقليل إمكانية اقتفاء أثرك عبر الإنترنت.
 torbutton.panel.tooltip.disabled = انقر لتفعيل تور
 torbutton.panel.tooltip.enabled = انقر لتعطيل تور
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=الاتصال معمى (خدمة ب
 pageInfo_OnionEncryption=الاتصال معمى (خدمة بصلة)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=تعرف على المزيد
-onionServices.clientAuthMissing=ينقص خدمة البصلة من تور استيثاق للعميل 
+onionServices.errorPage.browser=المتصفح
+onionServices.errorPage.network=الشبكة
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S يطلب المفتاح الخاص بكم 
 onionServices.authPrompt.keyPlaceholder=يرجى إدخال المفتاح الخاص لخدمة البصلة هذه 
 onionServices.authPrompt.done=انتهى
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=حذف
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=خ
+onionLocation.notNow=في وقت آخر
+onionLocation.notNowAccessKey=ا
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=دائماً
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=خدمات البصلة 
diff --git a/ast/torbutton.properties b/ast/torbutton.properties
index 9e558158ea..93802d0a01 100644
--- a/ast/torbutton.properties
+++ b/ast/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Desaniciar
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/az/torbutton.properties b/az/torbutton.properties
index ae35293d6e..ee4e885cdb 100644
--- a/az/torbutton.properties
+++ b/az/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Daha ətraflı öyrən
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Toru yandırmaq üçün kliklə
 torbutton.panel.tooltip.enabled = Toru söndürmək üçün kliklə
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Daha ətraflı öyrən
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Bax
+onionServices.errorPage.network=Şəbəkə
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Oldu
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Sil
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=P
+onionLocation.notNow=İndi yox
+onionLocation.notNowAccessKey=P
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/be/torbutton.properties b/be/torbutton.properties
index 2ef162f135..d19c4eeb1d 100644
--- a/be/torbutton.properties
+++ b/be/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Клікніце каб уключыць Tor
 torbutton.panel.tooltip.enabled = Клікніце каб выключыць Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Праверыць браўзер
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Гатова
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Прыбраць
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/bg/torbutton.properties b/bg/torbutton.properties
index ef80127d7b..3d15461208 100644
--- a/bg/torbutton.properties
+++ b/bg/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Неизвестна държава
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Научете повече
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser добавя тази граница, за да направи широчината и височината на прозореца по-малко отличителен, и по този начин намалява способността на хората да ви следят онлайн.
 torbutton.panel.tooltip.disabled = Натисни за да включиш Tor
 torbutton.panel.tooltip.enabled = Натисни за да изключиш Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Научете повече
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Браузър
+onionServices.errorPage.network=Мрежа
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Готов
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Премахване
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Не сега
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion услуги
diff --git a/bn-BD/torbutton.properties b/bn-BD/torbutton.properties
index aacb95dd45..f385c124d0 100644
--- a/bn-BD/torbutton.properties
+++ b/bn-BD/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = অজানা দেশ
 torbutton.circuit_display.guard = গার্ড
 torbutton.circuit_display.guard_note = আপনার [গার্ড] নোড পরিবর্তন হতে পারে না।
 torbutton.circuit_display.learn_more = আরও জানুন
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = টর ব্রাউজার আপনার উইন্ডো প্রস্থ এবং উচ্চতা নিখুঁত করতে এই মার্জিন যোগ করে, এবং এইভাবে মানুষ আপনাকে অনলাইন ট্র্যাক করার ক্ষমতা হ্রাস করে।
 torbutton.panel.tooltip.disabled = টর সক্রিয় করতে ক্লিক করুন
 torbutton.panel.tooltip.enabled = টর অক্ষম করতে ক্লিক করুন
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=সংযোগ এনক্রি
 pageInfo_OnionEncryption=সংযোগ এনক্রিপ্ট (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=আরও জানুন
-onionServices.clientAuthMissing=Tor onion পরিষেবা ক্লায়েন্টের অনুমোদন হারিয়েছে
+onionServices.errorPage.browser=ব্রাউজার
+onionServices.errorPage.network=নেটওয়ার্ক
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S আপনার ব্যক্তিগত কীটির জন্য অনুরোধ করছে।
 onionServices.authPrompt.keyPlaceholder=এই onion পরিষেবার জন্য আপনার ব্যক্তিগত কী লিখুন
 onionServices.authPrompt.done=সম্পন্ন
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=অপসারণ
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=এখন না
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=ওনিওন সেবা
diff --git a/br/torbutton.properties b/br/torbutton.properties
index 6104adc20d..0ba07c9eb6 100644
--- a/br/torbutton.properties
+++ b/br/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Gouzout hiroc'h
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Klikañ evit gweredekaat Tor
 torbutton.panel.tooltip.enabled = Klikañ evit diweredekaat Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Gouzout hiroc'h
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Graet
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Dilemel
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/bs/torbutton.properties b/bs/torbutton.properties
index ef11dd2bb0..fa7d9a9d82 100644
--- a/bs/torbutton.properties
+++ b/bs/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Ukloni
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=P
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/ca/torbutton.properties b/ca/torbutton.properties
index 2fe7ace070..a3a6a6ebca 100644
--- a/ca/torbutton.properties
+++ b/ca/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = País desconegut
 torbutton.circuit_display.guard = Guarda
 torbutton.circuit_display.guard_note = El vostre node de [Guarda] pot no canviar.
 torbutton.circuit_display.learn_more = Apreneu-ne més
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = El navegador Tor afegeix aquest marge per a minorar la diferència de alçada i amplada de la finestra, això fa reduir la capacitat de rastrejar-te.
 torbutton.panel.tooltip.disabled = Feu clic per activar Tor
 torbutton.panel.tooltip.enabled = Feu clic per desactivar Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connexió xifrada (Onion Service, %1
 pageInfo_OnionEncryption=Connexió xifrada (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Més informació
-onionServices.clientAuthMissing=El servei ceba no té l'autorització del client
+onionServices.errorPage.browser=Navegador
+onionServices.errorPage.network=Xarxa
+onionServices.errorPage.onionSite=Lloc onion
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S sol·licita la vostra clau privada.
 onionServices.authPrompt.keyPlaceholder=Introduïu la vostra clau privada per a aquest servei ceba
 onionServices.authPrompt.done=Fet
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Suprimeix la subscripció
 onionServices.authPreferences.removeAll=Suprimeix-ho tot
 onionServices.authPreferences.failedToGetKeys=No es poden recuperar les claus de tor
 onionServices.authPreferences.failedToRemoveKey=No s'ha pogut suprimir la clau
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=p
+onionLocation.notNow=Ara no
+onionLocation.notNowAccessKey=p
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Serveis Onion
diff --git a/cs/torbutton.properties b/cs/torbutton.properties
index 56f5c2ad84..2138982fb9 100644
--- a/cs/torbutton.properties
+++ b/cs/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Neznámá země
 torbutton.circuit_display.guard = Ochrana
 torbutton.circuit_display.guard_note = Váš uzel typu Ochrana se nemusí změnit.
 torbutton.circuit_display.learn_more = Zjistit více
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Prohlížeč Tor upravuje velikost vašeho okna, aby znesnadnil možnost vašeho vysledování.
 torbutton.panel.tooltip.disabled = Klepněte pro zapnutí Toru
 torbutton.panel.tooltip.enabled = Klepněte pro vypnutí Toru
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Šifrované spojení (Onion služba,
 pageInfo_OnionEncryption=Šifrované spojení (Onion služba)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Zjistit více
-onionServices.clientAuthMissing=Tor klient služby onion není ověřený
+onionServices.errorPage.browser=Prohlížeč
+onionServices.errorPage.network=Síť
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S vyžaduje váš soukromý klíč.
 onionServices.authPrompt.keyPlaceholder=Zadejte svůj soukromý klíč pro tuto službu onion
 onionServices.authPrompt.done=Hotovo
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Odstranit
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Nyní ne
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Služby Onion
diff --git a/cy/torbutton.properties b/cy/torbutton.properties
index 1e51e1eda2..70d6a9c0cf 100644
--- a/cy/torbutton.properties
+++ b/cy/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Cliciwch i alluogi Tor
 torbutton.panel.tooltip.enabled = Cliciwch i analluogu Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Wedi gorffen
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=p
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=p
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/da/torbutton.properties b/da/torbutton.properties
index 63e9b37cf5..86a0a517c9 100644
--- a/da/torbutton.properties
+++ b/da/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Ukendt land
 torbutton.circuit_display.guard = Vagt
 torbutton.circuit_display.guard_note = Dit [Vagt]-knudepunkt ændres måske ikke.
 torbutton.circuit_display.learn_more = Lær mere
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser tilføjer denne margin for at gøre dit vindues højde og bredde mindre genkendeligt, hvilket reducerer muligheden for at andre spore dig online.
 torbutton.panel.tooltip.disabled = Klik for at aktivere Tor
 torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelse krypteret (oniontjeneste
 pageInfo_OnionEncryption=Forbindelse krypteret (oniontjeneste)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Lær mere
-onionServices.clientAuthMissing=Tor-oniontjeneste mangler klient autentifikation
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Netværk
+onionServices.errorPage.onionSite=Onionsted
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S anmoder om din private nøgle.
 onionServices.authPrompt.keyPlaceholder=Indtast din private nøgle til oniontjenesten
 onionServices.authPrompt.done=Fuldført 
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Fjern
 onionServices.authPreferences.removeAll=Fjern alle
 onionServices.authPreferences.failedToGetKeys=Kan ikke hente nøgler fra tor
 onionServices.authPreferences.failedToRemoveKey=Kan ikke fjerne nøgle
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ikke nu
+onionLocation.notNowAccessKey=p
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Oniontjenester
diff --git a/de/torbutton.properties b/de/torbutton.properties
index a1179ba33c..7908aa154c 100644
--- a/de/torbutton.properties
+++ b/de/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unbekanntes Land
 torbutton.circuit_display.guard = Wächter
 torbutton.circuit_display.guard_note = Dein [Wächter] Knotenpunkt darf sich nicht ändern.
 torbutton.circuit_display.learn_more = Erfahre mehr
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe deines Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, dich im Internet zu verfolgen.
 torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
 torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Verbindung verschlüsselt (Onion-Die
 pageInfo_OnionEncryption=Verbindung verschlüsselt (Onion-Dienst)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Mehr erfahren
-onionServices.clientAuthMissing=Dem Onion-Dienst fehlt die Client-Autorisierung.
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Netzwerk
+onionServices.errorPage.onionSite=Onion-Seite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S fragt deinen privaten Schlüssel an.
 onionServices.authPrompt.keyPlaceholder=Gib deinen privaten Schlüssel für diesen Onion-Dienst ein.
 onionServices.authPrompt.done=Fertig
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Entfernen
 onionServices.authPreferences.removeAll=Alles entfernen
 onionServices.authPreferences.failedToGetKeys=Abrufen der Schlüssel von Tor nicht möglich
 onionServices.authPreferences.failedToRemoveKey=Schlüssel entfernen nicht möglich
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Nicht jetzt
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-Dienste
diff --git a/el/torbutton.properties b/el/torbutton.properties
index 31b9811a50..f26c6bf7c0 100644
--- a/el/torbutton.properties
+++ b/el/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Άγνωστη χώρα
 torbutton.circuit_display.guard = Φύλακας
 torbutton.circuit_display.guard_note = Ο [Φύλακας] κόμβος σας δεν μπορεί να αλλάξει.
 torbutton.circuit_display.learn_more = Μάθετε περισσότερα
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Ο Tor Browser προσθέτει αυτό το περιθώριο για να κάνει το πλάτος και το ύψος του παραθύρου σου λιγότερο ξεχωριστό, οπότε μειώνεται η ικανότητα των άλλων να σε παρακολουθούν διαδικτυακά.
 torbutton.panel.tooltip.disabled = Κάντε κλικ για να ενεργοποιήσετε το Tor
 torbutton.panel.tooltip.enabled = Κάντε κλικ για να απενεργοποιήσετε το Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Κρυπτογραφημένη σύ
 pageInfo_OnionEncryption=Κρυπτογραφημένη σύνδεση (υπηρεσία Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Μάθετε περισσότερα
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Περιηγητής
+onionServices.errorPage.network=Δίκτυο
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Τέλος
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Απομάκρυνση
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Όχι τώρα
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Υπηρεσίες Onion
diff --git a/en-GB/torbutton.properties b/en-GB/torbutton.properties
index 570caea4df..736627dd01 100644
--- a/en-GB/torbutton.properties
+++ b/en-GB/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorisation
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/en-US/torbutton.properties b/en-US/torbutton.properties
index 375067b365..507fa8d95d 100644
--- a/en-US/torbutton.properties
+++ b/en-US/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/en/torbutton.properties b/en/torbutton.properties
index 375067b365..507fa8d95d 100644
--- a/en/torbutton.properties
+++ b/en/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/eo/torbutton.properties b/eo/torbutton.properties
index b78cec7d7c..e8e20f6c72 100644
--- a/eo/torbutton.properties
+++ b/eo/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Retesplorilo
+onionServices.errorPage.network=Reto
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Preta
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Forigi
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=A
+onionLocation.notNow=Ne nun
+onionLocation.notNowAccessKey=A
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/es-AR/torbutton.properties b/es-AR/torbutton.properties
index a57fe3594d..6ae1121ab1 100644
--- a/es-AR/torbutton.properties
+++ b/es-AR/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = País desconocido
 torbutton.circuit_display.guard = Guarda
 torbutton.circuit_display.guard_note = Tu nodo [Guarda] puede no cambiar.
 torbutton.circuit_display.learn_more = Más informacion
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = El Navegador Tor añade éste margen para hacer el ancho y alto de tu ventana menos distintivo, y de ésta manera reduce la habilidad de cualquiera para rastrearte en línea.
 torbutton.panel.tooltip.disabled = Cliquear para habilitar Tor
 torbutton.panel.tooltip.enabled = Cliquear para deshabilitar Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión encriptada (Servicio Onion
 pageInfo_OnionEncryption=Conexión encriptada (Servicio Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Aprendé más
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Navegador
+onionServices.errorPage.network=Red
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Hecho
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remover
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ahora no
+onionLocation.notNowAccessKey=j
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Servicios Onion
diff --git a/es-ES/torbutton.properties b/es-ES/torbutton.properties
index a562dd24ef..9e71933cbd 100644
--- a/es-ES/torbutton.properties
+++ b/es-ES/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = País desconocido
 torbutton.circuit_display.guard = Protección
 torbutton.circuit_display.guard_note = Tu nodo [de protección] no puede cambiar.
 torbutton.circuit_display.learn_more = Conocer más
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = El Tor Browser añade este margen para hacer el ancho y el alto de tu ventana menos especial, y reducir de esta forma la posibilidad de rastrearte en línea.
 torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor
 torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio cebolla,
 pageInfo_OnionEncryption=Conexión cifrada (Servicio cebolla)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Conocer más
-onionServices.clientAuthMissing=Servicio onion sin autorización de cliente
+onionServices.errorPage.browser=Navegador
+onionServices.errorPage.network=Red
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S está solicitando tu clave privada.
 onionServices.authPrompt.keyPlaceholder=Introduce tu clave privada para este servicio cebolla
 onionServices.authPrompt.done=Listo
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Eliminar
 onionServices.authPreferences.removeAll=Eliminar todo
 onionServices.authPreferences.failedToGetKeys=No se pueden descargar las claves de Tor
 onionServices.authPreferences.failedToRemoveKey=No se puede quitar la clave
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ahora no
+onionLocation.notNowAccessKey=b
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Siempre
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Servicios cebolla
diff --git a/es-MX/torbutton.properties b/es-MX/torbutton.properties
index 695998df2b..0624e5b393 100644
--- a/es-MX/torbutton.properties
+++ b/es-MX/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = País Desconocido
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = El navegador agrega este margen para hacer que el tamaño de tu ventana sea indistinto y esto reduce el riesgo para que  a otras personas te puedan localizar en linea.
 torbutton.panel.tooltip.disabled = Click para habilitar Tor
 torbutton.panel.tooltip.enabled = Click para deshabilitar Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Listo
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remover
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ahora no
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Servicios Onion
diff --git a/et/torbutton.properties b/et/torbutton.properties
index 1e3dbd8778..03a6c5e6cc 100644
--- a/et/torbutton.properties
+++ b/et/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Tundmatu riik
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Loe lisaks
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor brauser lisab selle äärise, et muuta su akna laius ja kõrgus vähem eristuvaks, mis omakorda vähendab teiste võimalust sind võrgus jälitamiseks.
 torbutton.panel.tooltip.disabled = Vajuta Tor\\'i lubamiseks
 torbutton.panel.tooltip.enabled = Vajuta Tor\\'i keelamiseks
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Ühendus krüptitud (Onion-teenus, %
 pageInfo_OnionEncryption=Ühendus krüptitud (Onion-teenus)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Loe lisaks
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Võrk
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Valmis 
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Eemalda
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Hetkel mitte
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-teenused
diff --git a/eu/torbutton.properties b/eu/torbutton.properties
index 39984c4e36..a0e096c4b5 100644
--- a/eu/torbutton.properties
+++ b/eu/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Herrialde ezezaguna
 torbutton.circuit_display.guard = Zaintzailea
 torbutton.circuit_display.guard_note = Baliteke zure nodo [Zaintzailea] ez aldatzea.
 torbutton.circuit_display.learn_more = Gehiago jakin
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor nabigatzaileak marjin hau gehitzen du zure lehioaren zabalera eta altuera ez hain bereizgarria egiteko, horrela norbaitek zure jarraipena egiteko gaitasuna murriztuz.
 torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko
 torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Enkriptatutako konexioa (Onion zerbi
 pageInfo_OnionEncryption=Enkriptatutako konexioa (Onion zerbitzua)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Gehiago jakin
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Nabigatzailea
+onionServices.errorPage.network=Sarea
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Eginda
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Kendu
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Orain ez
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion zerbitzuak
diff --git a/fa/torbutton.properties b/fa/torbutton.properties
index 573ac86125..0b23816088 100644
--- a/fa/torbutton.properties
+++ b/fa/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = کشور ناشناخته
 torbutton.circuit_display.guard = محافظ
 torbutton.circuit_display.guard_note = گره [گارد] شما ممکن است تغییر نکند.
 torbutton.circuit_display.learn_more = اطلاعات بیشتر
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = مرورگر Tor اضافه می کند این حاشیه را به عرض و ارتفاع پنجره شما که کمتر مشخص شود، و در نتیجه باعث کاهش توانایی به ردیابی آنلاین شما شود.
 torbutton.panel.tooltip.disabled = برای فعال کردن Tor کليک کنيد
 torbutton.panel.tooltip.enabled = برای غيرفعال کردن Tor کليک کنيد
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=ارتباط رمزگذاری شده
 pageInfo_OnionEncryption=ارتباط رمزگذاری شد (سرویس پیازی)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=اطلاعات بیشتر
-onionServices.clientAuthMissing=سرویس Onion در Tor، مجوز مشتری را پیدا نمی‌کند.
+onionServices.errorPage.browser=مرورگر
+onionServices.errorPage.network=شبکه
+onionServices.errorPage.onionSite=سایت های پیازی
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S درخواست کلید خصوصی شما را دارد.
 onionServices.authPrompt.keyPlaceholder=کلید خصوصی خود برای این سرویس Onion را، وارد کنید.
 onionServices.authPrompt.done=انجام شد
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=حذف
 onionServices.authPreferences.removeAll=حذف کردن همه
 onionServices.authPreferences.failedToGetKeys=قادر به بازیابی کلیدها از تور نیستیم
 onionServices.authPreferences.failedToRemoveKey=قادر به حذف کردن کلید نیستیم
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=نه در حال حاضر
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=همیشه
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=◾️ سرویس های پیازی
diff --git a/fi/torbutton.properties b/fi/torbutton.properties
index f85da2b419..5cc464cc21 100644
--- a/fi/torbutton.properties
+++ b/fi/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Tuntematon maa
 torbutton.circuit_display.guard = Suojain
 torbutton.circuit_display.guard_note = Guard-solmu ei välttämättä muutu.
 torbutton.circuit_display.learn_more = Opi lisää
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor-selain lisää tämän marginaalin tehdäksesi ikkunasi leveyden ja korkeuden vähemmän erottuvan ja näin ollen tekee seuraamisestasi verkossa vaikeampaa.
 torbutton.panel.tooltip.disabled = Käynnistä Tor napsauttamalla.
 torbutton.panel.tooltip.enabled = Poista Tor käytöstä napsauttamalla
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Yhteys Salattu (Onion Palvelut, %1$S
 pageInfo_OnionEncryption=Salattu yhteys (Sipulipalvelu)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Opi lisää
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Selain
+onionServices.errorPage.network=Verkko
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Valmis
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Poista
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=p
+onionLocation.notNow=Ei nyt
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-palvelut
diff --git a/fr/torbutton.properties b/fr/torbutton.properties
index 70bde61c08..f61436a207 100644
--- a/fr/torbutton.properties
+++ b/fr/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Pays inconnu
 torbutton.circuit_display.guard = garde
 torbutton.circuit_display.guard_note = Votre nœud de [garde] ne peut pas changer.
 torbutton.circuit_display.learn_more = En apprendre davantage
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Le Navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l’on vous suive à la trace en ligne.
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
 torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=La connexion est chiffrée (service
 pageInfo_OnionEncryption=La connexion est chiffrée (service onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=En savoir plus
-onionServices.clientAuthMissing=L’autorisation du client manque au service onion Tor
+onionServices.errorPage.browser=Navigateur
+onionServices.errorPage.network=Réseau 
+onionServices.errorPage.onionSite=Site onion
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S demande votre clé privée.
 onionServices.authPrompt.keyPlaceholder=Saisissez votre clé privée pour ce service onion
 onionServices.authPrompt.done=Terminé
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Supprimer
 onionServices.authPreferences.removeAll=Tout supprimer
 onionServices.authPreferences.failedToGetKeys=Impossible de récupérer les clés de Tor
 onionServices.authPreferences.failedToRemoveKey=Impossible de supprimer la clé
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Pas maintenant
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Toujours
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Services onion
diff --git a/fy-NL/torbutton.properties b/fy-NL/torbutton.properties
index fd017457e0..9efc86a16c 100644
--- a/fy-NL/torbutton.properties
+++ b/fy-NL/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Klik om Tor oan te setten
 torbutton.panel.tooltip.enabled = Klik om Tor út te setten
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Klear
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/ga-IE/torbutton.properties b/ga-IE/torbutton.properties
index 74e76499f9..7ab6b4c845 100644
--- a/ga-IE/torbutton.properties
+++ b/ga-IE/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Tír anaithnid
 torbutton.circuit_display.guard = Garda
 torbutton.circuit_display.guard_note = Seans nach n-athrófar an nód [Guard].
 torbutton.circuit_display.learn_more = Tuilleadh eolais
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Cuireann Brabhsálaí Tor an chiumhais seo leis an bhfuinneog ionas nach mbeidh leithead agus airde na fuinneoige chomh suntasach, sa chaoi go mbíonn sé níos deacra do ghníomhaíocht ar líne a lorg.
 torbutton.panel.tooltip.disabled = Cliceáil le Tor a chumasú
 torbutton.panel.tooltip.enabled = Cliceáil le Tor a dhíchumasú
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Ceangal Criptithe (Seirbhís Onion,
 pageInfo_OnionEncryption=Ceangal Criptithe (Seirbhís Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Tuilleadh eolais
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Líonra
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Déanta
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Bain
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Níl Anois
+onionLocation.notNowAccessKey=s
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Seirbhísí Onion
diff --git a/gd/torbutton.properties b/gd/torbutton.properties
index 375067b365..507fa8d95d 100644
--- a/gd/torbutton.properties
+++ b/gd/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/gl/torbutton.properties b/gl/torbutton.properties
index 13f4ef2c12..f2143de890 100644
--- a/gl/torbutton.properties
+++ b/gl/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Aprender máis
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Aprender máis
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Navegador
+onionServices.errorPage.network=Rede
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Feito
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Quitar
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/gu-IN/torbutton.properties b/gu-IN/torbutton.properties
index a95186f9f1..232311b261 100644
--- a/gu-IN/torbutton.properties
+++ b/gu-IN/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = ટોર સક્રિય કરવા ક્લિક કરો
 torbutton.panel.tooltip.enabled = ટોર નિષ્ક્રિય કરવા ક્લિક કરો
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=થઈ ગયું
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=દૂર કરો
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/he/torbutton.properties b/he/torbutton.properties
index 7ce4502f5f..5e28863398 100644
--- a/he/torbutton.properties
+++ b/he/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = מדינה לא ידועה
 torbutton.circuit_display.guard = מישמר
 torbutton.circuit_display.guard_note = צומת [המישמר] שלך עשוי לא להשתנות.
 torbutton.circuit_display.learn_more = למד עוד
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = דפדפן Tor מוסיף שול זה כדי להפוך את הגובה והרוחב של חלונך ליחודיים פחות, ובכך להפחית את היכולת של אנשים לעקוב אחריך באופן מקוון.
 torbutton.panel.tooltip.disabled = לחץ כדי לאפשר את Tor
 torbutton.panel.tooltip.enabled = לחץ כדי להשבית את Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=חיבור הוצפן (שירות ב
 pageInfo_OnionEncryption=חיבור הוצפן (שירות בצל)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=למד עוד
-onionServices.clientAuthMissing=לשירות בצל של Tor חסר אימות לקוח
+onionServices.errorPage.browser=דפדפן
+onionServices.errorPage.network=רשת
+onionServices.errorPage.onionSite=אתר בצל
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S מבקש את המפתח הפרטי שלך.
 onionServices.authPrompt.keyPlaceholder=הכנס את המפתח הפרטי שלך עבור שירות בצל זה
 onionServices.authPrompt.done=סיים
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=הסר
 onionServices.authPreferences.removeAll=הסר הכל
 onionServices.authPreferences.failedToGetKeys=לא היה ניתן לאחזר מפתחות מן tor
 onionServices.authPreferences.failedToRemoveKey=לא היה ניתן להסיר מפתח
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=לא עכשיו
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=שירותי בצל
diff --git a/hi-IN/torbutton.properties b/hi-IN/torbutton.properties
index dbcfdfa6ad..8d28405de9 100644
--- a/hi-IN/torbutton.properties
+++ b/hi-IN/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = अज्ञात देश
 torbutton.circuit_display.guard = रक्षक
 torbutton.circuit_display.guard_note = आपका [गार्ड] नोड बदल नहीं सकता है।
 torbutton.circuit_display.learn_more = और अधिक जानें
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = टोर ब्राउज़र आपकी खिड़की की चौड़ाई और ऊंचाई को कम विशिष्ट बनाने के लिए इस मार्जिन को जोड़ता है, और इस प्रकार लोगों को ऑनलाइन ट्रैक करने की क्षमता को कम करता है।
 torbutton.panel.tooltip.disabled = टॉर सक्षम करने के लिए क्लिक करें
 torbutton.panel.tooltip.enabled = टॉर अक्षम करने के लिए क्लिक करें
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=कनेक्शन एन्क
 pageInfo_OnionEncryption=कनेक्शन एन्क्रिप्टेड (अनियन सेवा)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=और अधिक जानें
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=ब्राउज़र
+onionServices.errorPage.network=नेटवर्क
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=सम्पन्न
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=हटाना
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=अभी नहीं
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/hr/torbutton.properties b/hr/torbutton.properties
index 011a69b65a..6093155422 100644
--- a/hr/torbutton.properties
+++ b/hr/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Nepoznata država
 torbutton.circuit_display.guard = Stražar
 torbutton.circuit_display.guard_note = Vaš [Stražarni] čvor se ne smije promijeniti.
 torbutton.circuit_display.learn_more = Saznajte više
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser dodaje ovu marginu kako bi učinio širinu i visinu Vašeg prozora manje uočljivom, te time smanjio mogućnost da Vas ljudi prate online.
 torbutton.panel.tooltip.disabled = Kliknite za omogućenje Tora
 torbutton.panel.tooltip.enabled = Kliknite za onemogućenje Tora
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Veza enkriptirana (Onion usluga, %1$
 pageInfo_OnionEncryption=Veza enkriptirana (Onion usluga)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Saznajte više
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Preglednik
+onionServices.errorPage.network=Mreža
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Gotovo
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Ukloni
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ne sad
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion usluge
diff --git a/hu/torbutton.properties b/hu/torbutton.properties
index a62210c03e..6323aefc65 100644
--- a/hu/torbutton.properties
+++ b/hu/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Ismeretlen ország
 torbutton.circuit_display.guard = Őr
 torbutton.circuit_display.guard_note = Az [Guard] csomópont nem változik.
 torbutton.circuit_display.learn_more = További információ
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = A Tor Browser ezt a margót adja hozzá, hogy a magassága és a szélessége az ablaknak kevésbé eltérő legyen, így csökkenti az online tevékenységének  nyomon követhetőségét.
 torbutton.panel.tooltip.disabled = Kattintson rá a Tor bekapcsolásához
 torbutton.panel.tooltip.enabled = Kattintson rá a Tor kikapcsolásához
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Titkosított kapcsolat (Onion szolg
 pageInfo_OnionEncryption=Titkosított kapcsolat (Onion szolgáltatás)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=További információ
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Böngésző
+onionServices.errorPage.network=Hálózat
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Kész 
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Eltávolít
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=n
+onionLocation.notNow=Most nem
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Mindig
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Szolgáltatások
diff --git a/hy-AM/torbutton.properties b/hy-AM/torbutton.properties
index 8517d13bfc..d72f9801e7 100644
--- a/hy-AM/torbutton.properties
+++ b/hy-AM/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Հեռացնել
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/ia/torbutton.properties b/ia/torbutton.properties
index f31bd17730..119774bbea 100644
--- a/ia/torbutton.properties
+++ b/ia/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Rete
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remover
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/id/torbutton.properties b/id/torbutton.properties
index f8fc752ef1..f70f53a414 100644
--- a/id/torbutton.properties
+++ b/id/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Negara tidak diketahui
 torbutton.circuit_display.guard = Penjaga
 torbutton.circuit_display.guard_note = Titik [Penjaga] Anda tidak dapat berubah
 torbutton.circuit_display.learn_more = Pelajari lebih lanjut
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Adds Browser Tor margin ini untuk membuat Lebar dan tinggi dari window anda kurang khas
 torbutton.panel.tooltip.disabled = Klik untuk mengaktifkan Tor
 torbutton.panel.tooltip.enabled = Klik untuk menonaktifkan Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Koneksi terenkripsi (Layanan Onion,
 pageInfo_OnionEncryption=Koneksi terenkripsi (Layanan Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Pelajari Selengkapnya
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Peramban
+onionServices.errorPage.network=Jaringan
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Selesai
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Hapus
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=P
+onionLocation.notNow=Tidak untuk Sekarang
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Layanan Onion
diff --git a/is/torbutton.properties b/is/torbutton.properties
index feb50ffa3d..bbc4729951 100644
--- a/is/torbutton.properties
+++ b/is/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Óþekkt land
 torbutton.circuit_display.guard = Vörður (guard)
 torbutton.circuit_display.guard_note = Varðarhnúturinn [Guard] breytist ekki endilega.
 torbutton.circuit_display.learn_more = Læra meira
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor-vafrinn setur inn þessa spássíu til að gera hæð og breidd gluggans minna einkennandi, og þar með að gera erfiðara að fylgjast með þér á netinu.
 torbutton.panel.tooltip.disabled = Smelltu til að virkja Tor
 torbutton.panel.tooltip.enabled = Smelltu til að afvirkja Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Dulrituð tenging (Onion-þjónusta,
 pageInfo_OnionEncryption=Dulrituð tenging (Onion-þjónusta)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Fræðast frekar
-onionServices.clientAuthMissing=Tor onion-þjónustu vantar auðkenningu frá biðlaraforriti
+onionServices.errorPage.browser=Vafri
+onionServices.errorPage.network=Net
+onionServices.errorPage.onionSite=Onion-vefsvæði
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S er að biðja um einkalykilinn þinn.
 onionServices.authPrompt.keyPlaceholder=Settu inn einkalykilinn þinn fyrir þessa onion-þjónustu
 onionServices.authPrompt.done=Lokið
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Fjarlægja
 onionServices.authPreferences.removeAll=Fjarlægja allt
 onionServices.authPreferences.failedToGetKeys=Tókst ekki að ná í lykla frá Tor
 onionServices.authPreferences.failedToRemoveKey=Tókst ekki að fjarlægja lykil
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ekki núna
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-þjónustur
diff --git a/it/torbutton.properties b/it/torbutton.properties
index 73c44ccfa8..d62fd7532c 100644
--- a/it/torbutton.properties
+++ b/it/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Paese sconosciuto
 torbutton.circuit_display.guard = Guardia
 torbutton.circuit_display.guard_note = Il tuo nodo [Guardia] non deve cambiare.
 torbutton.circuit_display.learn_more = Per saperne di più
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, così si riduce la possibilità di che tu sia tracciato in linea.
 torbutton.panel.tooltip.disabled = Fai clic per attivare Tor
 torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connessione cifrata (Servizio onion,
 pageInfo_OnionEncryption=Connessione cifrata (Servizio onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Per saperne di più
-onionServices.clientAuthMissing=Autorizzazione client mancante per il servizio Tor onion
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Rete
+onionServices.errorPage.onionSite=Sito onion
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S richiede la tua chiave privata.
 onionServices.authPrompt.keyPlaceholder=Inserisci la tua chiave privata per questo servizio onion
 onionServices.authPrompt.done=Fatto
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Rimuovi
 onionServices.authPreferences.removeAll=Rimuovi tutte
 onionServices.authPreferences.failedToGetKeys=Impossibile recuperare le chiavi da tor
 onionServices.authPreferences.failedToRemoveKey=Impossibile rimuovere la chiave
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Non ora
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Sempre
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Servizi onion
diff --git a/ja/torbutton.properties b/ja/torbutton.properties
index bb843823f5..524a18c706 100644
--- a/ja/torbutton.properties
+++ b/ja/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = 不明な国
 torbutton.circuit_display.guard = ガード
 torbutton.circuit_display.guard_note = [ガード] ノードは変更されない場合があります。
 torbutton.circuit_display.learn_more = 詳細情報
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser はウィンドウのサイズを平凡にするためにこのマージンを追加します。これにより、あなたのことをオンラインで追跡しにくくします。
 torbutton.panel.tooltip.disabled = クリックしてTorを有効にする
 torbutton.panel.tooltip.enabled = クリックしてTorを無効にする
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=接続が暗号化されています
 pageInfo_OnionEncryption=接続が暗号化されています (Onion サービス)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=詳細情報
-onionServices.clientAuthMissing=Tor オニオンサービスにクライアント認証がありません
+onionServices.errorPage.browser=ブラウザ
+onionServices.errorPage.network=ネットワーク
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%Sは秘密鍵を要求しています。
 onionServices.authPrompt.keyPlaceholder=このオニオンサービスのあなたの秘密鍵を入力してください
 onionServices.authPrompt.done=完了
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=解除
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=今は許可しない
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=常に
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion サービス
diff --git a/ka/torbutton.properties b/ka/torbutton.properties
index 4e442fd9f7..14cbf16ffe 100644
--- a/ka/torbutton.properties
+++ b/ka/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = უცნობი ქვეყა
 torbutton.circuit_display.guard = მცველი
 torbutton.circuit_display.guard_note = თქვენი [მცველი] კვანძი შესაძლოა არ შეიცვალოს.
 torbutton.circuit_display.learn_more = იხილეთ ვრცლად
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor-ბრაუზერი ამატებს მინდვრებს კიდეებზე, რომ თქვენი ფანჯრის სიგანე და სიმაღლე ნაკლებად გამორჩეული და შესამჩნევი იყოს, რაც შეუმცირებს სხვებს, ინტერნეტში თქვენი დევნის შესაძლებლობებს.
 torbutton.panel.tooltip.disabled = დაკლიკეთ Tor-ის ჩასართავად
 torbutton.panel.tooltip.enabled = დაკლიკეთ Tor-ის გამოსართავად
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=კავშირი დაში
 pageInfo_OnionEncryption=კავშირი დაშიფრულია (Onion-მომსახურება)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=იხილეთ ვრცლად
-onionServices.clientAuthMissing=Tor-ის onion-მომსახურებას აკლია კლიენტის დამოწმება
+onionServices.errorPage.browser=ბრაუზერი
+onionServices.errorPage.network=ქსელი
+onionServices.errorPage.onionSite=Onion-საიტი
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S ითხოვს თქვენს საიდუმლო გასაღებს.
 onionServices.authPrompt.keyPlaceholder=შეიყვანეთ თქვენი საიდუმლო გასაღები ამ onion-მომსახურებისთვის
 onionServices.authPrompt.done=მზადაა
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=წაშლა
 onionServices.authPreferences.removeAll=ყველას მოცილება
 onionServices.authPreferences.failedToGetKeys=ვერ ხერხდება გასაღებების მიღება tor-იდან
 onionServices.authPreferences.failedToRemoveKey=ვერ ხერხდება გასაღების მოცილება
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=ვ
+onionLocation.notNow=ახლა არა
+onionLocation.notNowAccessKey=ტ
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-მომსახურებები
diff --git a/kab/torbutton.properties b/kab/torbutton.properties
index 375067b365..507fa8d95d 100644
--- a/kab/torbutton.properties
+++ b/kab/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/kk/torbutton.properties b/kk/torbutton.properties
index 073f66af4c..f25ae5a81c 100644
--- a/kk/torbutton.properties
+++ b/kk/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Белгісіз мемлекет
 torbutton.circuit_display.guard = Күзетші
 torbutton.circuit_display.guard_note = Сіздің [Guard] торабы өзгерте алмайды.
 torbutton.circuit_display.learn_more = Толық оқу
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor браузері сіздің осы терезенің енін және биіктігін әр түрлі етіп жасау үшін осы маржаны қосады, осылайша, адамдардың онлайн режимінде қадағалау мүмкіндігін азайтады.
 torbutton.panel.tooltip.disabled = Қосу үшін басыңыз
 torbutton.panel.tooltip.enabled = Tor-ды өшіру үшін басыңыз
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Қосылу шрифтталған
 pageInfo_OnionEncryption=Қосылу шрифтталған (Onion сервисі)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Толық оқу
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Дайын
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Жою
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Қазір емес
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion қызметі
diff --git a/km/torbutton.properties b/km/torbutton.properties
index 03f4b950bb..4f05a7d4b7 100644
--- a/km/torbutton.properties
+++ b/km/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = ស្វែងយល់បន្ថែម
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = ចុច​ ដើម្បី​បើក Tor
 torbutton.panel.tooltip.enabled = ចុច ដើម្បី​បិទ Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=ស្វែងយល់បន្ថែម
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=កម្មវិធីរុករក
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=រួចរាល់
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=ដកចេញ
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=មិនមែន​ឥឡូវ
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/kn/torbutton.properties b/kn/torbutton.properties
index 7bcb749c90..6d8b3856ba 100644
--- a/kn/torbutton.properties
+++ b/kn/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = ತಿಳಿಯದ ದೇಶ
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = ಟಾರ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ
 torbutton.panel.tooltip.enabled = ಟಾರ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/ko/torbutton.properties b/ko/torbutton.properties
index 11bbf784d2..b49ac0ee0b 100644
--- a/ko/torbutton.properties
+++ b/ko/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = 미확인 국가
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = 당신의 [Guard] 노드 변경할 수도 있고 변경할 수도 없습니다.
 torbutton.circuit_display.learn_more = 더 알아보기
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor 브라우저는 이 여백을 추가하여 창의 너비와 높이를 일반화 시켜 온라인에서 사용자를 추적하는 기능을 약화 시킵니다.
 torbutton.panel.tooltip.disabled = Tor를 활성화하려면 클릭
 torbutton.panel.tooltip.enabled = Tor를 비활성화하려면 클릭
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=연결은 암호화했습니다 (Oni
 pageInfo_OnionEncryption=연결은 암호화했습니다 (Onion 서비스)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=더 알아보기
-onionServices.clientAuthMissing=클라이언트 인증이 없는 Tor onion 서비스
+onionServices.errorPage.browser=브라우저
+onionServices.errorPage.network=네트워크
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S 에서 당신의 개인키를 요구하고 있습니다.
 onionServices.authPrompt.keyPlaceholder=이 onion 서비스를 사용하기 위해 개인키를 입력하세요.
 onionServices.authPrompt.done=완성
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=제거하기
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=지금은 하지 않겠습니다
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion 서비스
diff --git a/lt/torbutton.properties b/lt/torbutton.properties
index 9b5ceb2624..156480c949 100644
--- a/lt/torbutton.properties
+++ b/lt/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Nežinoma šalis
 torbutton.circuit_display.guard = Sargybinis
 torbutton.circuit_display.guard_note = Jūsų [Sargybinis] mazgas negali pasikeisti.
 torbutton.circuit_display.learn_more = Sužinoti daugiau
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Naršyklė prideda šią paraštę, kad jūsų lango plotis ir aukštis būtų mažiau atskiriami ir, tokiu būdu, žmonėms būtų sumažinta galimybė sekti jus internete.
 torbutton.panel.tooltip.disabled = Spustelėkite norėdami įjungti Tor
 torbutton.panel.tooltip.enabled = Spustelėkite norėdami išjungti Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Šifruotas ryšys (Onion paslauga, %
 pageInfo_OnionEncryption=Šifruotas ryšys (Onion paslauga)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Sužinoti daugiau
-onionServices.clientAuthMissing=Tor onion paslaugai trūksta kliento prieigos teisių
+onionServices.errorPage.browser=Naršyklė
+onionServices.errorPage.network=Tinklas
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S prašo jūsų asmeninio rakto.
 onionServices.authPrompt.keyPlaceholder=Įveskite savo privatųjį, šiai onion paslaugai skirtą, raktą
 onionServices.authPrompt.done=Atlikta
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Šalinti
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Nepavyko pašalinti raktą
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=p
+onionLocation.notNow=Ne dabar
+onionLocation.notNowAccessKey=g
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion paslaugos
diff --git a/lv/torbutton.properties b/lv/torbutton.properties
index 4ac0bbcf3f..54f239ae54 100644
--- a/lv/torbutton.properties
+++ b/lv/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Nezināma valsts
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Uzzināt vairāk
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Pārlūks Tor pievieno šo apmali, lai Jūsu logu platums un garums mazāk izceltos un samazinātos iespēja izsekot Jūs tiešsaistē.
 torbutton.panel.tooltip.disabled = Noklikšķināt, lai iespējotu Tor
 torbutton.panel.tooltip.enabled = Noklikšķināt, lai atspējotu Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Uzzināt vairāk
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Pārlūks
+onionServices.errorPage.network=Tīkls
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Izpildīts
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Noņemt
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ne tagad
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Sīpolpakalpojumi
diff --git a/mk/torbutton.properties b/mk/torbutton.properties
index 189beead80..d1fd4c12b8 100644
--- a/mk/torbutton.properties
+++ b/mk/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Непозната држава
 torbutton.circuit_display.guard = Чувар
 torbutton.circuit_display.guard_note = Твојот [Чувар] јазол може да не се промени.
 torbutton.circuit_display.learn_more = Научи повеќе
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser ја додава ова маргина за ширината и висината на вашиот прозорец да биде постандарден, со што се намалува можноста луѓето да ве следат онлајн.
 torbutton.panel.tooltip.disabled = Кликнете за да го овозможите Tor
 torbutton.panel.tooltip.enabled = Кликнете за да го оневозможите Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Енкриптирано поврз
 pageInfo_OnionEncryption=Енкриптирано поврзување (Onion Услуга)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Научете повеќе
-onionServices.clientAuthMissing=На Tor onion услугата и недостасува клиентска автентикација
+onionServices.errorPage.browser=Прелистувач
+onionServices.errorPage.network=Мрежа
+onionServices.errorPage.onionSite=Onion веб страна
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S го бара вашиот приватен клуч.
 onionServices.authPrompt.keyPlaceholder=Внесете го вашиот приватен клуч за оваа onion услуга
 onionServices.authPrompt.done=Завршено
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Отстрани
 onionServices.authPreferences.removeAll=Избриши се
 onionServices.authPreferences.failedToGetKeys=Не може да се повратат клучевите од Tor
 onionServices.authPreferences.failedToRemoveKey=Не може да се избрише клуч
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Не сега
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Услуги
diff --git a/ml/torbutton.properties b/ml/torbutton.properties
index d091d73fed..35c2aa9dd3 100644
--- a/ml/torbutton.properties
+++ b/ml/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = അപരിചിതമായ ര
 torbutton.circuit_display.guard = സൂക്ഷിക്കുന്ന ആൾ 
 torbutton.circuit_display.guard_note = നിങ്ങളുടെ [സൂക്ഷിക്കുന്ന ആൾ] ചിലപ്പോൾ മാറ്റം വന്നിട്ടുണ്ടാകില്ല 
 torbutton.circuit_display.learn_more = കൂടുതൽ അറിയാൻ 
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = ടോർ ബ്രൌസർ ഈ മാർജിൻ കൂട്ടിച്ചേർത്തു നിങ്ങളുടെ ബ്രൗസെറിന്റെ ഉയരവും വീതിയും വ്യത്യസ്തമായ ഒരു രൂപം തോന്നാതെ സൂക്ഷിക്കുന്നു , അത് മറ്റുള്ള ആളുകൾ നിങ്ങളെ ഓൺലൈനിൽ പിന്തുടരുന്നത് ഒഴിവാക്കുന്നു 
 torbutton.panel.tooltip.disabled = ടോർ അനുവദിക്കാൻ ക്ലിക്ക് ചെയുക 
 torbutton.panel.tooltip.enabled = ടോർ പ്രവർത്തനരഹിതമാക്കാൻ  ക്ലിക്ക് ചെയുക 
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=ബന്ധം എൻക്രി
 pageInfo_OnionEncryption=ബന്ധം എൻക്രിപ്റ്റഡ് ആണ്  (ഒനിയൻ സേവനം )
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=കൂടുതൽ അറിയാൻ 
-onionServices.clientAuthMissing=ടോർ ഒണിയൻ സേവനത്തിന് ക്ലയന്റ് അംഗീകാരം നഷ്‌ടമായി
+onionServices.errorPage.browser=ബ്രൌസർ 
+onionServices.errorPage.network=ശൃംഖല 
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S നിങ്ങളുടെ സ്വകാര്യ കീ അഭ്യർത്ഥിക്കുന്നു.
 onionServices.authPrompt.keyPlaceholder=ഈ ഒണിയൻ സേവനത്തിനായി നിങ്ങളുടെ സ്വകാര്യ കീ നൽകുക
 onionServices.authPrompt.done=കഴിഞ്ഞു
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=ഒഴിവാക്കുക
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=എ 
+onionLocation.notNow=ഇപ്പോൾ വേണ്ട 
+onionLocation.notNowAccessKey=എൻ 
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=ഒണിയൻ സേവനങ്ങൾ
diff --git a/mr/torbutton.properties b/mr/torbutton.properties
index e3b5f9f0b9..f4ffbfa54a 100644
--- a/mr/torbutton.properties
+++ b/mr/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = टॉर सुरू करण्यासाठी क्लिक करा
 torbutton.panel.tooltip.enabled = टॉर बंद करण्यासाठी क्लिक करा
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=झाले
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=सध्या नको
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=ओनियॉन सेवा
diff --git a/ms/torbutton.properties b/ms/torbutton.properties
index aa5d952806..66fe5f78ca 100644
--- a/ms/torbutton.properties
+++ b/ms/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Negara tidak diketahui
 torbutton.circuit_display.guard = Jaga
 torbutton.circuit_display.guard_note = Nod [Jaga] anda tidak berubah.
 torbutton.circuit_display.learn_more = Ketahui lebih lanjut
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Pelayar Tor menambah jidar ini untuk memastikan tinggi dan lebar tetingkap anda kurang dikenali, dan seterusnya mengurangkan keupayaan orang lain menjejak anda ketika berada diatas-talian.
 torbutton.panel.tooltip.disabled = Klik untuk benarkan Tor
 torbutton.panel.tooltip.enabled = Klik untuk lumpuhkan Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Sambungan Tersulit (Perkhidmatan Oni
 pageInfo_OnionEncryption=Sambungan Tersulit (Perkhidmatan Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Ketahui lebih lanjut
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Rangkaian
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Selesai
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Buang
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Bukan Sekarang
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Perkhidmatan Onion
diff --git a/my/torbutton.properties b/my/torbutton.properties
index 20430b0a4f..b71336a749 100644
--- a/my/torbutton.properties
+++ b/my/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Tor ကို ဖွင့်ရန် နှိပ်ပါ
 torbutton.panel.tooltip.enabled = Tor ကို ပိတ်ရန် နှိပ်ပါ
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=ကွန်ရက်
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=ပြီးသွားပြီ
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=ဖယ်ရှားရန်
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=P
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=P
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/nb-NO/torbutton.properties b/nb-NO/torbutton.properties
index 947b0acf10..fcc737aa8c 100644
--- a/nb-NO/torbutton.properties
+++ b/nb-NO/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Ukjent land
 torbutton.circuit_display.guard = Vakt
 torbutton.circuit_display.guard_note = Din [Vakt] node kan ikke endres.
 torbutton.circuit_display.learn_more = Lær mer
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Nettleser legger til denne marginen for å gjøre bredden og høyden på vinduet ditt mindre særegent, og reduserer dermed muligheten for folk til å spore deg på nett.
 torbutton.panel.tooltip.disabled = Klikk for å aktivere Tor
 torbutton.panel.tooltip.enabled = Klikk for å skru av Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Tilkobling kryptert (Løk Tjeneste,
 pageInfo_OnionEncryption=Tilkobling kryptert (Løk Tjeneste)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Lær mer
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Nettleser
+onionServices.errorPage.network=Nettverk
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S ber om din private nøkkel.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Ferdig
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Fjern
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ikke nå
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Løk-tjenester
diff --git a/ne/torbutton.properties b/ne/torbutton.properties
index 59dad353b9..24dcf84ceb 100644
--- a/ne/torbutton.properties
+++ b/ne/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=भयो
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/nl-BE/torbutton.properties b/nl-BE/torbutton.properties
index a3bca6f0f7..fe280e884f 100644
--- a/nl-BE/torbutton.properties
+++ b/nl-BE/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Onbekend land
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Klik om Tor in te schakelen
 torbutton.panel.tooltip.enabled = Klik om Tor uit te schakelen
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Netwerk
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Klaar
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Verwijderen
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Onbekend
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/nl/torbutton.properties b/nl/torbutton.properties
index f78f128f4a..1714bbf368 100644
--- a/nl/torbutton.properties
+++ b/nl/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Onbekend land
 torbutton.circuit_display.guard = Bewaking
 torbutton.circuit_display.guard_note = Uw [Guard]-node mag niet worden gewijzigd.
 torbutton.circuit_display.learn_more = Meer info
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen.
 torbutton.panel.tooltip.disabled = Klik om Tor in te schakelen
 torbutton.panel.tooltip.enabled = Klik om Tor uit te schakelen
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Verbinding versleuteld (Onion-servic
 pageInfo_OnionEncryption=Verbinding versleuteld (Onion-service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Meer info
-onionServices.clientAuthMissing=Tor-onion-service mist clientautorisatie
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Netwerk
+onionServices.errorPage.onionSite=Onion-website
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S vraagt om uw privésleutel.
 onionServices.authPrompt.keyPlaceholder=Voer uw privésleutel voor deze onion-service in
 onionServices.authPrompt.done=Gereed
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Verwijderen
 onionServices.authPreferences.removeAll=Alle verwijderen
 onionServices.authPreferences.failedToGetKeys=Kan geen sleutels van tor ophalen
 onionServices.authPreferences.failedToRemoveKey=Kan sleutel niet verwijderen
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Niet nu
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-diensten
diff --git a/nn-NO/torbutton.properties b/nn-NO/torbutton.properties
index 0705731e76..ed05c662ab 100644
--- a/nn-NO/torbutton.properties
+++ b/nn-NO/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Ukjend land
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Lær meir
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Trykk for å slå på Tor
 torbutton.panel.tooltip.enabled = Trykk for å slå av Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Lær meir
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Ferdig
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Fjern
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ikkje no
+onionLocation.notNowAccessKey=m
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-tenester
diff --git a/oc/torbutton.properties b/oc/torbutton.properties
index 421092987c..b6c6a100d9 100644
--- a/oc/torbutton.properties
+++ b/oc/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Suprimir
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/or/torbutton.properties b/or/torbutton.properties
index 375067b365..507fa8d95d 100644
--- a/or/torbutton.properties
+++ b/or/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/pa-IN/torbutton.properties b/pa-IN/torbutton.properties
index c268522a12..b47543a63f 100644
--- a/pa-IN/torbutton.properties
+++ b/pa-IN/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = ਅਗਿਆਤ ਦੇਸ਼
 torbutton.circuit_display.guard = ਗਾਰਡ
 torbutton.circuit_display.guard_note = ਤੁਹਾਡੇ [ ਗਾਰਡ ] ਨੋਡ ਵਿੱਚ ਤਬਦੀਲੀ ਨਹੀਂ ਹੋ ਸਕਦੀ |
 torbutton.circuit_display.learn_more = ਵਧੇਰੇ ਪੜੋ 
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = ਟੌਰ ਬਰਾਊਜ਼ਰ ਨੇ ਇਸ ਹਾਸ਼ੀਏ ਨੂੰ ਤੁਹਾਡੀ ਵਿੰਡੋ ਦੀ ਚੌੜਾਈ ਅਤੇ ਉਚਾਈ ਨੂੰ ਘੱਟ ਵਿਲੱਖਣ ਬਣਾਉਣ ਲਈ ਜੋੜਦਾ ਹੈ, ਅਤੇ ਇਸ ਤਰ੍ਹਾਂ ਲੋਕਾਂ ਦੀ ਤੁਹਾਨੂੰ ਔਨਲਾਈਨ ਟ੍ਰੈਕ ਕਰਨ ਦੀ ਯੋਗਤਾ ਨੂੰ ਘਟਾਇਆ ਹੈ |
 torbutton.panel.tooltip.disabled = ਟੋਰ ਨੂੰ ਸਕ੍ਰਿਆ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ |
 torbutton.panel.tooltip.enabled = ਟੋਰ ਨੂੰ ਨਿਸਕ੍ਰਿਆ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ |
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=ਕੁਨੈਕਸ਼ਨ ਇਨਕ
 pageInfo_OnionEncryption=ਕੁਨੈਕਸ਼ਨ ਇਨਕ੍ਰਿਪਟਡ (ਓਨਿਅਨ ਸਰਵਿਸ)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=ਵਧੇਰੇ ਪੜੋ 
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=ਮੁਕੰਮਲ
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=ਅਜੇ ਨਹੀਂ
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=ਓਨਿਅਨ ਸ਼ੇਵਾਵਾਂ
diff --git a/pl/torbutton.properties b/pl/torbutton.properties
index 94e6c9731d..e4d681250a 100644
--- a/pl/torbutton.properties
+++ b/pl/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Nieznane państwo
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Twój węzeł [Guard] może się nie zmienić.
 torbutton.circuit_display.learn_more = Dowiedz się więcej
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser dodaje ten margines po to, aby szerokość i wysokość okna Twojej przeglądarki była mniej charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online.
 torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora
 torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tora
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Połączenie zaszyfrowane (usługa O
 pageInfo_OnionEncryption=Połączenie zaszyfrowane (usługa Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Dowiedz się więcej
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Przeglądarka
+onionServices.errorPage.network=Sieć
+onionServices.errorPage.onionSite=Strona cebulowa
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description= %S żąda twój klucz prywatny.
 onionServices.authPrompt.keyPlaceholder=Wprowadź swój klucz prywatny dla tej usługi cebulowej
 onionServices.authPrompt.done=Skończone
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Usuń
 onionServices.authPreferences.removeAll=Usuń wszystko
 onionServices.authPreferences.failedToGetKeys=Nie można odebrać kluczy z Tor
 onionServices.authPreferences.failedToRemoveKey=Usunięcie klucza nie powiodło się
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=u
+onionLocation.notNow=Nie teraz
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Usługi onion
diff --git a/pt-BR/torbutton.properties b/pt-BR/torbutton.properties
index c972b62907..e503b89422 100644
--- a/pt-BR/torbutton.properties
+++ b/pt-BR/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = País desconhecido
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Seu nó [Guard] não pode mudar.
 torbutton.circuit_display.learn_more = Aprenda mais
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = O Navegador Tor inclui esta margem para que a altura e a largura da janela sejam menos distinguíveis, o que reduz a possibilidade de que alguém rastreie a sua navegação .
 torbutton.panel.tooltip.disabled = Clique para habilitar o Tor
 torbutton.panel.tooltip.enabled = Clique para desabilitar o Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Conexão criptografada (Serviço Oni
 pageInfo_OnionEncryption=Conexão criptografada (Serviço Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Saber mais
-onionServices.clientAuthMissing=O serviço onion do Tor não tem autorização de cliente
+onionServices.errorPage.browser=Navegador
+onionServices.errorPage.network=Rede
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S está solicitado a sua chave privada.
 onionServices.authPrompt.keyPlaceholder=Insira a sua chave privada para usar este serviço onion
 onionServices.authPrompt.done=Pronto
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remover
 onionServices.authPreferences.removeAll=Remover tudo
 onionServices.authPreferences.failedToGetKeys=Não foi possível recuperar as chaves do tor
 onionServices.authPreferences.failedToRemoveKey=Não foi possível remover a chave
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Por enquanto, não
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Serviços Onion
diff --git a/pt-PT/torbutton.properties b/pt-PT/torbutton.properties
index 7dc1f69d1d..58b7978661 100644
--- a/pt-PT/torbutton.properties
+++ b/pt-PT/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = País desconhecido
 torbutton.circuit_display.guard = Proteção
 torbutton.circuit_display.guard_note = O seu nó [Proteção] pode não ser alterado.
 torbutton.circuit_display.learn_more = Saber mais
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = O Tor Browser adiciona esta margem para tornar a altura e a largura da sua janela menos distinta, e com isso reduz  a possibilidade de as pessoas o rastrearem on-line.
 torbutton.panel.tooltip.disabled = Clique para ativar o Tor
 torbutton.panel.tooltip.enabled = Clique para desativar o Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Ligação Encriptada (Serviço Onion
 pageInfo_OnionEncryption=Ligação Encriptada (Serviço Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Saber mais
-onionServices.clientAuthMissing=Serviço Tor "onion" sem autorização de cliente
+onionServices.errorPage.browser=Navegador
+onionServices.errorPage.network=Rede
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S está a solicitar a sua chave privada.
 onionServices.authPrompt.keyPlaceholder=Digite a sua chave privada para este serviço "onion"
 onionServices.authPrompt.done=Concluído
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remover
 onionServices.authPreferences.removeAll=Remover todas
 onionServices.authPreferences.failedToGetKeys=Não é possível obter as chaves do tor
 onionServices.authPreferences.failedToRemoveKey=Não é possível remover a chave
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Agora Não
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Serviços Onion
diff --git a/ro/torbutton.properties b/ro/torbutton.properties
index ba78a0c846..41f1a0750b 100644
--- a/ro/torbutton.properties
+++ b/ro/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Țară necunoscută
 torbutton.circuit_display.guard = Releu Gardă
 torbutton.circuit_display.guard_note = Releul de [Gardă] va putea rămâne neschimbat.
 torbutton.circuit_display.learn_more = Află mai mult
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Navigatorul Tor Browser adaugă această margine pentru a face lățimea și înălțimea ferestrei tale mai puțin specifică, și astfel reduce abilitatea altora de a te urmări online.
 torbutton.panel.tooltip.disabled = Click pentru a activa Tor
 torbutton.panel.tooltip.enabled = Click pentru a dezactiva Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Conexiune Criptată (Serviciu Onion,
 pageInfo_OnionEncryption=Conexiune Criptată (Serviciu Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Află mai mult
-onionServices.clientAuthMissing=Serviciul onion Tor nu are autorizația clientului
+onionServices.errorPage.browser=Bowser
+onionServices.errorPage.network=Reţea
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S solicită cheia dvs. privată.
 onionServices.authPrompt.keyPlaceholder=Introduceți cheia privată pentru acest serviciu de ceapă
 onionServices.authPrompt.done=Gata
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Eliminare
 onionServices.authPreferences.removeAll=Șterge tot
 onionServices.authPreferences.failedToGetKeys=Imposibil de a prelua chei de la tor
 onionServices.authPreferences.failedToRemoveKey=Nu se poate elimina cheia
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Nu acum
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Servicii Onion
diff --git a/ru/torbutton.properties b/ru/torbutton.properties
index 8aa5010bb9..63f8e911d8 100644
--- a/ru/torbutton.properties
+++ b/ru/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Неизвестная страна
 torbutton.circuit_display.guard = Сторожевой
 torbutton.circuit_display.guard_note = Ваш [сторожевой] узел не может быть изменен.
 torbutton.circuit_display.learn_more = Узнать больше
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser добавляет этот отступ, чтобы ширина и высота окна были менее узнаваемыми, что усложняет возможность отследить вас в интернете.
 torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor
 torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Соединение зашифро
 pageInfo_OnionEncryption=Соединение зашифровано (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Узнать больше
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Браузер
+onionServices.errorPage.network=Сеть
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S запрашивает ваш закрытый ключ.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Готово
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Удалить
 onionServices.authPreferences.removeAll=Удалить все
 onionServices.authPreferences.failedToGetKeys=Невозможно получить ключи от Tor
 onionServices.authPreferences.failedToRemoveKey=Невозможно удалить ключ
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Не сейчас
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Всегда
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-ресурсы
diff --git a/si/torbutton.properties b/si/torbutton.properties
index eb84f118e3..0d0c7271fb 100644
--- a/si/torbutton.properties
+++ b/si/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Tor ස්ථාපනය කිරීමට ක්ලික් කරන්න 
 torbutton.panel.tooltip.enabled = Tor අබල කිරීමට ක්ලික් කරන්න 
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=ජාලය
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=කාර්යය ඉටු කරන ලදී
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=ඉවත්කරන්න
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/sk/torbutton.properties b/sk/torbutton.properties
index f5f38fae06..1a602d6ba1 100644
--- a/sk/torbutton.properties
+++ b/sk/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Neznáma krajina
 torbutton.circuit_display.guard = Ochrana
 torbutton.circuit_display.guard_note = Váš [Ochranný] uzol nie je možné zmeniť
 torbutton.circuit_display.learn_more = Zistite viac
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser pridá okraj a urobí šírku a výšku vášho okna menej charakteristicku, tým znižuje schopnosť ľudí, aby vás sledovať on-line.
 torbutton.panel.tooltip.disabled = Kliknutím aktivujem Tor
 torbutton.panel.tooltip.enabled = Kliknutím deaktivujem Torr
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Spojenie šifrované (Služba Onion,
 pageInfo_OnionEncryption=Spojenie šifrované (Služba Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Zisti viac
-onionServices.clientAuthMissing=Služba Tor onion nemá oprávnenie klienta
+onionServices.errorPage.browser=Prehliadač
+onionServices.errorPage.network=Sieť
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S požaduje Váš súkromný kľúč.
 onionServices.authPrompt.keyPlaceholder=Vložte svoj súkromný kľúč pre túto onion službu
 onionServices.authPrompt.done=Hotovo 
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Odstrániť
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Teraz nie
+onionLocation.notNowAccessKey=p
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Služby Onion
diff --git a/sl/torbutton.properties b/sl/torbutton.properties
index 416e1ab5f6..a078fe56cd 100644
--- a/sl/torbutton.properties
+++ b/sl/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Klikni za vklop anonimizacije
 torbutton.panel.tooltip.enabled = Klikni za izklop anonimizacije
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Omrežje
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Opravljeno
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Ne sedaj
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/son/torbutton.properties b/son/torbutton.properties
index 375067b365..507fa8d95d 100644
--- a/son/torbutton.properties
+++ b/son/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Done
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/sq/torbutton.properties b/sq/torbutton.properties
index a2f51726dc..c65acd4ccd 100644
--- a/sq/torbutton.properties
+++ b/sq/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Vend i panjohur
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Meso me teper
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser shton këtë kufi që ta bëjë më pak të dallueshme gjerësinë dhe lartësinë e dritares tënde, duke e zvogëluar kështu aftësinë e njerëzve që t'ju gjurmojnë në internet.
 torbutton.panel.tooltip.disabled = Klikoni për të aftësuar Tor
 torbutton.panel.tooltip.enabled = Klikoni për të paaftësuar Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Mëso më tepër
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Shfletues
+onionServices.errorPage.network=Rrjeti
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=U krye
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Hiqe
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=një
+onionLocation.notNow=Jo Tani
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Shërbime Onion
diff --git a/sr/torbutton.properties b/sr/torbutton.properties
index 07058469df..a2892ef746 100644
--- a/sr/torbutton.properties
+++ b/sr/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Непозната држава
 torbutton.circuit_display.guard = Čuvar
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Saznaj više
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Brauzer dodaje ovu marginu da bi visinu i širinu vašeg prozora učini manje određenom, a samim tim umanjuje mogućnost da vas neko prati na netu.
 torbutton.panel.tooltip.disabled = Кликните да бисте омогућили Тор
 torbutton.panel.tooltip.enabled = Кликните да бисте онемогућили Тор
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Veza šifrovana (Onion usluga)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Saznaj više
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Претраживач
+onionServices.errorPage.network=Mreža
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Gotovo
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Ukloni
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Не сада
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion usluge
diff --git a/sv-SE/torbutton.properties b/sv-SE/torbutton.properties
index 6062fc6166..caa5e82413 100644
--- a/sv-SE/torbutton.properties
+++ b/sv-SE/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Okänt land
 torbutton.circuit_display.guard = Vakt
 torbutton.circuit_display.guard_note = Din [Guard]-nod kanske inte ändras.
 torbutton.circuit_display.learn_more = Läs mer
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser lägger till denna marginal för att göra bredden och höjden på ditt fönster mindre tydlig. Därmed minskas möjligheten att spåra dig.
 torbutton.panel.tooltip.disabled = Klicka för att aktivera Tor
 torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Anslutning krypterad (Onion-tjänst,
 pageInfo_OnionEncryption=Anslutning krypterad (Onion-tjänst)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Läs mer
-onionServices.clientAuthMissing=Tor onion-tjänst saknar klientautentisering
+onionServices.errorPage.browser=Webbläsare
+onionServices.errorPage.network=Nätverk
+onionServices.errorPage.onionSite=Onion-sida
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S begär din privata nyckel.
 onionServices.authPrompt.keyPlaceholder=Ange din privata nyckel för den här onion-tjänsten
 onionServices.authPrompt.done=Färdig
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Ta bort
 onionServices.authPreferences.removeAll=Ta bort alla
 onionServices.authPreferences.failedToGetKeys=Det går inte att hämta nycklar från Tor
 onionServices.authPreferences.failedToRemoveKey=Det går inte att ta bort nyckeln
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Inte just nu
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion-tjänster
diff --git a/sw/torbutton.properties b/sw/torbutton.properties
index cae23e88f6..2168f1f85a 100644
--- a/sw/torbutton.properties
+++ b/sw/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Kujifunza zaidi
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Kujifunza zaidi
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Kivinjari
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Imefanywa
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Ondoa
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Huduma za Onion
diff --git a/ta/torbutton.properties b/ta/torbutton.properties
index 2735cc084b..0c8ae6ebaa 100644
--- a/ta/torbutton.properties
+++ b/ta/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = தெரியாத நாடு
 torbutton.circuit_display.guard = காப்பு
 torbutton.circuit_display.guard_note = உங்கள் [காப்பு] கணு மாறாமால் போகலாம்.
 torbutton.circuit_display.learn_more = மேலும் அறிய
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor உலாவி உங்கள் சாளரத்தின் அகலம் மற்றும் உயரத்தை குறைந்த வேறுபாடுடையதாக ஆக்குவதற்காக இந்த வரம்பைச் சேர்க்கிறது, இணையத்தில் உங்களைப் பின்தொடரும் திறனைக் குறைக்கிறது.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=இணைப்பு மறைய
 pageInfo_OnionEncryption=இணைப்பு மறையாக்கப்பட்டது (Onion சேவை)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=மேலும் அறிய
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=உலாவி
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=முடிந்தது
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=நீக்கு
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=இப்போதில்லை
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion சேவைகள்
diff --git a/te/torbutton.properties b/te/torbutton.properties
index 5cf1575cfe..6f4f43e424 100644
--- a/te/torbutton.properties
+++ b/te/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=పూర్తి
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Remove
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/th/torbutton.properties b/th/torbutton.properties
index 2a66ffc0a4..5d0d83c189 100644
--- a/th/torbutton.properties
+++ b/th/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = ไม่ทราบประเท
 torbutton.circuit_display.guard = การ์ด
 torbutton.circuit_display.guard_note = [การ์ด] โหนดของคุณอาจไม่เปลี่ยนแปลง
 torbutton.circuit_display.learn_more = เรียนรู้เพิ่มเติม
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser เพิ่มระยะขอบนี้เพื่อทำให้ความกว้างและความสูงของหน้าต่างคุณโดดเด่นน้อยลง และลดความสามารถของบุคคลอื่นในการติดตามคุณทางออนไลน์
 torbutton.panel.tooltip.disabled = คลิกเพื่อเปิดใช้ Tor
 torbutton.panel.tooltip.enabled = คลิกเพื่อปิด Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=การเชื่อมต่อ
 pageInfo_OnionEncryption=การเชื่อมต่อเข้ารหัสลับ (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=เรียนรู้เพิ่มเติม
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=เบราว์เซอร์
+onionServices.errorPage.network=เครือข่าย
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S ร้องขอกุญแจส่วนตัวของคุณ
 onionServices.authPrompt.keyPlaceholder=ใส่กุญแจส่วนตัวของคุณสำหรับ onion service นี้
 onionServices.authPrompt.done=เสร็จสิ้น
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=ลบออก
 onionServices.authPreferences.removeAll=ลบออกทั้งหมด
 onionServices.authPreferences.failedToGetKeys=ไม่สามารถดึงกุญแจจาก Tor
 onionServices.authPreferences.failedToRemoveKey=ไม่สามารถลบกุญแจได้
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=ป
+onionLocation.notNow=ไม่ใช่ตอนนี้
+onionLocation.notNowAccessKey=พ
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=บริการ Onion
diff --git a/tr/torbutton.properties b/tr/torbutton.properties
index aaa4b3aaab..8bfbc0079f 100644
--- a/tr/torbutton.properties
+++ b/tr/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Bilinmeyen Ülke
 torbutton.circuit_display.guard = Koruma
 torbutton.circuit_display.guard_note = [Koruma] düğümünüz değiştirilemez.
 torbutton.circuit_display.learn_more = Ayrıntılı bilgi alın
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser pencerenizin genişlik ve yüksekliğini daha az ayırt edilebilir duruma getirmek için kenar boşlukları ekleyerek kişilerin sizi çevrim içi olarak izleme yeteneğini azaltır.
 torbutton.panel.tooltip.disabled = Tor uygulamasını etkinleştirmek için tıklayın
 torbutton.panel.tooltip.enabled = Tor uygulamasını devre dışı bırakmak için tıklayın
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Bağlantı Şifreli (Onion Hizmeti,
 pageInfo_OnionEncryption=Bağlantı Şifreli (Onion Hizmeti)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Ayrıntılı bilgi alın
-onionServices.clientAuthMissing=Tor Onion hizmeti istemci kimlik doğrulaması eksik
+onionServices.errorPage.browser=Tarayıcı
+onionServices.errorPage.network=Ağ
+onionServices.errorPage.onionSite=Onion Sitesi
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S kişisel anahtarınıza gerek duyuyor
 onionServices.authPrompt.keyPlaceholder=Bu Onion hizmeti için kişisel anahtarınızı yazın
 onionServices.authPrompt.done=Tamam
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Sil
 onionServices.authPreferences.removeAll=Tümünü Sil
 onionServices.authPreferences.failedToGetKeys=Anahtarlar Tor üzerinden alınamadı
 onionServices.authPreferences.failedToRemoveKey=Anahtar silinemedi
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Şimdi Değil
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Hizmetleri
diff --git a/uk/torbutton.properties b/uk/torbutton.properties
index df4440a869..b752d504c5 100644
--- a/uk/torbutton.properties
+++ b/uk/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Невідома країна
 torbutton.circuit_display.guard = Охорона
 torbutton.circuit_display.guard_note = Ваш вузол [Охорони] не може змінитися.
 torbutton.circuit_display.learn_more = Дізнатися більше
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser додає ці поля для того, щоб зробити висоту і ширину вікна менш відмінною, що зменшує можливість відстежувати вас.
 torbutton.panel.tooltip.disabled = Натисніть аби увімкнути Tor
 torbutton.panel.tooltip.enabled = Натисніть аби вимкнути Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=З'єднання зашифрова
 pageInfo_OnionEncryption=З'єднання зашифроване (Цибуляна служба)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Дізнатися більше
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Браузер
+onionServices.errorPage.network=Мережа
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Готово
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Прибрати
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=а
+onionLocation.notNow=Не зараз
+onionLocation.notNowAccessKey=p
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Служби Onion
diff --git a/ur/torbutton.properties b/ur/torbutton.properties
index 9fc39fa6c1..ba804686d0 100644
--- a/ur/torbutton.properties
+++ b/ur/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = نامعلوم ملک
 torbutton.circuit_display.guard = محافظ
 torbutton.circuit_display.guard_note = آپ کا [محافظ] شاید تبدیل نہ ہو۔
 torbutton.circuit_display.learn_more = مزید جانئیے
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = ٹار کو فعال کرنے کیلئے کلک کریں
 torbutton.panel.tooltip.enabled = ٹار کو غیر فعال کرنے کیلئے کلک کریں
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=مزید جانئیے
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=مکمل ہوگیا
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=خارج کیجیے
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=ابھی نہیں
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/uz/torbutton.properties b/uz/torbutton.properties
index 951959149f..79cf95f6df 100644
--- a/uz/torbutton.properties
+++ b/uz/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Learn more
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Тайёр 
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Убрать
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Not Now
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/vi/torbutton.properties b/vi/torbutton.properties
index fc08d6a418..dc0f9c5207 100644
--- a/vi/torbutton.properties
+++ b/vi/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Đất nước không được biế
 torbutton.circuit_display.guard = Bảo vệ
 torbutton.circuit_display.guard_note = Nút [Bảo vệ} của bạn có thể không thay đổi.
 torbutton.circuit_display.learn_more = Biết thêm
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Trình duyệt Tor thêm lề này để làm cho chiều rộng và chiều cao của màn hình của bạn ít dễ bị phân biệt hơn, và vì thế giảm khả năng của những người theo dõi bạn trực tuyến.
 torbutton.panel.tooltip.disabled = Nhấn để bật Tor
 torbutton.panel.tooltip.enabled = Nhấn để tắt Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Đã mã hóa kết nối (Onion Ser
 pageInfo_OnionEncryption=Đã mã hóa kết nối (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=Biết thêm
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Trình duyệt
+onionServices.errorPage.network=Mạng lưới
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=Hoàn tất
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Gỡ bỏ
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=y
+onionLocation.notNow=Không phải bây giờ
+onionLocation.notNowAccessKey=y
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Các Dịch vụ Onion
diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties
index ff530575d9..f4770a48e7 100644
--- a/zh-CN/torbutton.properties
+++ b/zh-CN/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = 未知国家
 torbutton.circuit_display.guard = 守卫
 torbutton.circuit_display.guard_note = 您的[守卫]节点似乎并未改变
 torbutton.circuit_display.learn_more = 详细了解
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了一些边框,以降低窗口大小的独特性,令在线跟踪监控变得更加困难。
 torbutton.panel.tooltip.disabled = 点击启用 Tor
 torbutton.panel.tooltip.enabled = 点击禁用 Tor
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=连接已经被加密(洋葱服务
 pageInfo_OnionEncryption=连接已经被加密(洋葱服务)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=更多详情
-onionServices.clientAuthMissing=Tor 洋葱服务客户端认证失败
+onionServices.errorPage.browser=浏览器
+onionServices.errorPage.network=网络
+onionServices.errorPage.onionSite=洋葱站
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S 需要您的私钥
 onionServices.authPrompt.keyPlaceholder=输入您的私钥来使用此洋葱服务
 onionServices.authPrompt.done=完成
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=移除
 onionServices.authPreferences.removeAll=移除全部
 onionServices.authPreferences.failedToGetKeys=无法从 Tor 获得密钥
 onionServices.authPreferences.failedToRemoveKey=无法移除密钥
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=暂不
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=始终
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=洋葱服务
diff --git a/zh-HK/torbutton.properties b/zh-HK/torbutton.properties
index f035c54afe..3e96f8f4e2 100644
--- a/zh-HK/torbutton.properties
+++ b/zh-HK/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = 不明國家
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Your [Guard] node may not change.
 torbutton.circuit_display.learn_more = 更多
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = Tor洋蔥路由瀏覽器特意將視窗邊框嘅闊度同高度重新設定,以使你嘅瀏覽器狀態資訊睇嚟更為普通,如此可減少你嘅網絡活動被識別並追蹤嘅可能性。
 torbutton.panel.tooltip.disabled = 撳落去啟用Tor洋蔥路由
 torbutton.panel.tooltip.enabled = 撳落去停用洋蔥路由
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service,
 pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=更多
-onionServices.clientAuthMissing=Tor onion service missing client authorization
+onionServices.errorPage.browser=Browser
+onionServices.errorPage.network=Network
+onionServices.errorPage.onionSite=Onionsite
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S is requesting your private key.
 onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
 onionServices.authPrompt.done=完成 
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=移除
 onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=稍後
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=Onion Services
diff --git a/zh-TW/torbutton.properties b/zh-TW/torbutton.properties
index 56a6dcc96e..0e56f64d3f 100644
--- a/zh-TW/torbutton.properties
+++ b/zh-TW/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = 未知的國家
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = 你的[Guard]節點可能不會更改。
 torbutton.circuit_display.learn_more = 繼續閱讀
+torbutton.circuit_display.click_to_copy = Click to Copy
+torbutton.circuit_display.copied = Copied!
 torbutton.content_sizer.margin_tooltip = 洋蔥路由瀏覽器特意將視窗邊框的寬度及高度重新設置,以便讓您的瀏覽器狀態資訊看起來更為普通,如此可以減少您的網路活動被識別並追蹤的可能性。
 torbutton.panel.tooltip.disabled = 按一下以啟用洋蔥路由
 torbutton.panel.tooltip.enabled = 按一下以停用洋蔥路由
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=連線已加密 (洋蔥服務, %1$S,
 pageInfo_OnionEncryption=連接加密(洋蔥服務)
 
 # Onion services strings.  Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.learnMore=了解更多
-onionServices.clientAuthMissing=Tor onion 服務缺少用戶端授權
+onionServices.errorPage.browser=瀏覧器
+onionServices.errorPage.network=網路
+onionServices.errorPage.onionSite=Onion 網站
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+#                    an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Problem Loading Onionsite
+onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+onionServices.descInvalid.header=Onionsite Cannot Be Reached
+onionServices.descInvalid=The onionsite is unreachable due an internal error.
+onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Problem Loading Onionsite
+onionServices.introFailed.header=Onionsite Has Disconnected
+onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=Authorization Required
+onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Problem Loading Onionsite
+onionServices.badAddress.header=Invalid Onionsite Address
+onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
 onionServices.authPrompt.description=%S 正請求您的私鑰。
 onionServices.authPrompt.keyPlaceholder=請輸入私鑰以使用此 onion 服務
 onionServices.authPrompt.done=完成
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=移除
 onionServices.authPreferences.removeAll=全部移除
 onionServices.authPreferences.failedToGetKeys=無法從 Tor 擷取金鑰
 onionServices.authPreferences.failedToRemoveKey=無法移除金鑰
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Always Prioritize Onions
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=稍後
+onionLocation.notNowAccessKey=n
+onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship.
+onionLocation.tryThis=Try Onion Services
+onionLocation.onionAvailable=.onion available
+onionLocation.learnMore=Learn more…
+onionLocation.always=Always
+onionLocation.askEverytime=Ask every time
+onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known.
+onionLocation.onionServicesTitle=洋蔥服務



More information about the tor-commits mailing list