[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
From: translation@xxxxxxxxxxxxxx
Date: Fri, 3 Apr 2020 09:23:09 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 03 Apr 2020 05:23:45 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 11f690c3a2f44311e27928185e842ff60c7bfbe9
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
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=æ´?è?¥æ??å??

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits