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

[tor-commits] [tor-launcher/master] Translations update

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-launcher/master] Translations update
From: gk@xxxxxxxxxxxxxx
Date: Wed, 16 Oct 2019 20:18:14 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 16 Oct 2019 16:19:08 -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: Georg Koppen <gk@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 85540a0af9f3f2139998fa5bd0fffbdaf7a13335
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Wed Oct 16 20:17:46 2019 +0000

    Translations update
---
 src/chrome/locale/af/network-settings.dtd    | 24 ++---------
 src/chrome/locale/ar/network-settings.dtd    | 22 ++--------
 src/chrome/locale/az/network-settings.dtd    | 20 +---------
 src/chrome/locale/be/network-settings.dtd    | 20 +---------
 src/chrome/locale/bg/network-settings.dtd    | 20 +---------
 src/chrome/locale/bn/network-settings.dtd    | 26 +++---------
 src/chrome/locale/br/network-settings.dtd    | 18 +--------
 src/chrome/locale/bs/network-settings.dtd    | 20 +---------
 src/chrome/locale/ca/network-settings.dtd    | 22 ++--------
 src/chrome/locale/cs/network-settings.dtd    | 20 +---------
 src/chrome/locale/cy/network-settings.dtd    | 24 ++---------
 src/chrome/locale/da/network-settings.dtd    | 20 +---------
 src/chrome/locale/de/network-settings.dtd    | 22 ++--------
 src/chrome/locale/el/network-settings.dtd    | 26 +++---------
 src/chrome/locale/eo/network-settings.dtd    | 22 ++--------
 src/chrome/locale/es-AR/network-settings.dtd | 46 +++++++--------------
 src/chrome/locale/es-MX/network-settings.dtd | 22 ++--------
 src/chrome/locale/es/network-settings.dtd    | 22 ++--------
 src/chrome/locale/et/network-settings.dtd    | 24 ++---------
 src/chrome/locale/eu/network-settings.dtd    | 24 ++---------
 src/chrome/locale/fa/network-settings.dtd    | 22 ++--------
 src/chrome/locale/fi/network-settings.dtd    | 20 +---------
 src/chrome/locale/fr/network-settings.dtd    | 54 ++++++++++---------------
 src/chrome/locale/fr/torlauncher.properties  |  2 +-
 src/chrome/locale/fy/network-settings.dtd    | 18 +--------
 src/chrome/locale/ga/network-settings.dtd    | 24 ++---------
 src/chrome/locale/gl/network-settings.dtd    | 18 +--------
 src/chrome/locale/gu/network-settings.dtd    | 20 +---------
 src/chrome/locale/he/network-settings.dtd    | 40 ++++++-------------
 src/chrome/locale/hi/network-settings.dtd    | 24 ++---------
 src/chrome/locale/hr/network-settings.dtd    | 22 ++--------
 src/chrome/locale/hu/network-settings.dtd    | 20 +---------
 src/chrome/locale/hy/network-settings.dtd    | 20 +---------
 src/chrome/locale/id/network-settings.dtd    | 22 ++--------
 src/chrome/locale/is/network-settings.dtd    | 46 +++++++--------------
 src/chrome/locale/it/network-settings.dtd    | 22 ++--------
 src/chrome/locale/ja/network-settings.dtd    | 44 +++++++-------------
 src/chrome/locale/ka/network-settings.dtd    | 24 ++---------
 src/chrome/locale/kk/network-settings.dtd    | 22 ++--------
 src/chrome/locale/km/network-settings.dtd    | 28 +++----------
 src/chrome/locale/kn/network-settings.dtd    | 18 +--------
 src/chrome/locale/ko/network-settings.dtd    | 20 +---------
 src/chrome/locale/lt/network-settings.dtd    | 42 ++++++-------------
 src/chrome/locale/lv/network-settings.dtd    | 22 ++--------
 src/chrome/locale/mk/network-settings.dtd    | 50 ++++++++---------------
 src/chrome/locale/ml/network-settings.dtd    | 60 ++++++++++------------------
 src/chrome/locale/mr/network-settings.dtd    | 18 +--------
 src/chrome/locale/ms-MY/network-settings.dtd | 24 ++---------
 src/chrome/locale/my/network-settings.dtd    | 24 ++---------
 src/chrome/locale/nb/network-settings.dtd    | 26 +++---------
 src/chrome/locale/ne/network-settings.dtd    | 16 --------
 src/chrome/locale/nl-BE/network-settings.dtd | 20 +---------
 src/chrome/locale/nl/network-settings.dtd    | 42 ++++++-------------
 src/chrome/locale/nl/torlauncher.properties  |  2 +-
 src/chrome/locale/nn/network-settings.dtd    | 22 ++--------
 src/chrome/locale/pa/network-settings.dtd    | 24 ++---------
 src/chrome/locale/pl/network-settings.dtd    | 18 +--------
 src/chrome/locale/pt-BR/network-settings.dtd | 46 +++++++--------------
 src/chrome/locale/pt-PT/network-settings.dtd | 26 +++---------
 src/chrome/locale/ro/network-settings.dtd    | 20 +---------
 src/chrome/locale/ru/network-settings.dtd    | 44 +++++++-------------
 src/chrome/locale/si-LK/network-settings.dtd | 26 +++---------
 src/chrome/locale/sk/network-settings.dtd    | 24 ++---------
 src/chrome/locale/sl/network-settings.dtd    | 26 +++---------
 src/chrome/locale/sq/network-settings.dtd    | 28 +++----------
 src/chrome/locale/sr/network-settings.dtd    | 26 +++---------
 src/chrome/locale/sv/network-settings.dtd    | 20 +---------
 src/chrome/locale/sw/network-settings.dtd    | 21 ++--------
 src/chrome/locale/ta/network-settings.dtd    | 24 ++---------
 src/chrome/locale/te/network-settings.dtd    | 16 --------
 src/chrome/locale/th/network-settings.dtd    | 28 +++----------
 src/chrome/locale/tr/network-settings.dtd    | 18 +--------
 src/chrome/locale/uk/network-settings.dtd    | 18 +--------
 src/chrome/locale/ur/network-settings.dtd    | 22 ++--------
 src/chrome/locale/uz/network-settings.dtd    | 22 ++--------
 src/chrome/locale/vi/network-settings.dtd    | 24 ++---------
 src/chrome/locale/zh-CN/network-settings.dtd | 36 +++++------------
 src/chrome/locale/zh-HK/network-settings.dtd | 22 ++--------
 src/chrome/locale/zh-TW/network-settings.dtd | 26 +++---------
 79 files changed, 379 insertions(+), 1608 deletions(-)

diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd
index 2fcaa2d..0a3269e 100644
--- a/src/chrome/locale/af/network-settings.dtd
+++ b/src/chrome/locale/af/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Poort">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Gebruikersnaam">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Wagwoord">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Hierdie rekenaar gaan deur 'n firewall wat slegs konneksies na sekere poorte toelaat">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Toegelate Poorte">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index b6fc1de..9f046c3 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Ø§Ø®ØªÙ?Ø§Ø±Ù?">
 
 <!ENTITY torsettings.useProxy.checkbox "Ø£Ø³ØªØ®Ø¯Ù? Ù?Ø³Ù?Ø·Ø§ Ù?Ù?Ø§ØªØµØ§Ù? Ø¨Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Ù?Ù?Ø¹ Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù?">
 <!ENTITY torsettings.useProxy.type.placeholder "Ø§Ø®ØªØ± Ù?Ù?Ø¹ Ø§Ù?Ù?Ø³Ù?Ø·">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Ø§Ù?Ø¹Ù?Ù?Ø§Ù?">
 <!ENTITY torsettings.useProxy.address.placeholder "Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª IP Ø£Ù? Ø§Ø³Ù? Ø§Ù?Ù?Ø¶Ù?Ù?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Ø§Ù?Ù?Ù?Ù?Ø°">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Ù?Ù?Ù?Ø°">
 <!ENTITY torsettings.useProxy.username "Ø§Ø³Ù? Ø§Ù?Ù?Ø³ØªØ®Ø¯Ù?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Ù?Ù?Ù?Ø© Ø§Ù?Ø³Ø±">
+<!ENTITY torsettings.useProxy.password "â?®Ù?Ù?Ù?Ø© Ø§Ù?Ø³Ù?Ø±">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ø§ØªØµØ§Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ø¨Ù?Ù?ØªØ± Ù?Ù?Ø± Ø¨Ø¬Ø¯Ø§Ø± ØÙ?Ø§Ù?Ø© Ù?Ø³Ù?Ø Ø¨Ø§Ù?Ø§ØªØµØ§Ù? Ù?Ù?Ø· Ù?Ù? Ø®Ù?Ø§Ù? Ù?Ù?Ø§Ù?Ø° Ù?Ø¹Ù?Ù?Ø©">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ø§Ù?Ù?Ù?Ø§Ù?Ø° Ø§Ù?Ù?Ø³Ù?Ù?Ø Ø¨Ù?Ø§">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "ØªÙ?Ø± Ù?ØØ¬Ù?Ø¨ Ù?Ù? Ø¨Ù?Ø¯Ù?">
 <!ENTITY torsettings.useBridges.default "Ø§Ø®ØªØ± Ø¬Ø³Ø±Ø§ Ù?Ù?Ø¯Ù?Ù?Ø¬Ø§ Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬">
 <!ENTITY torsettings.useBridges.default.placeholder "Ø§Ø®ØªØ± Ø¬Ø³Ø±Ø§">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Ø§Ù?Ø¬Ø³Ù?Ø±">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Ù?ØªÙ?Ø¯Ù?">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ØÙ? Ù?Ø§Ø¨Ø§ØªØ´Ø§ Ù?Ø·Ù?Ø¨ Ø¬Ø³Ø±.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ø§Ù?ØÙ? Ù?Ù?Ø³ Ø³Ù?Ù?Ù?Ù?Ø§. Ù?Ù?Ø±Ø¬Ù? Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù?Ù?ØØ§Ù?Ù?Ø©.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ø§Ø·Ù?Ø¨ Ø¬Ø³Ø±Ø§ Ø¬Ø¯Ù?Ø¯Ø§â?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ù?ØªØµÙ? Ø¨Ù?Ø§Ø¹Ø¯Ø© Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?Ø¬Ø³Ù?Ø± BridgeDB. Ù?Ù?Ø±Ø¬Ù? Ø§Ù?Ø§Ù?ØªØ¸Ø§Ø±.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ØÙ? Ù?Ø§Ø¨Ø§ØªØ´Ø§ Ù?Ø·Ù?Ø¨ Ø¬Ø³Ø±.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ø§Ù?ØÙ? Ù?Ù?Ø³ Ø³Ù?Ù?Ù?Ù?Ø§. Ù?Ù?Ø±Ø¬Ù? Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù?Ù?ØØ§Ù?Ù?Ø©.">
diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd
index 4b9f8af..a4b106e 100644
--- a/src/chrome/locale/az/network-settings.dtd
+++ b/src/chrome/locale/az/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Æ?lavÉ?">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Tipi">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Ã?nvan">
 <!ENTITY torsettings.useProxy.address.placeholder "Ä°P Ã¼nvanÄ± vÉ? ya anakompÃ¼terin adÄ±">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Ä°stifadÉ?Ã§i adÄ±">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Å?ifrÉ?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Bu kompÃ¼ter yalnÄ±z mÃ¼É?yyÉ?n portlarla É?laqÉ?yÉ? icazÉ? verÉ?n tÉ?hlÃ¼kÉ?sizlik divarindan keÃ§ir">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ä°czaÉ? verilÉ?n portlar">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "KÃ¶rpÃ¼lÉ?r">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "QabaqcÄ±l">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd
index 17953ff..4fc669a 100644
--- a/src/chrome/locale/be/network-settings.dtd
+++ b/src/chrome/locale/be/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Ð?Ð¾Ñ?Ñ?">
+<!ENTITY torsettings.useProxy.username "Ð?Ð¼Ñ? ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð½Ñ?ÐºÐ°">
 <!ENTITY torsettings.useProxy.password "Ð?Ð°Ñ?Ð¾Ð»Ñ?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Ð?Ð°Ñ?Ñ?Ñ?">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Ð?Ð°Ð´Ð°Ñ?ÐºÐ¾Ð²Ð°">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd
index 0ae6e2b..0df6506 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»ÐµÐ½">
 
 <!ENTITY torsettings.useProxy.checkbox "Ð?Ð· Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¼ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð·Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ð´Ð¾ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Ð?Ñ?Ð¾ÐºÑ?Ð¸ Ð¢Ð¸Ð¿">
+<!ENTITY torsettings.useProxy.type "Ð¢Ð¸Ð¿ Ð¿Ñ?Ð¾ÐºÑ?Ð¸">
 <!ENTITY torsettings.useProxy.type.placeholder "Ð?Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð²Ð¸Ð´Ð° Ð½Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸Ñ?Ð¾">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Ð?Ð´Ñ?ÐµÑ?">
 <!ENTITY torsettings.useProxy.address.placeholder "IP Ð°Ð´Ñ?ÐµÑ? Ð¸Ð»Ð¸ Ñ?Ð¾Ñ?Ñ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Ð?Ð¾Ñ?Ñ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Ð?Ð°Ñ?Ð¾Ð»Ð°">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ð¢Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ñ?Ðµ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð° Ð¿Ñ?ÐµÐ· firewall,ÐºÐ¾Ð¹Ñ?Ð¾ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?Ð²Ð° Ð²Ñ?Ñ?Ð·ÐºÐ¸ Ñ?Ð°Ð¼Ð¾ ÐºÑ?Ð¼ Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ðµ.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ð?Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ðµ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor  Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½ Ð² Ð¼Ð¾Ñ?Ñ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð°">
 <!ENTITY torsettings.useBridges.default "Ð?Ð·Ð±Ð¾Ñ? Ð½Ð° Ð²Ð³Ñ?Ð°Ð´ÐµÐ½ Ð±Ñ?Ð¸Ð´Ð¶">
 <!ENTITY torsettings.useBridges.default.placeholder "Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð±Ñ?Ð¸Ð´Ð¶">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Ð?Ñ?Ð¸Ð´Ð¶Ð¾Ð²Ðµ">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð°Ð»Ð¸">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð ÐµÑ?ÐµÑ?Ðµ CAPTCHA Ð·Ð° Ð·Ð°Ñ?Ð²ÐºÐ° Ð½Ð° bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð ÐµÑ?ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð½Ðµ Ðµ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾. Ð?Ð¾Ð»Ñ?, Ð¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¿Ð°Ðº.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ð?Ð°Ñ?Ð²ÐºÐ° Ð·Ð° Ð½Ð¾Ð² bridge...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ð¡Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ Ñ? BridgeDB. Ð?Ð¾Ð»Ñ? Ð¸Ð·Ñ?Ð°ÐºÐ°Ð¹Ñ?Ðµ.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð ÐµÑ?ÐµÑ?Ðµ CAPTCHA Ð·Ð° Ð·Ð°Ñ?Ð²ÐºÐ° Ð½Ð° bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð ÐµÑ?ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð½Ðµ Ðµ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾. Ð?Ð¾Ð»Ñ?, Ð¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¿Ð°Ðº.">
diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd
index 8518247..e8e1001 100644
--- a/src/chrome/locale/bn/network-settings.dtd
+++ b/src/chrome/locale/bn/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "à¦?à¦?à§?à¦?à¦¿à¦?">
 
 <!ENTITY torsettings.useProxy.checkbox "à¦?à¦®à¦¿ à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦?à§? à¦¸à¦?à¦¯à§?à¦? à¦¸à§?à¦¥à¦¾à¦ªà¦¨ à¦?à¦°à¦¤à§? à¦ªà§?à¦°à¦?à§?à¦¸à¦¿ à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à¦¿">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "à¦ªà§?à¦°à¦?à§?à¦¸à¦¿ à¦ªà§?à¦°à¦?à¦¾à¦°">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "à¦?à¦?à¦?à¦¿ à¦ªà§?à¦°à¦?à§?à¦¸à¦¿ à¦?à¦¾à¦?à¦ª à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "à¦ à¦¿à¦?à¦¾à¦¨à¦¾">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "à¦?à¦?à¦ªà¦¿ à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦¬à¦¾ à¦¹à§?à¦¸à§?à¦?à¦¨à¦¾à¦®">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "à¦ªà§?à¦°à§?à¦?à¦?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦°à¦?à¦¾à¦°à§? à¦¨à¦¾à¦®">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "à¦¬à¦¨à§?à¦¦à¦°">
+<!ENTITY torsettings.useProxy.username "à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦°à¦?à¦¾à¦°à§?à¦° à¦¨à¦¾à¦®">
 <!ENTITY torsettings.useProxy.password "à¦ªà¦¾à¦¸à¦?à¦¯à¦¼à¦¾à¦°à§?à¦¡">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "à¦?à¦? à¦?à¦®à§?à¦ªà¦¿à¦?à¦?à¦¾à¦°à¦?à¦¿ à¦?à¦?à¦?à¦¿ à¦«à¦¾à¦¯à¦¼à¦¾à¦°à¦?à¦¯à¦¼à¦¾à¦²à§?à¦° à¦®à¦¾à¦§à§?à¦¯à¦®à§? à¦¯à¦¾à¦¯à¦¼ à¦¯à¦¾ à¦?à§?à¦¬à¦²à¦®à¦¾à¦¤à§?à¦° à¦?à¦¿à¦?à§? à¦ªà§?à¦°à§?à¦?à§?à¦° à¦¸à¦?à¦¯à§?à¦?à§?à¦° à¦?à¦¨à§?à¦®à¦¤à¦¿ à¦¦à§?à¦¯à¦¼">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "à¦?à¦¨à§?à¦®à§?à¦¦à¦¿à¦¤ à¦ªà§?à¦°à§?à¦?à¦¸à¦®à§?à¦¹">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "à¦?à¦° à¦?à¦®à¦¾à¦° à¦¦à§?à¦¶à§? à¦¸à§?à¦¨à§?à¦¸à¦° à¦?à¦°à¦¾ à¦¹à¦¯à¦¼">
 <!ENTITY torsettings.useBridges.default "à¦?à¦?à¦?à¦¿ à¦?à¦¨à§?à¦¤à¦°à§?à¦¨à¦¿à¦°à§?à¦®à¦¿à¦¤ à¦¬à§?à¦°à¦¿à¦? à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨">
 <!ENTITY torsettings.useBridges.default.placeholder "à¦?à¦?à¦?à¦¿ à¦¬à§?à¦°à¦¿à¦? à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "à¦¬à§?à¦°à¦¿à¦?">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "à¦?à¦?à§?à¦°à¦¬à¦°à§?à¦¤à§?">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à¦?à¦?à¦?à¦¿ à¦¬à§?à¦°à¦¿à¦? à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦?à§?à¦¯à¦¾à¦ªà¦?à¦¾ à¦¸à¦®à¦¾à¦§à¦¾à¦¨ à¦?à¦°à§?à¦¨à¥¤...">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "à¦¸à¦®à¦¾à¦§à¦¾à¦¨ à¦¸à¦ à¦¿à¦? à¦¨à¦¯à¦¼à¥¤ à¦?à¦¨à§?à¦?à§?à¦°à¦¹à¦ªà§?à¦°à§?à¦¬à¦? à¦?à¦¬à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "à¦?à¦?à¦?à¦¿ à¦¨à¦¤à§?à¦¨ à¦¬à§?à¦°à¦¿à¦? à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "à¦¬à§?à¦°à¦¿à¦?à¦¡à¦¿à¦¬à¦¿ à¦? à¦¯à§?à¦?à¦¾à¦¯à§?à¦? à¦?à¦°à¦¾ à¦¹à¦?à§?à¦?à§?à¥¤ à¦?à¦¨à§?à¦?à§?à¦°à¦¹à¦ªà§?à¦°à§?à¦¬à¦? à¦?à¦ªà§?à¦?à§?à¦·à¦¾ à¦?à¦°à§?à¦¨.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à¦?à¦?à¦?à¦¿ à¦¬à§?à¦°à¦¿à¦? à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦?à§?à¦¯à¦¾à¦ªà¦?à¦¾ à¦¸à¦®à¦¾à¦§à¦¾à¦¨ à¦?à¦°à§?à¦¨à¥¤...">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "à¦¸à¦®à¦¾à¦§à¦¾à¦¨ à¦¸à¦ à¦¿à¦? à¦¨à¦¯à¦¼à¥¤ à¦?à¦¨à§?à¦?à§?à¦°à¦¹à¦ªà§?à¦°à§?à¦¬à¦? à¦?à¦¬à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨.">
diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd
index c9d0c9b..e62c38f 100644
--- a/src/chrome/locale/br/network-settings.dtd
+++ b/src/chrome/locale/br/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password">
+<!ENTITY torsettings.useProxy.password "Ger-tremen">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "PontoÃ¹">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Araokaet">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd
index 499a2df..f1c40d8 100644
--- a/src/chrome/locale/bs/network-settings.dtd
+++ b/src/chrome/locale/bs/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address">
+<!ENTITY torsettings.useProxy.address "adresa">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "KorisniÄ?ko ime">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Å ifra">
+<!ENTITY torsettings.useProxy.password "Lozinka">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd
index fc0db0d..cede7c3 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -27,24 +27,18 @@
 ">
 
 <!ENTITY torsettings.useProxy.checkbox "Utilitzo un servidor intermediari per a accedir a Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari local">
+<!ENTITY torsettings.useProxy.type "Tipus de Servidor intermediari">
 <!ENTITY torsettings.useProxy.type.placeholder "seleccioneu un tipus de servidor intermediari">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "AdreÃ§a">
 <!ENTITY torsettings.useProxy.address.placeholder "AdreÃ§a IP o nom del host">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nom d'usuari">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "Nom dâ??usuari">
 <!ENTITY torsettings.useProxy.password "Contrasenya">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a travÃ©s d'un tallafoc que nomÃ©s permet connexions a certs ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ports permesos">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor estÃ  censurat al meu paÃs">
 <!ENTITY torsettings.useBridges.default "Seleccioneu un pont predefinit">
 <!ENTITY torsettings.useBridges.default.placeholder "seleccioneu un pont">
@@ -76,25 +70,15 @@
 <!ENTITY torPreferences.bridges "Ponts">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "AvanÃ§at">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolgueu el CAPTCHA per a solÂ·licitar un pont.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluciÃ³ no Ã©s correcta. Torneu a provar-ho.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "SolÂ·licita un pont nou...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "S&#x27;estÃ  contactant amb el BridgeDB. Espereu.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolgueu el CAPTCHA per a solÂ·licitar un pont.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluciÃ³ no Ã©s correcta. Torneu a provar-ho.">
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index 59dc1c8..191ab87 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "VolitelnÃ©">
 
 <!ENTITY torsettings.useProxy.checkbox "PouÅ¾ÃvÃ¡m proxy pro pÅ?ipojenÃ k Internetu">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Typ proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "vyberte typ proxy">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adresa">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo nÃ¡zev serveru">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "UÅ¾ivatel">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "UÅ¾ivatelskÃ© jmÃ©no">
 <!ENTITY torsettings.useProxy.password "Heslo">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Tento poÄ?ÃtaÄ? pouÅ¾ÃvÃ¡ firewall, kterÃ½ povoluje pÅ?ipojenÃ pouze pÅ?es nÄ?kterÃ© porty.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "PovolenÃ© porty">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor je v mÃ© zemi cenzurovÃ¡n">
 <!ENTITY torsettings.useBridges.default "Vyberte vestavÄ?nÃ½ most">
 <!ENTITY torsettings.useBridges.default.placeholder "vyberte most">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridge">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "PokroÄ?ilÃ©">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Pro vyÅ¾Ã¡dÃ¡nÃ mostu prosÃm opiÅ¡te kÃ³d CAPTCHA.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Neopsali jste kÃ³d sprÃ¡vnÄ?. Zkuste to prosÃm znovu.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "PoÅ¾Ã¡dat o novÃ½ mostâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "KontaktovÃ¡nÃ BridgeDB. Ä?ekejte prosÃm.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Pro vyÅ¾Ã¡dÃ¡nÃ mostu prosÃm opiÅ¡te kÃ³d CAPTCHA.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Neopsali jste kÃ³d sprÃ¡vnÄ?. Zkuste to prosÃm znovu.">
diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd
index e998b8d..741f6cd 100644
--- a/src/chrome/locale/cy/network-settings.dtd
+++ b/src/chrome/locale/cy/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Dewisiol">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Math Dirprwy">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Cyfeiriad">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "Cyfeiriad IP neu enw gwesteiwr">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Porth">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
 <!ENTITY torsettings.useProxy.username "Enw defnyddiwr">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Cyfrinair">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Pyrth a ganiateir">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index 552561c..800b307 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Valgfri">
 
 <!ENTITY torsettings.useProxy.checkbox "Jeg bruger en proxy til at oprette forbindelse til internettet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxytype">
+<!ENTITY torsettings.useProxy.type "Proxy-type">
 <!ENTITY torsettings.useProxy.type.placeholder "vÃ¦lg en proxytype">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adresse">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller vÃ¦rtsnavn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Brugernavn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Adgangskode">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Computeren gÃ¥r gennem en firewall som kun tillader forbindelse til bestemte porte">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Tilladte porte">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land">
 <!ENTITY torsettings.useBridges.default "VÃ¦lg en indbygget bro">
 <!ENTITY torsettings.useBridges.default.placeholder "vÃ¦lg en bro">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Broer">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Avanceret">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "LÃ¸s CAPTCHA'en for at anmode om en bro.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "LÃ¸sningen er ikke korrekt. PrÃ¸v venligst igen.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Anmod om en ny broâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vent venligst.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "LÃ¸s CAPTCHA&#x27;en for at anmode om en bro.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "LÃ¸sningen er ikke korrekt. PrÃ¸v venligst igen.">
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index e4ae6af..18e0e76 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "Ich benutze einen Proxy, um mich mit dem Internet zu verbinden">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy-Typ">
 <!ENTITY torsettings.useProxy.type.placeholder "Proxy-Typ auswÃ¤hlen">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adresse">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-Adresse oder Rechnername">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Anschluss">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nutzername">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Benutzername">
 <!ENTITY torsettings.useProxy.password "Passwort">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Rechner geht durch eine Firewall, die nur bestimmte AnschlÃ¼sse zulÃ¤sst">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Erlaubte AnschlÃ¼sse">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor wird in meinem Land blockiert.">
 <!ENTITY torsettings.useBridges.default "Bereitgestellte BrÃ¼cke auswÃ¤hlen">
 <!ENTITY torsettings.useBridges.default.placeholder "BrÃ¼cke auswÃ¤hlen">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "BrÃ¼cken">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Fortgeschritten">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "LÃ¶se das CAPTCHA, um eine BrÃ¼cke anzufordern.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Die LÃ¶sung ist nicht korrekt. Bitte versuchen Sie es erneut.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Neue BrÃ¼cke anfordern...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktiere BridgeDB. Bitte warten.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "LÃ¶se das CAPTCHA, um eine BrÃ¼cke anzufordern.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Die LÃ¶sung ist nicht korrekt. Bitte versuchen Sie es erneut.">
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index 11fdcbe..6e71464 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Î Ï?Î¿ÎµÏ?Î±Î¹Ï?Î¹ÎºÎ±">
 
 <!ENTITY torsettings.useProxy.checkbox "Î§Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Ï? Î´Î¹Î±ÎºÎ¿Î¼Î¹Ï?Ï?Î® Î¼ÎµÏ?Î¿Î»Î¬Î²Î·Ï?Î·Ï? Î³Î¹Î± Î½Î± Ï?Ï?Î½Î´ÎµÎ¸Ï? Ï?Ï?Î¿ Î¯Î½Ï?ÎµÏ?Î½ÎµÏ?.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Î¤Ï?Ï?Î¿Ï? Î´Î¹Î±ÎºÎ¿Î¼Î¹Ï?Ï?Î® Î¼ÎµÏ?Î¿Î»Î¬Î²Î·Ï?Î·Ï?">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "Î?Ï?Î¹Î»ÎÎ¾Ï?Îµ Ï?Ï?Ï?Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹Ï?Ï?Î® Î¼ÎµÏ?Î¿Î»Î¬Î²Î·Ï?Î·Ï?.">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Î?Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·">
 <!ENTITY torsettings.useProxy.address.placeholder "Î?Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· Î?Î¡ Î· Ï?Î½Î¿Î¼Î± Ï?Ï?Î¿Î»Î¿Î³Î¹Ï?Ï?Î® ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Î?Ï?Ï?Î± Ï?Ï?Ï?Ï?Î®Î¼Î±Ï?Î¿Ï?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Î?Î½Î¿Î¼Î± Î§Ï?Î®Ï?Ï?Î·">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Î?Ï?Î´Î¹ÎºÏ?Ï?">
+<!ENTITY torsettings.useProxy.port "Î?Ï?Ï?Î±">
+<!ENTITY torsettings.useProxy.username "Î?Î½Î¿Î¼Î± Ï?Ï?Î®Ï?Ï?Î·">
+<!ENTITY torsettings.useProxy.password "Î?Ï?Î´Î¹ÎºÏ?Ï? Î Ï?Ï?Ï?Î²Î±Ï?Î·Ï?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Î¤Î¿ Ï?ÎµÎ¯Ï?Î¿Ï? Ï?Ï?Î¿Ï?Ï?Î±Ï?Î¯Î±Ï? Î¼Î¿Ï? Î¼Îµ Î±Ï?Î®Î½ÎµÎ¹ Î½Î± Ï?Ï?Î½Î´ÎÎ¿Î¼Î±Î¹ Î¼Ï?Î½Î¿ Ï?Îµ Ï?Ï?Î³ÎºÎµÎºÏ?Î¹Î¼ÎÎ½ÎµÏ? Î¸Ï?Ï?ÎµÏ? Ï?Ï?Ï?Ï?Î®Î¼Î±Ï?Î¿Ï?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Î?Ï?Î¹Ï?Ï?ÎµÏ?Ï?Î¼ÎµÎ½ÎµÏ? Î?Ï?Ï?ÎµÏ?">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Î? Tor ÎµÎ¯Î½Î±Î¹ Î±Ï?Î¿ÎºÎ»ÎµÎ¹Ï?Î¼ÎÎ½Î¿Ï? Ï?Ï?Î· Ï?Ï?Ï?Î± Î¼Î¿Ï?">
 <!ENTITY torsettings.useBridges.default "Î?Ï?Î¹Î»ÎÎ¾Ï?Îµ ÎÎ½Î± ÎµÎ½Ï?Î±Î³Î¼ÎÎ½Î¿ bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "Î?Ï?Î¹Î»ÎÎ¾Ï?Îµ ÎÎ½Î± bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Î?ÎÏ?Ï?Ï?ÎµÏ?">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î³Î¹Î± Ï?Ï?Î¿Ï?Ï?Ï?Î·Î¼ÎÎ½Î¿Ï?Ï?">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Î?Ï?Ï?Ï?Îµ Ï?Î¿ CAPTCHA Î³Î¹Î± Î½Î± Î¶Î·Ï?Î®Ï?ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?Î±.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Î? Î»Ï?Ï?Î· Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Ï?Ï?Ï?Ï?Î®. Î Î±Ï?Î±ÎºÎ±Î»Ï? Ï?Ï?Î¿Ï?Ï?Î±Î¸Î®Ï?Ï?Îµ Î¾Î±Î½Î¬.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Î?Î·Ï?Î®Ï?Ï?Îµ Î¼Î¯Î± ÎºÎ±Î¹Î½Î¿Ï?Ï?Î¹Î± Î³ÎÏ?Ï?Ï?Î±...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Î?Ï?Î¹ÎºÎ¿Î¹Î½Ï?Î½Î¿Ï?Î¼Îµ Î¼Îµ Ï?Î·Î½ BridgeDB. Î Î±Ï?Î±ÎºÎ±Î»Ï?, Ï?ÎµÏ?Î¹Î¼ÎÎ½ÎµÏ?Îµ.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Î?Ï?Ï?Ï?Îµ Ï?Î¿ CAPTCHA Î³Î¹Î± Î½Î± Î¶Î·Ï?Î®Ï?ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?Î±.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Î? Î»Ï?Ï?Î· Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Ï?Ï?Ï?Ï?Î®. Î Î±Ï?Î±ÎºÎ±Î»Ï? Ï?Ï?Î¿Ï?Ï?Î±Î¸Î®Ï?Ï?Îµ Î¾Î±Î½Î¬.">
diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd
index 8057d0a..224f474 100644
--- a/src/chrome/locale/eo/network-settings.dtd
+++ b/src/chrome/locale/eo/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adreso">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Pordo">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Uzantonomo">
 <!ENTITY torsettings.useProxy.password "Pasvorto">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Pontoj">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Altnivela">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index 2e9a850..dd72a4e 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "Uso un proxy para conectar a Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Tipo de proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "seleccionÃ¡ un tipo de proxy">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "DirecciÃ³n">
 <!ENTITY torsettings.useProxy.address.placeholder "DirecciÃ³n IP o nombre de equipo">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Puerto">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Usuario">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "Nombre de usuario">
 <!ENTITY torsettings.useProxy.password "ContraseÃ±a">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Esta computadora pasa a travÃ©s de un cortafuegos que sÃ³lo permite conexiones a ciertos puertos">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Puerto permitidos">
+<!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos">
 <!ENTITY torsettings.useBridges.checkbox "Tor estÃ¡ censurado en mi paÃs">
 <!ENTITY torsettings.useBridges.default "SeleccionÃ¡ un puente incorporado">
 <!ENTITY torsettings.useBridges.default.placeholder "seleccionÃ¡ un puente">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "Configuraciones de Tor">
+<!ENTITY torPreferences.torSettingsDescription "El navegador Tor enruta tu trafico a travÃ©s de la red Tor, mantenida por miles de voluntarios en todo el mundo." >
 <!ENTITY torPreferences.learnMore "AprendÃ© mÃ¡s">
 <!ENTITY torPreferences.bridges "Puentes">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
-<!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "SolucionÃ¡ el CAPTCHA para solicitar un puente.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluciÃ³n no es correcta. Por favor intentÃ¡ de nuevo.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "SolicitÃ¡ un nuevo puente...">
+<!ENTITY torPreferences.bridgesDescription "Los puentes te permiten acceder a la red Tor desde lugares donde Tor esta bloqueado. Dependiendo de donde te encuentres, algunos puentes funcionaran mejor que otros.">
+<!ENTITY torPreferences.useBridge "Usar un puente">
+<!ENTITY torPreferences.requestNewBridge "SolicitÃ¡ un nuevo puente&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "Proveer un puente">
+<!ENTITY torPreferences.advanced "Avanzado">
+<!ENTITY torPreferences.advancedDescription "Configurar como el Navegador Tor se conecta a internet.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por coma">
+<!ENTITY torPreferences.requestBridgeDialogTitle "SolicitÃ¡ un puente">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando BridgeDB. Por favor esperÃ¡.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "SolucionÃ¡ el CAPTCHA para solicitar un puente.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluciÃ³n no es correcta. Por favor intentÃ¡ de nuevo.">
+<!ENTITY torPreferences.viewTorLogs "Ver la bitÃ¡cora sucesos de Tor.">
+<!ENTITY torPreferences.viewLogs "Ver bitÃ¡cora de sucesos&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "BitÃ¡cora de eventos de Tor">
diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd
index b47d4c2..f2460de 100644
--- a/src/chrome/locale/es-MX/network-settings.dtd
+++ b/src/chrome/locale/es-MX/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type">
+<!ENTITY torsettings.useProxy.type "Tipo de proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Puerto">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Nombre de usuario">
 <!ENTITY torsettings.useProxy.password "ContraseÃ±a">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Puentes">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index deb32af..8d32ff7 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "Utilizo un proxy para conectar a Internet.">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Tipo de proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "seleccionar un tipo de proxy">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "DirecciÃ³n">
 <!ENTITY torsettings.useProxy.address.placeholder "DirecciÃ³n IP o nombre de mÃ¡quina (host)">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Puerto">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Nombre de usuario">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "ContraseÃ±a">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Esta computadora va a travÃ©s de un cortafuegos(firewall) que sÃ³lo permite conexiones a ciertos puertos">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos">
 <!ENTITY torsettings.useBridges.checkbox "En mi paÃs se censura a Tor">
 <!ENTITY torsettings.useBridges.default "Seleccionar un puente construido">
@@ -70,30 +64,20 @@
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
 <!ENTITY torPreferences.torSettings "ConfiguraciÃ³n de Tor">
-<!ENTITY torPreferences.torSettingsDescription "El Navegador Tor enruta tu trÃ¡fico a travÃ©s de la Red Tor, ejecutada por miles de voluntarios alrededor del mundo." >
+<!ENTITY torPreferences.torSettingsDescription "El Navegador Tor enruta tu trÃ¡fico a travÃ©s de la Red Tor, mantenida por miles de voluntarios alrededor del mundo." >
 <!ENTITY torPreferences.learnMore "MÃ¡s informaciÃ³n">
 <!ENTITY torPreferences.bridges "Puentes">
 <!ENTITY torPreferences.bridgesDescription "Los puentes te ayudan a acceder a la Red Tor en lugares donde Tor estÃ¡ bloqueado. Dependiendo de dÃ³nde te encuentres, un puente puede funcionar mejor que otro.">
 <!ENTITY torPreferences.useBridge "Usa un puente">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Solicite un Nuevo Puente&amp;#x2026;">
+<!ENTITY torPreferences.requestNewBridge "Solicite un Nuevo Puenteâ?¦">
 <!ENTITY torPreferences.provideBridge "Proporcionar un puente">
 <!ENTITY torPreferences.advanced "Avanzado">
 <!ENTITY torPreferences.advancedDescription "Configura cÃ³mo el Navegador Tor se conecta a Internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por comas">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Solicitar Puente">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando con BridgeDB. Espera por favor.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resuelve el CAPTCHA para solicitar un puente.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluciÃ³n no es correcta. Por favor, intÃ©ntalo de nuevo.">
 <!ENTITY torPreferences.viewTorLogs "Ver los registros de Tor.">
-<!ENTITY torPreferences.viewLogs "Ver registros&amp;#x2026;">
+<!ENTITY torPreferences.viewLogs "Ver registrosâ?¦">
 <!ENTITY torPreferences.torLogsDialogTitle "Registros de Tor">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Solicitar un nuevo puente...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando con BridgeDB. Espera por favor.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resuelve el CAPTCHA para solicitar un puente.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluciÃ³n no es correcta. Por favor, intÃ©ntalo de nuevo.">
diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd
index fb1420e..8fcdff2 100644
--- a/src/chrome/locale/et/network-settings.dtd
+++ b/src/chrome/locale/et/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Valikuline">
 
 <!ENTITY torsettings.useProxy.checkbox "Ma kasutan proksit et Ã¼henduda internetti">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proksi tÃ¼Ã¼p">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "valige proksi tÃ¼Ã¼p">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Aadress">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP aadress vÃµi haldaja nimi">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Kasutajanimi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Parool">
+<!ENTITY torsettings.useProxy.password "SalasÃµna">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "See arvuti lÃ¤heb lÃ¤bi tulemÃ¼Ã¼ri mis lubab ainult Ã¼hendusi kindlatesse portidesse.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Lubatud pordid">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor on minu riigis tsensoreeritud">
 <!ENTITY torsettings.useBridges.default "Valige sisseehitatud sild">
 <!ENTITY torsettings.useBridges.default.placeholder "valige sild">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Sillad">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "PeenhÃ¤Ã¤lestus">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lahenda CAPTCHA, et taotleda silda.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Taotle uut Sildaâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lahenda CAPTCHA, et taotleda silda.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd
index 03999ad..6a7eb5d 100644
--- a/src/chrome/locale/eu/network-settings.dtd
+++ b/src/chrome/locale/eu/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Hautazkoa">
 
 <!ENTITY torsettings.useProxy.checkbox "Proxy bat erabiltzen dut Internetera sartzeko">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy mota">
 <!ENTITY torsettings.useProxy.type.placeholder "proxy mota aukeratu">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Helbidea">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP helbide edo ostalari izena">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Ataka">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Erabiltzaile izena">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Erabiltzaile-izena">
 <!ENTITY torsettings.useProxy.password "Pasahitza">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ordenagailu honek ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar doa">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor zentsuratuta dago nire herrialdean">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "aukeratu zubia">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Zubiak">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Aurreratua">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "CAPTCHAa ebatzi ezazu zubi bat eskatzeko.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ebazpena ez da zuzena. Mesedez saiatu berriro.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Zubi berri bat eskatuâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDBrekin kontaktatzen. Itxaron mesedez.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "CAPTCHAa ebatzi ezazu zubi bat eskatzeko.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ebazpena ez da zuzena. Mesedez saiatu berriro.">
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index ec8c078..4ef23bb 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Ø§Ø®ØªÛ?Ø§Ø±Û?">
 
 <!ENTITY torsettings.useProxy.checkbox "Ù?Ù? Ø¨Ø±Ø§Û? Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø§Ø² Ù¾Ø±Ù?Ú©Ø³Û? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û?â??Ú©Ù?Ù?.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Ù?Ù?Ø¹ Ù¾Ø±Ø§Ú©Ø³Û?">
+<!ENTITY torsettings.useProxy.type "Ù?Ù?Ø¹ Ù¾Ø±Ù?Ú©Ø³Û?">
 <!ENTITY torsettings.useProxy.type.placeholder "Û?Ú© Ù?Ù?Ø¹ Ù¾Ø±Ù?Ú©Ø³Û? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Ø¢Ø¯Ø±Ø³">
 <!ENTITY torsettings.useProxy.address.placeholder "Ø¢Ø¯Ø±Ø³ Ø¢Û?â??Ù¾Û? Û?Ø§ Ù?Ø§Ù? Ù?Û?Ø²Ø¨Ø§Ù?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Ù¾Ù?Ø±Øª">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Ù?Ø§Ù? Ú©Ø§Ø±Ø¨Ø±Û?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Ø±Ù?Ø² Ø¹Ø¨Ù?Ø±">
+<!ENTITY torsettings.useProxy.password "Ú¯Ø°Ø±Ù?Ø§Ú?Ù?">
 <!ENTITY torsettings.useProxy.type.socks4 "Ø³Ø§Ú©Ø³ Û´">
 <!ENTITY torsettings.useProxy.type.socks5 "Ø³Ø§Ú©Ø³ Ûµ">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ø¨Ù? Ù?Ø¸Ø± Ù?Û? Ø±Ø³Ø¯ Ø´Ø¨Ú©Ù? Ø§Ø±ØªØ¨Ø§Ø·Û? Ø´Ù?Ø§ Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?ØªØ? Ø§Ø² Û?Ú© Ù?Ø§Û?Ø±Ù?Ø§Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û? Ú©Ù?Ø¯. Û?Ø¹Ù?Û? Ù?Ù?Ø· Ø§Ø¬Ø§Ø²Ù? Ø§ØªØµØ§Ù? Ø§Ø² Û?Ú© Ø³Ø±Û? Ø¯Ø±Ú¯Ø§Ù? Ù?Ø§Û? Ø¨Ù? Ø®ØµÙ?Øµ Ø±Ø§ Ù?Û? Ø¯Ù?Ø¯.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ù¾Ù?Ø±Øª Ù?Ø§Û? Ù?Ø¬Ø§Ø²">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "ØªÙ?Ø± Ø¯Ø± Ú©Ø´Ù?Ø± Ù?Ù? Ù?Û?Ù?ØªØ± Û?Ø§ Ø³Ø§Ù?Ø³Ù?Ø± Ø´Ø¯Ù? Ø§Ø³Øª">
 <!ENTITY torsettings.useBridges.default "Ù¾Ù? Ø³Ø§Ø®ØªÙ? Ø´Ø¯Ù? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯">
 <!ENTITY torsettings.useBridges.default.placeholder "Û?Ú© Ù¾Ù? Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Ù¾Ù? Ù?Ø§">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Ù¾Û?Ø´Ø±Ù?ØªÙ? ">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ø¨Ø±Ø§Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Û?Ú© Ù¾Ù? Ú©Ù¾Ú?Ø§ Ø±Ø§ ØÙ? Ú©Ù?Û?Ø¯.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ø±Ø§Ù? ØÙ? Ø¯Ø±Ø³Øª Ù?Û?Ø³Øª. Ù?Ø·Ù?Ø§ Ø¯Ù?Ø¨Ø§Ø±Ù? ØªÙ?Ø§Ø´ Ú©Ù?Û?Ø¯.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Û?Ú© Ù¾Ù? Ø¬Ø¯Û?Ø¯...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ØªÙ?Ø§Ø³ Ø¨Ø§ BridgeDB. Ù?Ø·Ù?Ø§ ØµØ¨Ø± Ú©Ù?Û?Ø¯.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ø¨Ø±Ø§Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Û?Ú© Ù¾Ù? Ú©Ù¾Ú?Ø§ Ø±Ø§ ØÙ? Ú©Ù?Û?Ø¯.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ø±Ø§Ù? ØÙ? Ø¯Ø±Ø³Øª Ù?Û?Ø³Øª. Ù?Ø·Ù?Ø§ Ø¯Ù?Ø¨Ø§Ø±Ù? ØªÙ?Ø§Ø´ Ú©Ù?Û?Ø¯.">
diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd
index 7d82f78..2ac6e04 100644
--- a/src/chrome/locale/fi/network-settings.dtd
+++ b/src/chrome/locale/fi/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Vaihtoehtoinen">
 
 <!ENTITY torsettings.useProxy.checkbox "KÃ¤ytÃ¤n vÃ¤lityspalvelinta yhdistÃ¤Ã¤kseni internetiin">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "VÃ¤lityspalvelintyyppi">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "valitse vÃ¤lityspalvelintyyppi">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Osoite">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-osoite tai palvelinnimi">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Portti">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "KÃ¤yttÃ¤jÃ¤tunnus">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Salasana">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "TÃ¤mÃ¤n tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Sallitut portit">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Maani sensuroi Tor'ia">
 <!ENTITY torsettings.useBridges.default "Valitse sisÃ¤Ã¤nrakennettu silta">
 <!ENTITY torsettings.useBridges.default.placeholder "valitse silta">
@@ -76,25 +70,15 @@ TÃ¤ssÃ¤ saattaa kestÃ¤Ã¤ muutama minuutti.">
 <!ENTITY torPreferences.bridges "Sillat">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "LisÃ¤tietoja">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ratkaise CAPTCHA jotta voit pyytÃ¤Ã¤ sillan.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ratkaisu ei ollut oikein. YritÃ¤ uudelleen.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "PyydÃ¤ uusi silta...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "YhdistetÃ¤Ã¤n BridgeDB:hen. Odota hetki.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ratkaise CAPTCHA jotta voit pyytÃ¤Ã¤ sillan.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ratkaisu ei ollut oikein. YritÃ¤ uudelleen.">
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index 0508450..02c074b 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "facultatif">
 
 <!ENTITY torsettings.useProxy.checkbox "Jâ??utilise un mandataire pour accÃ©der Ã  Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Type de mandataire ">
+<!ENTITY torsettings.useProxy.type "Type de mandataire">
 <!ENTITY torsettings.useProxy.type.placeholder "sÃ©lectionner un type de mandataire">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresse ">
+<!ENTITY torsettings.useProxy.address "Adresse">
 <!ENTITY torsettings.useProxy.address.placeholder "adresse IP ou nom dâ??hÃ´te">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nom dâ??utilisateur ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Mot de passe ">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Nom dâ??utilisateur">
+<!ENTITY torsettings.useProxy.password "Mot de passe">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui nâ??autorise que les connexions Ã  certains ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ports autorisÃ©s ">
+<!ENTITY torsettings.firewall.allowedPorts "Ports autorisÃ©s">
 <!ENTITY torsettings.useBridges.checkbox "Tor est censurÃ© dans mon pays">
 <!ENTITY torsettings.useBridges.default "SÃ©lectionner un pont intÃ©grÃ©">
 <!ENTITY torsettings.useBridges.default.placeholder "SÃ©lectionner un pont">
@@ -69,31 +63,23 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "ParamÃ¨tres de Tor">
+<!ENTITY torPreferences.torSettingsDescription "Le NavigateurÂ Tor achemine votre trafic par le rÃ©seauÂ Tor, exploitÃ© par des milliers de bÃ©nÃ©voles partout dans le monde.
+" >
 <!ENTITY torPreferences.learnMore "En apprendre davantage">
 <!ENTITY torPreferences.bridges "Ponts">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgesDescription "Les ponts vous aident Ã  accÃ©der au rÃ©seauÂ Tor oÃ¹ il est bloquÃ©. 
+Selon votre position gÃ©ographique, un pont pourrait fonctionner mieux quâ??un autre.">
+<!ENTITY torPreferences.useBridge "Utiliser un pont">
+<!ENTITY torPreferences.requestNewBridge "Demander un nouveau pont&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "Fournir un pont">
 <!ENTITY torPreferences.advanced "AvancÃ©">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "RÃ©soudre le captcha pour demander un pont.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronÃ©e. Veuillez ressayer.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Demander un nouveau pontâ?¦">
+<!ENTITY torPreferences.advancedDescription "Configurer la faÃ§on dans le NavigateurÂ Tor se connecte Ã  Internet.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valeurs sÃ©parÃ©es par des virgules">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Demander un pont">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Connexion Ã  BridgeDB. Veuillez patienter.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "RÃ©soudre le captcha pour demander un pont.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronÃ©e. Veuillez ressayer.">
+<!ENTITY torPreferences.viewTorLogs "Visualiser les journauxÂ Tor.">
+<!ENTITY torPreferences.viewLogs "Visualiser les journaux&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "JournauxÂ Tor">
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index 3392080..4c4284f 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -76,7 +76,7 @@ torlauncher.bootstrapStatus.ap_conn=Construction des circuitsÂ : connexion Ã  un
 torlauncher.bootstrapStatus.ap_conn_done=Construction des circuitsÂ : nous sommes connectÃ© Ã  un relaisÂ Tor
 torlauncher.bootstrapStatus.ap_handshake=Construction des circuitsÂ : nÃ©gociation avec un relaisÂ Tor
 torlauncher.bootstrapStatus.ap_handshake_done=Construction des circuitsÂ : la nÃ©gociation avec un relaisÂ Tor est terminÃ©e
-torlauncher.bootstrapStatus.circuit_create=Construction des circuitsÂ : mise en place dâ??un circuit Tor
+torlauncher.bootstrapStatus.circuit_create=Construction des circuitsÂ : mise en place dâ??un circuitÂ Tor
 torlauncher.bootstrapStatus.done=Vous Ãªtes connectÃ© au rÃ©seauÂ Torâ??!
 
 torlauncher.bootstrapWarning.done=terminÃ©
diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd
index 4fc6f5b..4424b91 100644
--- a/src/chrome/locale/fy/network-settings.dtd
+++ b/src/chrome/locale/fy/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Wachtwurd">
+<!ENTITY torsettings.useProxy.password "Password">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd
index 43ed8e4..713f4ec 100644
--- a/src/chrome/locale/ga/network-settings.dtd
+++ b/src/chrome/locale/ga/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Roghnach">
 
 <!ENTITY torsettings.useProxy.checkbox "Ã?sÃ¡idim seachfhreastalaÃ chun ceangal leis an IdirlÃon">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "CineÃ¡l an tSeachfhreastalaÃ">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "roghnaigh cineÃ¡l an tseachfhreastalaÃ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Seoladh">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nÃ³ Ã³stainm">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Ainm ÃºsÃ¡ideora">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "Username">
 <!ENTITY torsettings.useProxy.password "Focal faire">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "TÃ©ann an rÃomhaire seo trÃ bhalla dÃ³iteÃ¡in nach gceadaÃonn ceangail ach le poirt Ã¡irithe">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Poirt Cheadaithe">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "DÃ©antar cinsireacht ar Tor sa tÃr seo">
 <!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite">
 <!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Droichid">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "RÃ©itigh an CAPTCHA le droichead a iarraidh.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "NÃl an freagra sin ceart. Bain triail eile as.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Iarr Droichead Nua...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ag dul i dteagmhÃ¡il le BridgeDB. Fan nÃ³imÃ©ad.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "RÃ©itigh an CAPTCHA le droichead a iarraidh.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "NÃl an freagra sin ceart. Bain triail eile as.">
diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd
index 22dbe5b..1c623d4 100644
--- a/src/chrome/locale/gl/network-settings.dtd
+++ b/src/chrome/locale/gl/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Tipo de Proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Enderezo">
 <!ENTITY torsettings.useProxy.address.placeholder "Enderezo IP ou nome da mÃ¡quina">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Porto">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Nome de usuario">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Contrasinal">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Este computador pasa por un firewall que sÃ³ permite conexiÃ³ns a certos portos">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Portos permitidos">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Pontes">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Avanzados">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd
index d495ad9..f258198 100644
--- a/src/chrome/locale/gu/network-settings.dtd
+++ b/src/chrome/locale/gu/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "àªªà«?àª°à«?àª?">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
 <!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password">
+<!ENTITY torsettings.useProxy.password "àªªàª¾àª¸àªµàª°à«?àª¡">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "àª?àª¦à«?àª¯àª¤àª¨">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd
index f70e6cf..b8b3c7b 100644
--- a/src/chrome/locale/he/network-settings.dtd
+++ b/src/chrome/locale/he/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "×¨×©×?×ª×?">
 
 <!ENTITY torsettings.useProxy.checkbox "×?× ×? ×?×©×ª×?×© ×?×?×?×¤×?×?Ö¾×?×?×? ×?×?×? ×?×?×ª×?×?×¨ ×?×?×?× ×?×¨× ×?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "×¡×?×? ×?×?×¤×?×?Ö¾×?×?×?">
 <!ENTITY torsettings.useProxy.type.placeholder "×?×?×¨ ×¡×?×? ×?×?×¤×?×?Ö¾×?×?×?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "×?×ª×?×?×ª">
 <!ENTITY torsettings.useProxy.address.placeholder "×?×ª×?×?×ª IP ×?×? ×©×? ×?×?×¨×?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "×¤×ª×?×?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "×©×? ×?×©×ª×?×©">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "×¡×?×¡×?×?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "×?×?×©×? ×?×? ×¢×?×?×¨ ×?×¨×? ×?×?×?×ª ×?×© ×?×?×ª×?×¨×? ×?×?×?×?×¨×?×? ×¨×§ ×?×? ×¤×ª×?×?×ª ×?×¡×?×?×?×?×ª">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "×¤×ª×?×?×ª ×?×?×ª×¨×?×ª">
 <!ENTITY torsettings.useBridges.checkbox "Tor ×?×¦×?× ×?×¨ ×?×?×?×?× ×? ×©×?×?">
 <!ENTITY torsettings.useBridges.default "×?×?×¨ ×?×©×¨ ×?×?×?× ×?">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "×?×?×?×¨×?×ª Tor">
+<!ENTITY torPreferences.torSettingsDescription "×?×¤×?×¤×? Tor ×?× ×ª×? ×?×ª ×?×ª×¢×?×?×¨×? ×©×?×? ×¢×? ×¨×©×ª Tor, ×?×?×?×¤×¢×?×ª ×¢&quot;×? ×?×?×¤×? ×?×ª× ×?×?×?×? ×?×¨×?×?×? ×?×¢×?×?×?." >
 <!ENTITY torPreferences.learnMore "×?×?×? ×¢×?×?">
 <!ENTITY torPreferences.bridges "×?×©×¨×?×?">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgesDescription "×?×©×¨×?×? ×¢×?×?×¨×?×? ×?×? ×?×?×©×?×? ×?×?×©×? ×?×? ×¨×©×ª Tor ×?×?×§×?×?×?×ª ×?×?×? Tor ×?×¡×?×?. ×¢×? ×¡×?×? ×?×?×§×?×? ×©×?×ª×? × ×?×¦×? ×?×?, ×?×©×¨ ×?×?×? ×¢×©×?×? ×?×¢×?×?×? ×?×¦×?×¨×? ×?×?×?×? ×?×?×ª×¨ ×?×?×?×? ×?×?×¨.">
+<!ENTITY torPreferences.useBridge "×?×©×ª×?×© ×?×?×©×¨">
+<!ENTITY torPreferences.requestNewBridge "×?×§×© ×?×©×¨ ×?×?×©&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "×¡Ö·×¤Ö¼Öµ×§ ×?×©×¨">
 <!ENTITY torPreferences.advanced "×?×ª×§×?×?">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "×¤×ª×?×¨ ×?×ª ×?Ö¾CAPTCHA ×?×?×? ×?×?×§×© ×?×©×¨.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "×?×¤×ª×¨×?×? ×?×?× ×? × ×?×?×?. ×?× ×? × ×¡×? ×©×?×?.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "×?×§×© ×?×©×¨ ×?×?×©...">
+<!ENTITY torPreferences.advancedDescription "×ª×¦×¨ ×?×?×¦×? ×?×¤×?×¤×? Tor ×?×ª×?×?×¨ ×?×? ×?×?×?× ×?×¨× ×?.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "×¢×¨×?×?×? ×?×?×¤×¨×?×?Ö¾×¤×¡×?×§">
+<!ENTITY torPreferences.requestBridgeDialogTitle "×?×§×© ×?×©×¨">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "×?×?×¦×¨ ×§×©×¨ ×¢×? BridgeDB. ×?× ×? ×?×?×ª×?.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "×¤×ª×?×¨ ×?×ª ×?Ö¾CAPTCHA ×?×?×? ×?×?×§×© ×?×©×¨.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "×?×¤×ª×¨×?×? ×?×?× ×? × ×?×?×?. ×?× ×? × ×¡×? ×©×?×?.">
+<!ENTITY torPreferences.viewTorLogs "×?×¦×? ×?×ª ×?×?×?× ×? Tor.">
+<!ENTITY torPreferences.viewLogs "×?×¦×? ×?×?×?× ×?×?&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "×?×?×?× ×? Tor">
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd
index 92ac9aa..8696c94 100644
--- a/src/chrome/locale/hi/network-settings.dtd
+++ b/src/chrome/locale/hi/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "à¤?à¤?à¥?à¤?à¤¿à¤?">
 
 <!ENTITY torsettings.useProxy.checkbox "à¤®à¥?à¤? à¤?à¤?à¤?à¤°à¤¨à¥?à¤? à¤¸à¥? à¤?à¤¨à¥?à¤?à¥?à¤? à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤? à¤ªà¥?à¤°à¥?à¤?à¥?à¤¸à¥? à¤?à¤¾ à¤?à¤ªà¤¯à¥?à¤? à¤?à¤°à¤¤à¤¾ à¤¹à¥?à¤?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "à¤ªà¥?à¤°à¥?à¤?à¥?à¤¸à¥? à¤ªà¥?à¤°à¤?à¤¾à¤°">
 <!ENTITY torsettings.useProxy.type.placeholder "à¤ªà¥?à¤°à¥?à¤?à¥?à¤¸à¥? à¤ªà¥?à¤°à¤?à¤¾à¤° à¤?à¤¾ à¤?à¤¯à¤¨ à¤?à¤°à¥?à¤?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "à¤ªà¤¤à¤¾ ">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP à¤ªà¤¤à¤¾ à¤¯à¤¾ à¤®à¥?à¤?à¤¬à¤¾à¤¨à¤¨à¤¾à¤®">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "à¤ªà¥?à¤°à¥?à¤?/à¤¦à¥?à¤µà¤¾à¤° ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "à¤?à¤ªà¤¯à¥?à¤?à¤?à¤°à¥?à¤¤à¤¾ à¤¨à¤¾à¤®">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
 <!ENTITY torsettings.useProxy.password "à¤ªà¤¾à¤¸à¤µà¤°à¥?à¤¡">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "à¤¯à¤¹ à¤?à¤?à¤ªà¥?à¤¯à¥?à¤?à¤° à¤«à¤¼à¤¾à¤¯à¤°à¤µà¥?à¤² à¤?à¥? à¤®à¤¾à¤§à¥?à¤¯à¤® à¤¸à¥? à¤?à¤¾à¤¤à¤¾ à¤¹à¥? à¤?à¥? à¤?à¥?à¤µà¤² à¤?à¥?à¤? à¤ªà¥?à¤°à¥?à¤?à¥?à¤¸ à¤?à¥? à¤?à¤¨à¥?à¤?à¥?à¤¶à¤¨ à¤?à¥? à¤?à¤¨à¥?à¤®à¤¤à¤¿ à¤¦à¥?à¤¤à¤¾ à¤¹à¥?...">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "à¤?à¤¨à¥?à¤®à¤¤à¤¿ à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤ªà¥?à¤°à¥?à¤?à¥?à¤¸ ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "à¤?à¥?à¤° à¤®à¥?à¤°à¥? à¤¦à¥?à¤¶ à¤®à¥?à¤? à¤¸à¥?à¤?à¤¸à¤° à¤?à¤¿à¤¯à¤¾ à¤?à¤¯à¤¾ à¤¹à¥?">
 <!ENTITY torsettings.useBridges.default "à¤?à¤? à¤?à¤?à¤¤à¤°à¥?à¤¨à¤¿à¤°à¥?à¤®à¤¿à¤¤ à¤ªà¥?à¤² à¤?à¤¾ à¤?à¤¯à¤¨ à¤?à¤°à¥?à¤?">
 <!ENTITY torsettings.useBridges.default.placeholder "à¤?à¤? à¤ªà¥?à¤² à¤?à¤¾ à¤?à¤¯à¤¨ à¤?à¤°à¥?à¤?">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "à¤ªà¥?à¤²">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "à¤?à¤¨à¥?à¤¨à¤¤">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à¤ªà¥?à¤² à¤?à¤¾ à¤?à¤¨à¥?à¤°à¥?à¤§ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤? à¤?à¥?à¤ªà¥?à¤?à¤¾ à¤?à¥? à¤¹à¤² à¤?à¤°à¥?à¤?à¥¤">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "à¤¸à¤®à¤¾à¤§à¤¾à¤¨ à¤¸à¤¹à¥? à¤¨à¤¹à¥?à¤? à¤¹à¥?à¥¤ à¤?à¥?à¤ªà¤¯à¤¾ à¤ªà¥?à¤¨: à¤ªà¥?à¤°à¤¯à¤¾à¤¸ à¤?à¤°à¥?à¤?à¥¤">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "à¤?à¤? à¤¨à¤? à¤ªà¥?à¤² à¤?à¤¾ à¤?à¤¨à¥?à¤°à¥?à¤§ à¤?à¤°à¥?à¤? ...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB à¤¸à¥? à¤¸à¤?à¤ªà¤°à¥?à¤? à¤?à¤¿à¤¯à¤¾ à¤?à¤¾ à¤°à¤¹à¤¾ à¤¹à¥?à¥¤à¤?à¥?à¤ªà¤¯à¤¾ à¤ªà¥?à¤°à¤¤à¥?à¤?à¥?à¤·à¤¾ à¤?à¤°à¥?à¤?à¥¤">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à¤ªà¥?à¤² à¤?à¤¾ à¤?à¤¨à¥?à¤°à¥?à¤§ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤? à¤?à¥?à¤ªà¥?à¤?à¤¾ à¤?à¥? à¤¹à¤² à¤?à¤°à¥?à¤?à¥¤">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "à¤¸à¤®à¤¾à¤§à¤¾à¤¨ à¤¸à¤¹à¥? à¤¨à¤¹à¥?à¤? à¤¹à¥?à¥¤ à¤?à¥?à¤ªà¤¯à¤¾ à¤ªà¥?à¤¨: à¤ªà¥?à¤°à¤¯à¤¾à¤¸ à¤?à¤°à¥?à¤?à¥¤">
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index a59fcf4..f1ab21e 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Neobavezno">
 
 <!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tip proxy-a">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxy-a">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili posluÅ¾itelj">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "KorisniÄ?ko ime">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Lozinka">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ovo rauÄ?unalo ide kroz vatrozid koji dozvoljava veze samo preko pojedinih portova.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "DopuÅ¡teni portovi">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj zemlji">
 <!ENTITY torsettings.useBridges.default "Odaberite ugraÄ?eni most">
 <!ENTITY torsettings.useBridges.default.placeholder "odaberite most">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Mostovi">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Napredno">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd
index 0e350cf..3b77a30 100644
--- a/src/chrome/locale/hu/network-settings.dtd
+++ b/src/chrome/locale/hu/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "OpcionÃ¡lis">
 
 <!ENTITY torsettings.useProxy.checkbox "Proxy-t hasznÃ¡lok az Internetre valÃ³ kapcsolÃ³dÃ¡shoz">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy TÃpus">
+<!ENTITY torsettings.useProxy.type "Proxy tÃpus">
 <!ENTITY torsettings.useProxy.type.placeholder " vÃ¡laszon ki egy proxy tÃpust">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "CÃm">
 <!ENTITY torsettings.useProxy.address.placeholder "IP cÃm vagy gÃ©pnÃ©v">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "FelhasznÃ¡lÃ³nÃ©v">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "JelszÃ³">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "A szÃ¡mÃtÃ³gÃ©p egy tÅ±zfalon keresztÃ¼l kommunikÃ¡l, ami csak adott portokon keresztÃ¼l engedÃ©lyezi a kapcsolatotokat.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "EngedÃ©lyezett portok">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "A Tor cenzÃºrÃ¡zva van az orszÃ¡gomban">
 <!ENTITY torsettings.useBridges.default "VÃ¡lasszon ki egy beÃ©pÃtett hidat">
 <!ENTITY torsettings.useBridges.default.placeholder "VÃ¡lasszon ki egy hidat">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Hidak">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "SpeciÃ¡lis">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Oldjon meg egy CAPTCHA-t a hÃd kÃ©rÃ©sÃ©hez.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "A megoldÃ¡s nem helyes. KÃ©rjÃ¼k prÃ³bÃ¡lja Ãºjra.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ã?j hÃd kÃ©rÃ©se...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "KapcsolÃ³dÃ¡s a hÃdadatbÃ¡zishoz. KÃ©rjÃ¼k vÃ¡rjon.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Oldjon meg egy CAPTCHA-t a hÃd kÃ©rÃ©sÃ©hez.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "A megoldÃ¡s nem helyes. KÃ©rjÃ¼k prÃ³bÃ¡lja Ãºjra.">
diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd
index 1d76c58..039ad1d 100644
--- a/src/chrome/locale/hy/network-settings.dtd
+++ b/src/chrome/locale/hy/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password">
+<!ENTITY torsettings.useProxy.username "Õ?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¸Õ²Õ«Õ¡Õ¶Õ¸Ö?Õ¶">
+<!ENTITY torsettings.useProxy.password "Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ£Õ«Ö?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index 0fc6b74..353a66c 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Opsional">
 
 <!ENTITY torsettings.useProxy.checkbox "Saya menggunakan proxy untuk terhubung ke Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipe Proksi">
+<!ENTITY torsettings.useProxy.type "Tipe Proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "pilih jenis proxy">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Alamat">
 <!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nama User">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "Nama Pengguna">
 <!ENTITY torsettings.useProxy.password "Kata sandi">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Komputer ini pergi melalui firewall yang hanya mengizinkan koneksi untuk beberapa port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor disensor di negara saya">
 <!ENTITY torsettings.useBridges.default "Pilih satu built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "pilih satu bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Jembatan-jembatan">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced ">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta sebuah bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Solusinya tidak tepat. Silakan coba lagi.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Meminta bridge baru...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Menghubungi BridgeDB. Mohon tunggu.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta sebuah bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Solusinya tidak tepat. Silakan coba lagi.">
diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd
index aaa055c..0b1c408 100644
--- a/src/chrome/locale/is/network-settings.dtd
+++ b/src/chrome/locale/is/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "ValkvÃ¦tt">
 
 <!ENTITY torsettings.useProxy.checkbox "Ã?g nota milliÃ¾jÃ³n (proxy) til aÃ° tengjast viÃ° internetiÃ°">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "GerÃ° milliÃ¾jÃ³ns">
+<!ENTITY torsettings.useProxy.type "Tegund milliÃ¾jÃ³ns (proxy)">
 <!ENTITY torsettings.useProxy.type.placeholder "veldu tegund milliÃ¾jÃ³ns">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Vistfang">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-vistfang eÃ°a vÃ©larheiti">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "GÃ¡tt">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Notandanafn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "LykilorÃ°">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ã?essi tÃ¶lva tengist Ã gegnum eldvegg sem leyfir einungis tengingar Ã gegnum tilteknar gÃ¡ttir">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "LeyfÃ°ar gÃ¡ttir">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor er ritskoÃ°aÃ° Ã landinu mÃnu">
 <!ENTITY torsettings.useBridges.default "Veldu innbyggÃ°a brÃº">
 <!ENTITY torsettings.useBridges.default.placeholder "veldu brÃº">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "Stillingar Tor">
+<!ENTITY torPreferences.torSettingsDescription "Tor-vafrinn beinir umferÃ°inni Ã¾inni um Tor-netiÃ°, sem rekiÃ° er af Ã¾Ãºsundum sjÃ¡lfboÃ°aliÃ°a um vÃÃ°a verÃ¶ld." >
 <!ENTITY torPreferences.learnMore "FrÃ¦Ã°ast frekar">
 <!ENTITY torPreferences.bridges "BrÃ½r">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgesDescription "BrÃ½r hjÃ¡lpa Ã¾Ã©r viÃ° aÃ° fÃ¡ aÃ°gang aÃ° Tor-netkerfinu Ã¡ stÃ¶Ã°um Ã¾ar sem lokaÃ° er Ã¡ Tor. Ã?aÃ° fer eftir Ã¾vÃ hvar Ã¾Ãº ert hvaÃ°a brÃº virkar betur en einhver Ã¶nnur.">
+<!ENTITY torPreferences.useBridge "Nota brÃº">
+<!ENTITY torPreferences.requestNewBridge "BiÃ°ja um nÃ½ja brÃº&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "Ã?tvega brÃº">
 <!ENTITY torPreferences.advanced "Ã?tarlegra">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Leystu CAPTCHA-Ã¾rautina til aÃ° biÃ°ja um brÃº.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ã?essi lausn er ekki rÃ©tt. Reyndu aftur.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "BiÃ°ja um nÃ½ja brÃºâ?¦">
+<!ENTITY torPreferences.advancedDescription "Stilltu hvernig Tor-vafrinn tengist viÃ° internetiÃ°.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Gildi aÃ°greind meÃ° kommum">
+<!ENTITY torPreferences.requestBridgeDialogTitle "BiÃ°ja um brÃº">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Tengist BridgeDB. BÃddu aÃ°eins.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Leystu CAPTCHA-Ã¾rautina til aÃ° biÃ°ja um brÃº.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ã?essi lausn er ekki rÃ©tt. Reyndu aftur.">
+<!ENTITY torPreferences.viewTorLogs "SkoÃ°a atvikaskrÃ¡r Tor.">
+<!ENTITY torPreferences.viewLogs "SkoÃ°a atvikaskrÃ¡r&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor atvikaskrÃ¡ (log)">
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index f8c20c9..1c2bed6 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Facoltativo">
 
 <!ENTITY torsettings.useProxy.checkbox "Uso un proxy per connettermi a internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipo di proxy">
+<!ENTITY torsettings.useProxy.type "Tipo proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "Seleziona un tipo di proxy">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Indirizzo">
 <!ENTITY torsettings.useProxy.address.placeholder "Indirizzo IP oppure hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Porta">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nome utente">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "Username">
 <!ENTITY torsettings.useProxy.password "Password">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Porte consentite">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor viene censurato nel mio Paese">
 <!ENTITY torsettings.useBridges.default "Seleziona un bridge integrato">
 <!ENTITY torsettings.useBridges.default.placeholder "seleziona un bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Ponti">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Avanzate">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Risolvi il CAPTCHA per richiedere un bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluzione Ã¨ sbagliata. Riprova.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Richiedi un nuovo bridge...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contatto BridgeDB. Attendere, prego.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Risolvi il CAPTCHA per richiedere un bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluzione Ã¨ sbagliata. Riprova.">
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index cd678f1..e205042 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "ã?ªã??ã?·ã?§ã?³">
 
 <!ENTITY torsettings.useProxy.checkbox "ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?«æ?¥ç¶?ã??ã??ã?®ã?«ã??ã?ã?ã?·ã??ä½¿ç?¨ã??ã?¾ã??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "ã??ã?ã?ã?·ã?®ç¨®é¡?">
 <!ENTITY torsettings.useProxy.type.placeholder "ã??ã?ã?ã?·ã?®ç¨®é¡?ã??é?¸æ??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "ã?¢ã??ã?¬ã?¹">
 <!ENTITY torsettings.useProxy.address.placeholder "IP ã?¢ã??ã?¬ã?¹ã?¾ã??ã?¯ã??ã?¹ã??å??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "ã??ã?¼ã??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "ã?¦ã?¼ã?¶ã?¼å??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "ã??ã?¹ã?¯ã?¼ã??">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã?¯ç?¹å®?ã?®ã??ã?¼ã??ã?¸ã?®æ?¥ç¶?ã?®ã?¿è¨±å?¯ã??ã??ã??ã?¡ã?¤ã?¢ã?¼ã?¦ã?©ã?¼ã?«ã??é??ã??ã?¾ã??ã??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "è¨±å?¯ã??ã??ã??ã??ã?¼ã??">
 <!ENTITY torsettings.useBridges.checkbox "Tor ã?¯ç§?ã?®å?½ã?§ã?¯æ¤?é?²ã??ã??ã?¦ã??ã?¾ã??">
 <!ENTITY torsettings.useBridges.default "å??è?µã??ã?ªã??ã?¸ã??é?¸æ??ã??ã??">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "ã??ã??ã?«è©³ã??ã??">
+<!ENTITY torPreferences.torSettings "Tor ã?®è¨å®?">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser ã?¯é??ä¿¡ã??ã?©ã??ã?£ã??ã?¯ã?? Tor ã??ã??ã??ã?¯ã?¼ã?¯ã??çµ?ç?±ã??ã??ã?¦é??ä¿¡ã??ã?¾ã??ã??Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¯ä¸?ç??ä¸ã?®ä½?å??ã??ã?®ã??ã?©ã?³ã??ã?£ã?¢ã?«ã??ã?£ã?¦é??ç?¨ã??ã??ã?¦ã??ã?¾ã??ã??" >
+<!ENTITY torPreferences.learnMore "è©³ç´°æ??å ±">
 <!ENTITY torPreferences.bridges "ã??ã?ªã??ã?¸">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgesDescription "ã??ã?ªã??ã?¸ã?¯ Tor ã??ã??ã?ã??ã?¯ã??ã??ã??å?°å??ã??ã?? Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã?¢ã?¯ã?»ã?¹ã??ã??ã??ã?¨ã??æ??å?©ã??ã??ã?¾ã??ã??å?°å??ã?«ã??ã?£ã?¦ã??ã??ã??ã??ã?ªã??ã?¸ã??ä»?ã?®ã??ã?®ã??ã??ã??ã?¾ã??å??ä½?ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??">
+<!ENTITY torPreferences.useBridge "ã??ã?ªã??ã?¸ã??ä½¿ç?¨ã??ã??">
+<!ENTITY torPreferences.requestNewBridge "æ?°ã??ã??ã??ã?ªã??ã?¸ã??è¦?æ±?&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "ã??ã?ªã??ã?¸ã??æ??å®?ã??ã??">
 <!ENTITY torPreferences.advanced "è©³ç´°">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt " ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??ã??ã??ã?«ã?¯CAPTCHAã??è§£ã??ã?¦ä¸?ã??ã??ã??">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "ã??ã?®è§£ç?ã?¯æ£ã??ã??ã??ã??ã?¾ã??ã??ã??å??åº¦å®?è¡?ã??ã?¦ã??ã? ã??ã??ã??">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "æ?°ã??ã?ªã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??ã??">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDBã?¨ã?®æ?¥ç¶?ã??ç¢ºç«?ã??ã?¦ã??ã?¾ã??ã??ã??ã?°ã??ã??å¾?ã?£ã?¦ä¸?ã??ã??ã??">
+<!ENTITY torPreferences.advancedDescription "Tor Browser ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?«æ?¥ç¶?ã??ã??æ?¹æ³?ã??è¨å®?ã??ã?¾ã??ã??">
+<!ENTITY torPreferences.firewallPortsPlaceholder "ã?³ã?³ã??å?ºå??ã??ã?®å?¤">
+<!ENTITY torPreferences.requestBridgeDialogTitle "ã??ã?ªã??ã?¸ã?®è¦?æ±?">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??ã??ã?°ã??ã??ã??å¾?ã?¡ã??ã? ã??ã??ã??">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt " ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??ã??ã??ã?«ã?¯CAPTCHAã??è§£ã??ã?¦ä¸?ã??ã??ã??">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "ã??ã?®è§£ç?ã?¯æ£ã??ã??ã??ã??ã?¾ã??ã??ã??å??åº¦å®?è¡?ã??ã?¦ã??ã? ã??ã??ã??">
+<!ENTITY torPreferences.viewTorLogs "Tor ã?®ã?ã?°ã??è¡¨ç¤ºã??ã??ã??">
+<!ENTITY torPreferences.viewLogs "ã?ã?°ã??è¡¨ç¤º&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor ã?ã?°">
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index aa01eca..fc28f44 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "á??á? á??á?¡á??á??á??á??á??á??á??á?£á??á??">
 
 <!ENTITY torsettings.useProxy.checkbox "á??á??á?¢á??á? á??á??á?¢á??á??á?? á??á??á?¡á??á??á??á??á?¨á??á? á??á??á??á??á?? á??á? á??á?¥á?¡á??á?¡ á??á??á?§á??á??á??á??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "á??á? á??á?¥á?¡á??á?¡ á?¡á??á?®á??á??á??á??">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "á??á??á?£á??á??á??á??á?? á??á? á??á?¥á?¡á??á?¡ á?¡á??á?®á??á??á??á??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "á??á??á?¡á??á??á??á? á??á??">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-á??á??á?¡á??á??á??á? á??á?? á??á?? á??á??á?¡á??á?®á??á??á??á??á??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "á??á??á? á?¢á??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "á??á??á??á?®á??á??á? á??á??á??á??á?¡ á?¡á??á?®á??á??á??">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "á??á??á??á??">
 <!ENTITY torsettings.useProxy.password "á??á??á? á??á??á??">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "á??á??á??á??á??á?£á?¢á??á? á?? á??á??á?¢á??á? á??á??á?¢á?¡ á?£á??á??á??á?¨á??á? á??á??á??á?? á?¥á?¡á??á??á??á?¡ á?¤á??á? á??á?¡ á??á??á??á??á??á??, á? á??á??á??á??á?¨á??á?ª á??á?®á??á??á??á?? á?ªá??á??á??á??á?£á??á?? á??á??á? á?¢á??á??á??á?? á??á??á?¨á??á??á??á?£á??á??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "á??á??á?¨á??á??á??á?£á??á?? á??á??á? á?¢á??á??á??">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor á?¨á??á??á?¦á?£á??á?£á??á??á?? á?©á??á??á?¡ á?¥á??á??á?§á??á??á??á?¨á??">
 <!ENTITY torsettings.useBridges.default "á?©á??á?¨á??á??á??á??á?£á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡ á??á??á??á??á??á??á??á??">
 <!ENTITY torsettings.useBridges.default.placeholder "á?®á??á??á??á?¡ á??á??á??á??á??á??á??á??">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "á??á??á??á??á? á??á?? CAPTCHA, á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡ á??á??á??á?®á??á??á??á??á?¡á??á??á??á?¡.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "á??á??á??á??á?¬á?§á??á??á?¢á?? á??á? á??á?¡á?¬á??á? á??á??. á??á??á?®á??á??á?? á?¡á?ªá??á??á??á?? á?®á??á??á??á?®á??á??.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "á??á?®á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡ á??á??á??á?®á??á??á??á??...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "á??á??á??á??á??á?¨á??á? á??á??á?? BridgeDB-á?¡á??á??á??. á??á??á?®á??á??á??, á??á??á??á??á??á??á??á??á??.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "á??á??á??á??á? á??á?? CAPTCHA, á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡ á??á??á??á?®á??á??á??á??á?¡á??á??á??á?¡.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "á??á??á??á??á?¬á?§á??á??á?¢á?? á??á? á??á?¡á?¬á??á? á??á??. á??á??á?®á??á??á?? á?¡á?ªá??á??á??á?? á?®á??á??á??á?®á??á??.">
diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd
index 2573377..db23ec8 100644
--- a/src/chrome/locale/kk/network-settings.dtd
+++ b/src/chrome/locale/kk/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password">
+<!ENTITY torsettings.useProxy.port "Ð?Ð¾Ñ?Ñ? Ð½Ó©Ð¼Ñ?Ñ?Ñ?">
+<!ENTITY torsettings.useProxy.username "Ð?Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ñ?Ñ? Ð°Ñ?Ñ?">
+<!ENTITY torsettings.useProxy.password "Ò?Ò±Ð¿Ð¸Ñ?Ñ?Ó©Ð·">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Ð?ÐµÒ£ÐµÐ¹Ñ?Ñ?Ð»Ð³ÐµÐ½">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð?Ó©Ð¿Ñ?Ñ?Ð´Ñ? Ñ?Ò±Ñ?Ð°Ñ?Ñ? Ò¯Ñ?Ñ?Ð½ CAPTCHA-Ð½Ñ? Ð´Ò±Ñ?Ñ?Ñ? Ð¶Ð°Ð·Ñ?Ò£Ñ?Ð·">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð¨ÐµÑ?Ñ?Ð¼ Ð´Ò±Ñ?Ñ?Ñ? ÐµÐ¼ÐµÑ?. Ó?Ñ?ÐµÐºÐµÑ?Ñ?Ñ? Ò?Ð°Ð¹Ñ?Ð°Ð»Ð°Ð¿ ÐºÓ©Ñ?Ñ?Ò£Ñ?Ð·.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ð?Ð°Ò£Ð° ÐºÓ©Ð¿Ñ?Ñ?Ð´Ñ? Ñ?Ò±Ñ?Ð°Ò£Ñ?Ð·...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB-ÐºÐµ Ñ?Ð°Ð±Ð°Ñ?Ð»Ð°Ñ?Ñ?Ð´Ð°Ð¼Ñ?Ð·. Ó¨Ñ?Ñ?Ð½ÐµÐ¼Ñ?Ð½ ÐºÒ¯Ñ?Ðµ Ñ?Ò±Ñ?Ñ?Ò£Ñ?Ð·.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð?Ó©Ð¿Ñ?Ñ?Ð´Ñ? Ñ?Ò±Ñ?Ð°Ñ?Ñ? Ò¯Ñ?Ñ?Ð½ CAPTCHA-Ð½Ñ? Ð´Ò±Ñ?Ñ?Ñ? Ð¶Ð°Ð·Ñ?Ò£Ñ?Ð·">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð¨ÐµÑ?Ñ?Ð¼ Ð´Ò±Ñ?Ñ?Ñ? ÐµÐ¼ÐµÑ?. Ó?Ñ?ÐµÐºÐµÑ?Ñ?Ñ? Ò?Ð°Ð¹Ñ?Ð°Ð»Ð°Ð¿ ÐºÓ©Ñ?Ñ?Ò£Ñ?Ð·.">
diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd
index bbd29b2..5183787 100644
--- a/src/chrome/locale/km/network-settings.dtd
+++ b/src/chrome/locale/km/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "á??á?¶â??á??á??á??á??á?¾á??">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "á??á??á??á??á??á??â??á??á??á??á?¼á??á??á??á?¸á??">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "á?¢á?¶á??á??á??á??á?¶á??á??">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "á?¢á?¶á??á??á??á??á??á?¶á?? IP á?¬â??á??á??á??á??á??â??á??á??á?¶á??á??á?¸á??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "á??á??á??á??á??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "á??á??á??á??á??â??á?¢á??á??á??â??á??á??á??á?¾á??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "á??á?¶á??á??á??â??á??á??á??á??á?¶á??á??á??">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "á??á??á??á??á??á?¢á??á??á??á??á??á??á?¾á??á??á??á?¶á??á??">
+<!ENTITY torsettings.useProxy.password "á??á??á??á??á?¼á??á??á??á??á??á?¶á??á??">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "á??á?»á??á??á??á??á?¼á??á??á??â??á??á??á??â??á??á??á??á??â??á??á?¶á??á??á??á??á??á??á?¶á??á??â??á??á??á??á?¾á??â??á??á??á??â??á?¢á??á?»á??á??á??á?¶á??â??á??á??â??á??á?¶á??â??â??á??á??á??á?¶á??á??á??á??â??á??á??á??á??á??á?¶á??á??á??á?¶á??á??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "á??á??á??á??â??á??á?¶á??â??á?¢á??á?»á??á??á??á?¶á??á??">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "á??á??á??á??á?·á??á??á??á??á??á??">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd
index 6aa4864..4424b91 100644
--- a/src/chrome/locale/kn/network-settings.dtd
+++ b/src/chrome/locale/kn/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "à²?à³?à²ªà³?à²¤à²ªà²¦">
+<!ENTITY torsettings.useProxy.password "Password">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index 2bbe605..ec4adc4 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "ì?µì??">
 
 <!ENTITY torsettings.useProxy.checkbox "ì?¸í?°ë?·ì?? ì?°ê²°í?  ë?? í??ë¡?ì??ë¥¼ ì?¬ì?©í?©ë??ë?¤">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "í??ë¡?ì?? ì¢?ë¥?">
 <!ENTITY torsettings.useProxy.type.placeholder "í??ë¡?ì?? ì? í??ì?? ì? í??í?´ ì£¼ì?¸ì??.">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "ì£¼ì??">
 <!ENTITY torsettings.useProxy.address.placeholder "IP ì£¼ì?? ë??ë?? í?¸ì?¤í?¸ ë?¤ì??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "í?¬í?¸">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "ì?¬ì?©ì??ëª?">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "Username">
 <!ENTITY torsettings.useProxy.password "ë¹?ë°?ë²?í?¸">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "ì?´ ì»´í?¨í?°ë?? í?¹ì ? í?¬í?¸ë§? í??ì?©í??ë?? ë°©í??ë²½ì?? í?µí?´ì?? ì?°ê²°ë?©ë??ë?¤.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "í??ì?©ë?? í?¬í?¸">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "ì?°ë¦¬ë??ë?¼ì??ì??ë?? Torë¥¼ ê²?ì?´í?©ë??ë?¤.">
 <!ENTITY torsettings.useBridges.default "ì ?ê³µë?? ë¸?ë¦¿ì§?ë¥¼ ì? í??í??ì?¸ì??.">
 <!ENTITY torsettings.useBridges.default.placeholder "ë¸?ë¦¿ì§?ë¥¼ ì? í??í??ì?¸ì??.">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "ì¤?ê³?ì??ë²?">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "ê³ ê¸?">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ë¸?ë¦¿ì§?ë¥¼ ì??ì²í??ê¸° ì??í?´ CAPCHAë¥¼ í??ì?´ì£¼ì?¸ì??.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "í??ì?´ê°? ë§?ì§? ì??ì?µë??ë?¤. ë?¤ì?? ì??ë??í?´ì£¼ì?¸ì??.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "ì??ë¡?ì?´ ë¸?ë¦¿ì§? ì??ì²í??ê¸°">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ë¸?ë¦¿ì§?DBì?? ì?°ê²°í??ê³  ì??ì?¼ë??, ì? ì?? ê¸°ë?¤ë ¤ì£¼ì?¸ì??.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ë¸?ë¦¿ì§?ë¥¼ ì??ì²í??ê¸° ì??í?´ CAPCHAë¥¼ í??ì?´ì£¼ì?¸ì??.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "í??ì?´ê°? ë§?ì§? ì??ì?µë??ë?¤. ë?¤ì?? ì??ë??í?´ì£¼ì?¸ì??.">
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index d974e0e..f0af4d9 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "NebÅ«tina">
 
 <!ENTITY torsettings.useProxy.checkbox "Prisijungimui prie interneto aÅ¡ naudoju Ä¯galiotÄ?jÄ¯ serverÄ¯">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Ä®galiotojo serverio tipas">
 <!ENTITY torsettings.useProxy.type.placeholder "pasirinkite Ä¯galiotojo serverio tipÄ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adresas">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adresas arba serverio vardas">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Prievadas">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Naudotojo vardas">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "SlaptaÅ¾odis">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Å is kompiuteris jungiasi per uÅ¾kardÄ?, kuri leidÅ¾ia jungtis tik prie tam tikrÅ³ prievadÅ³">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "LeidÅ¾iami prievadai">
 <!ENTITY torsettings.useBridges.checkbox "Mano Å¡alyje Tor yra cenzÅ«ruojamas">
 <!ENTITY torsettings.useBridges.default "Pasirinkite Ä¯taisytÄ?jÄ¯ tinklÅ³ tiltÄ?">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.torSettings "Tor nustatymai">
+<!ENTITY torPreferences.torSettingsDescription "Tor narÅ¡yklÄ? nukreipia jÅ«sÅ³ srautÄ? per Tor tinklÄ?, veikianÄ?io po visÄ? pasaulÄ¯ iÅ¡sidÄ?sÄ?iusiÅ³ tÅ«kstanÄ?iÅ³ savanoriÅ³ dÄ?ka." >
+<!ENTITY torPreferences.learnMore "SuÅ¾inokite daugiau">
 <!ENTITY torPreferences.bridges "TinklÅ³ tiltai">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgesDescription "Tinklo tiltai padeda jums pasiekti Tor tinklÄ?, vietose kur Tor uÅ¾blokuotas. Priklausomai nuo to kur esate, vienas tiltas gali veikti geriau nei kitas.">
+<!ENTITY torPreferences.useBridge "Naudokite tinklo tiltÄ?">
+<!ENTITY torPreferences.requestNewBridge "Pateikite uÅ¾klausÄ? naujam tinklo tiltui&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "Pateikite tinklÅ³ tiltÄ?">
 <!ENTITY torPreferences.advanced "IÅ¡plÄ?stiniai">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "NorÄ?dami uÅ¾klausti tinklÅ³ tiltÄ?, iÅ¡sprÄ?skite saugos kodÄ?.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Sprendimas neteisingas. Bandykite dar kartÄ?.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "UÅ¾klausti naujÄ? tinklÅ³ tiltÄ?â?¦">
+<!ENTITY torPreferences.advancedDescription "SukonfigÅ«ruokite kaip Tor narÅ¡yklÄ? jungsis prie interneto.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Kableliais atskirtos reikÅ¡mÄ?s">
+<!ENTITY torPreferences.requestBridgeDialogTitle "UÅ¾klausti tinklÅ³ tiltÄ?â?¦">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Susisiekiama su BridgeDB. Palaukite.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "NorÄ?dami uÅ¾klausti tinklÅ³ tiltÄ?, iÅ¡sprÄ?skite saugos kodÄ?.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Sprendimas neteisingas. Bandykite dar kartÄ?.">
+<!ENTITY torPreferences.viewTorLogs "Å½iÅ«rÄ?ti Tor Å¾urnalÄ?.">
+<!ENTITY torPreferences.viewLogs "Å½iÅ«rÄ?ti Å¾urnalÄ?&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor Å¾urnalas">
diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd
index 2d8055a..85bef23 100644
--- a/src/chrome/locale/lv/network-settings.dtd
+++ b/src/chrome/locale/lv/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "NeobligÄ?ts">
 
 <!ENTITY torsettings.useProxy.checkbox "Lai izveidotu savienojumu ar internetu, es lietoju starpniekseveri">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Starpnieka tips">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "izvÄ?lieties starpniekservera veidu">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adrese">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adrese vai resursdatora nosaukums">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "LietotÄ?jvÄ?rds">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Parole">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Å is dators iet caur ugunsmÅ«ri, kurÅ¡ atÄ¼auj tikai savienojumus ar noteiktiem portiem.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "AtÄ¼autie porti">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "ManÄ? valstÄ« Tor tiek cenzÄ?ts">
 <!ENTITY torsettings.useBridges.default "IzvÄ?lieties iebÅ«vÄ?tu tiltu">
 <!ENTITY torsettings.useBridges.default.placeholder "izvÄ?lieties tiltu">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Tilti">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "LietpratÄ«gs">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index 3830d1d..cf9fdc5 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Ð?Ð¿Ñ?Ð¸Ð¾Ð½Ð°Ð»Ð½Ð¾">
 
 <!ENTITY torsettings.useProxy.checkbox "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð°Ð¼ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð·Ð° Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Ð¢Ð¸Ð¿ Ð½Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸">
+<!ENTITY torsettings.useProxy.type "Ð¢Ð¸Ð¿ Ð½Ð° Ð?Ñ?Ð¾ÐºÑ?Ð¸">
 <!ENTITY torsettings.useProxy.type.placeholder "Ð¾Ð´Ð±ÐµÑ?Ð¸ Ñ?Ð¸Ð¿ Ð½Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Ð?Ð´Ñ?ÐµÑ?Ð¸">
+<!ENTITY torsettings.useProxy.address "Ð?Ð´Ñ?ÐµÑ?Ð°">
 <!ENTITY torsettings.useProxy.address.placeholder "IP Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð¸Ð»Ð¸ Ð¸Ð¼Ðµ Ð½Ð° Ñ?Ð¾Ñ?Ñ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Ð?Ð¾Ñ?Ñ?Ð°">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Ð?Ð¾Ð·Ð¸Ð½ÐºÐ°">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ð?Ð²Ð¾Ñ? ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ? Ð¾Ð´Ð¸ Ð¿Ñ?ÐµÐºÑ? Ð·Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½ Ñ?Ð¸Ð´ ÐºÐ¾Ñ? Ð´Ð¾Ð·Ð²Ð¾Ð»Ñ?Ð²Ð° Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?Ð° Ð´Ð¾ Ð¾Ð´Ñ?ÐµÐ´ÐµÐ½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¸">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Ð?Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¸">
 <!ENTITY torsettings.useBridges.checkbox "Tor Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½ Ð²Ð¾ Ð¼Ð¾Ñ?Ð°Ñ?Ð° Ð´Ñ?Ð¶Ð°Ð²Ð°">
 <!ENTITY torsettings.useBridges.default "Ð?Ð´Ð±ÐµÑ?Ð¸ Ð²Ð³Ñ?Ð°Ð´ÐµÐ½ Ð¼Ð¾Ñ?Ñ?">
@@ -68,32 +62,22 @@
 <!ENTITY torprogress.pleaseWait "Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ð¾Ñ?ÐµÐºÐ°Ñ?Ñ?Ðµ Ð´Ð¾Ð´ÐµÐºÐ° Ñ?Ðµ Ð²Ð¾Ñ?Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾ Ñ?Ð¾ Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°.&#160; Ð?Ð²Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ðµ Ð½ÐµÐºÐ¾Ð»ÐºÑ? Ð¼Ð¸Ð½Ñ?Ñ?Ð¸.">
 
 <!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Ð¢Ð¾Ñ?">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.categoryTitle "Tor">
+<!ENTITY torPreferences.torSettings "Tor Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser Ð³Ð¾ Ñ?Ñ?Ñ?Ð¸Ñ?Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ñ?Ð¾Ð¾Ð±Ñ?Ð°Ñ?Ð°Ñ? Ð¿Ñ?ÐµÐºÑ? Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°, Ð²Ð¾Ð´ÐµÐ½Ð° Ð¾Ð´ Ð¸Ð»Ñ?Ð°Ð´Ð½Ð¸Ñ?Ð¸ Ð²Ð¾Ð»Ð¾Ð½Ñ?ÐµÑ?Ð¸ Ñ?Ð¸Ñ?Ñ?Ð¼ Ñ?Ð²ÐµÑ?Ð¾Ñ?." >
 <!ENTITY torPreferences.learnMore "Ð?Ð°Ñ?Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ð²ÐµÑ?Ðµ">
 <!ENTITY torPreferences.bridges "Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
-<!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð ÐµÑ?ÐµÑ?Ðµ Ñ?Ð° Ð?Ð?Ð?Ð?Ð§Ð?Ð¢Ð? Ð·Ð° Ð´Ð° Ð¿Ð¾Ð±Ð°Ñ?Ð°Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð ÐµÑ?ÐµÐ½Ð¸ÐµÑ?Ð¾ Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾. Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¾Ð±Ð¸Ð´ÐµÑ?Ðµ Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ð¾.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ð?Ð°Ñ?Ð°Ñ?Ðµ Ð·Ð° Ð½Ð¾Ð² Ð¼Ð¾Ñ?Ñ?...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ð¾ BridgeDB. Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ð¾Ñ?ÐµÐºÐ°Ñ?Ñ?Ðµ.">
+<!ENTITY torPreferences.bridgesDescription "Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ð¸ Ð¿Ð¾Ð¼Ð°Ð³Ð°Ð°Ñ? Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ð°Ð¿Ð¸Ñ?Ðµ Ð½Ð° Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð° Ð½Ð° Ð¼ÐµÑ?Ñ?Ð° ÐºÐ°Ð´Ðµ Tor Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½. Ð?Ð°Ð²Ð¸Ñ?Ð½Ð¾ Ð¾Ð´ Ñ?Ð¾Ð° ÐºÐ°Ð´Ðµ Ñ?Ñ?Ðµ, ÐµÐ´ÐµÐ½ Ð¼Ð¾Ñ?Ñ? Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ð°Ð±Ð¾Ñ?Ð¸ Ð¿Ð¾Ð´Ð¾Ð±Ñ?Ð¾ Ð¾Ð´ Ð´Ñ?Ñ?Ð³.">
+<!ENTITY torPreferences.useBridge "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?">
+<!ENTITY torPreferences.requestNewBridge "Ð?Ð¾Ð±Ð°Ñ?Ð°Ñ? Ð?Ð¾Ð² Ð¼Ð¾Ñ?Ñ?&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "Ð?Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ Ð¼Ð¾Ñ?Ñ?">
+<!ENTITY torPreferences.advanced "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð¾">
+<!ENTITY torPreferences.advancedDescription "Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ ÐºÐ°ÐºÐ¾ Tor Browser Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð° Ð½Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Ð Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸-Ñ?Ð¾-Ð·Ð°Ð¿Ð¸Ñ?ÐºÐ° Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Ð?Ð¾Ð±Ð°Ñ?Ð°Ñ? Ð?Ð¾Ñ?Ñ?">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð°Ñ? BridgeDB. Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ð¾Ñ?ÐµÐºÐ°Ñ?Ñ?Ðµ.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð ÐµÑ?ÐµÑ?Ðµ Ñ?Ð° Ð?Ð?Ð?Ð?Ð§Ð?Ð¢Ð? Ð·Ð° Ð´Ð° Ð¿Ð¾Ð±Ð°Ñ?Ð°Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð ÐµÑ?ÐµÐ½Ð¸ÐµÑ?Ð¾ Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾. Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¾Ð±Ð¸Ð´ÐµÑ?Ðµ Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ð¾.">
+<!ENTITY torPreferences.viewTorLogs "Ð?Ð¸Ð´Ð¸ Ð³Ð¸ Tor Ð»Ð¾Ð³Ð¾Ð²Ð¸Ñ?Ðµ.">
+<!ENTITY torPreferences.viewLogs "Ð?Ð¸Ð´Ð¸ Ð»Ð¾Ð³Ð¾Ð²Ð¸&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor Ð?Ð¾Ð³Ð¾Ð²Ð¸">
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index bbab031..180a6b1 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "à´¨à´¿à´°àµ?à´¬à´¨àµ?à´§à´®à´¿à´²àµ?à´²à´¾à´¤àµ?à´¤à´¤àµ? ">
 
 <!ENTITY torsettings.useProxy.checkbox "à´?à´¾àµ» à´?à´¨àµ?à´±àµ¼à´¨àµ?à´±àµ?à´±à´¿à´²àµ?à´?àµ? à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?à´¾àµ» à´?à´°àµ? à´ªàµ?à´°àµ?à´?àµ?à´¸à´¿ à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ? ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "à´ªàµ?à´°àµ?à´?àµ?à´¸à´¿ à´?à´¨à´?  ">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "à´?à´°àµ? à´ªàµ?à´°àµ?à´?àµ?à´¸à´¿ à´?à´¨à´? à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?  :">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "à´®àµ?àµ½à´µà´¿à´²à´¾à´¸à´? ">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "à´? à´ªà´¿ à´®àµ?àµ½à´µà´¿à´²à´¾à´¸à´? à´?à´²àµ?à´²àµ?à´?àµ?à´?à´¿àµ½ à´¹àµ?à´¸àµ?à´±àµ?à´±àµ? à´¨àµ?à´¯à´¿à´? ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "à´¯àµ?à´¸àµ¼ à´¨àµ?à´¯à´¿à´? ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "à´ªà´¾à´¸àµ?à´¸àµ?â??à´µàµ?àµ¼à´¡àµ?â?? ">
+<!ENTITY torsettings.useProxy.port "à´ªàµ?à´°àµ?â??à´?àµ?à´?àµ?">
+<!ENTITY torsettings.useProxy.username "à´?à´ªà´¯àµ?à´?àµ?à´¤à´¾à´µà´¿à´¨àµ?à´±àµ? à´ªàµ?àµ¼ ">
+<!ENTITY torsettings.useProxy.password "à´°à´¹à´¸àµ?à´¯à´µà´¾à´?àµ?à´?àµ?àµ?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "à´?à´?àµ? à´?à´¿ à´?à´¿ à´ªà´¿ /à´?à´?àµ? à´?à´¿ à´?à´¿ à´ªà´¿ à´?à´¸àµ? ">
 <!ENTITY torsettings.firewall.checkbox "à´? à´?à´?à´ªàµ?à´¯àµ?à´?àµ?à´?àµ¼ à´?à´¿à´² à´ªàµ?à´°à´¤àµ?à´¯àµ?à´? à´ªàµ?àµ¼à´?àµ?à´?àµ?à´?à´³à´¿à´²àµ?à´?àµ? à´®à´¾à´¤àµ?à´°à´? à´¬à´¨àµ?à´§à´? à´?à´¨àµ?à´µà´¦à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´«à´¯àµ¼à´µà´¾àµ¾ à´µà´´à´¿à´¯à´¾à´£àµ? à´ªàµ?à´?àµ?à´¨àµ?à´¨à´¤àµ?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "à´?à´¨àµ?à´µà´¦à´¿à´?àµ?à´?à´¿à´?àµ?à´?àµ?à´³àµ?à´³ à´ªàµ?àµ¼à´?àµ?à´?àµ?à´?àµ¾ ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "à´?à´¨àµ?à´±àµ? à´°à´¾à´?àµ?à´¯à´¤àµ?à´¤àµ? à´?àµ?àµ¼ à´¸àµ?àµ»à´¸àµ¼ à´?àµ?à´¯àµ?à´¤à´¿à´?àµ?à´?àµ?à´³àµ?à´³à´¤à´¾à´£àµ? ">
 <!ENTITY torsettings.useBridges.default "à´?à´¤à´¿à´¨à´?à´¤àµ?à´¤àµ? à´¤à´¨àµ?à´¨àµ?à´¯àµ?à´³àµ?à´³ à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´? ">
 <!ENTITY torsettings.useBridges.default.placeholder "à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´? ">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
-<!ENTITY torPreferences.bridges "Bridges">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
-<!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à´¬àµ?à´°à´¿à´¡àµ?à´?à´¿à´¨àµ? à´?à´¿à´?àµ?à´?à´¾àµ» à´¤à´¨àµ?à´¨à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´¾à´ªàµ?à´? à´ªà´°à´¿à´¹à´°à´¿à´?àµ?à´?àµ?à´? ">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "à´ªà´°à´¿à´¹à´¾à´°à´? à´¶àµ?à´°à´¿à´¯à´²àµ?à´² . à´¦à´¯à´µà´¾à´¯à´¿ à´?à´¨àµ?à´¨àµ?à´?àµ?à´?àµ? à´¶àµ?à´°àµ?à´®à´¿à´?àµ?à´?àµ?à´? ">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "à´?à´°àµ? à´ªàµ?à´¤à´¿à´¯ à´¬àµ?à´°à´¿à´¡àµ?à´?à´¿à´¨àµ? à´?àµ?à´¦à´¿à´?àµ?à´?àµ?à´? ...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¡à´¿ à´¬à´¿à´¯àµ? à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?àµ?à´¨àµ?à´¨àµ? , à´¦à´¯à´µà´¾à´¯à´¿ à´?à´¾à´¤àµ?à´¤à´¿à´°à´¿à´?àµ?à´?àµ?à´? ">
+<!ENTITY torPreferences.torSettings "à´?àµ?à´¾àµ¼  à´?àµ?à´°à´®àµ?à´?à´°à´£à´?àµ?à´?àµ¾ ">
+<!ENTITY torPreferences.torSettingsDescription "à´¸àµ?à´µà´¯à´? à´¸à´¹à´¾à´¯à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´°àµ? à´ªà´±àµ?à´±à´? à´?à´³àµ?à´?à´³àµ?à´?àµ? à´¸à´¹à´¾à´¯à´¤àµ?à´¤àµ?à´?àµ? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´?àµ?àµ¼ à´¨àµ?à´±àµ?à´µàµ¼à´?àµ?à´?à´¿à´²àµ?à´?àµ?à´?àµ? à´¨à´¿à´?àµ?à´?à´³àµ? à´¬à´¨àµ?à´§à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¾à´£àµ? ." >
+<!ENTITY torPreferences.learnMore "à´?àµ?à´?àµ?à´¤àµ½ à´?à´±à´¿à´¯àµ?">
+<!ENTITY torPreferences.bridges "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾  ">
+<!ENTITY torPreferences.bridgesDescription "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?àµ?àµ¼ à´¤à´?à´?àµ?à´?à´¿à´?àµ?à´?àµ?à´³àµ?à´³ à´¸àµ?à´¥à´²à´?àµ?à´?à´³à´¿àµ½ à´?àµ?àµ¼ à´¨àµ?à´±àµ?à´±àµ¼à´?àµ? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?à´¾àµ» à´¸à´¹à´¾à´¯à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ? . à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´®à´±àµ?à´±àµ?à´±àµ?à´¨àµ?à´¨à´¿à´¨àµ?à´?àµ?à´?à´¾àµ¾ à´¨à´¨àµ?à´¨à´¾à´¯à´¿ à´ªàµ?à´°àµ?à´µà´°àµ?à´¤à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤àµ? à´¨à´¿à´?àµ?à´?àµ¾ à´?à´µà´¿à´?àµ?à´¯à´¾à´£àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ? à´?à´¶àµ?à´°à´¯à´¿à´?àµ?à´?à´¿à´°à´¿à´?àµ?à´?àµ?à´? .">
+<!ENTITY torPreferences.useBridge "à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ?à´?  ">
+<!ENTITY torPreferences.requestNewBridge "à´?à´°àµ? à´ªàµ?à´¤à´¿à´¯ à´¬àµ?à´°à´¿à´¡àµ?à´?à´¿à´¨àµ? à´?àµ?à´¦à´¿à´?àµ?à´?àµ?à´? &amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¨à´²àµ?â??à´?àµ?à´?">
+<!ENTITY torPreferences.advanced "à´ªàµ?à´°àµ?à´¾à´?à´®à´¿à´?àµ?à´?">
+<!ENTITY torPreferences.advancedDescription "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´?à´?àµ?à´?à´¨àµ?à´¯à´¾à´£àµ? à´?à´¨àµ?à´±àµ¼à´¨àµ?à´±àµ?à´±à´¿à´²àµ?à´?àµ?à´?àµ? à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?àµ?à´¨àµ?à´¨à´¤àµ? à´?à´¨àµ?à´¨àµ? à´?àµ?àµºà´«à´¿à´?àµ¼ à´?àµ?à´¯àµ?à´¯àµ?à´? .">
+<!ENTITY torPreferences.firewallPortsPlaceholder "à´?àµ?à´® à´µàµ?à´°àµ?à´¤à´¿à´°à´¿à´?àµ?à´?à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´µà´¾àµ½à´¯àµ?">
+<!ENTITY torPreferences.requestBridgeDialogTitle "à´¬àµ?à´°à´¿à´¡àµ?à´?à´¿à´¨àµ? à´?àµ?à´¦à´¿à´?àµ?à´?àµ?à´? ">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¡à´¿ à´¬à´¿à´¯àµ? à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?àµ?à´¨àµ?à´¨àµ? , à´¦à´¯à´µà´¾à´¯à´¿ à´?à´¾à´¤àµ?à´¤à´¿à´°à´¿à´?àµ?à´?àµ?à´? .">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à´¬àµ?à´°à´¿à´¡àµ?à´?à´¿à´¨àµ? à´?à´¿à´?àµ?à´?à´¾àµ» à´¤à´¨àµ?à´¨à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´¾à´ªàµ?à´? à´ªà´°à´¿à´¹à´°à´¿à´?àµ?à´?àµ?à´? ">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "à´ªà´°à´¿à´¹à´¾à´°à´? à´¶àµ?à´°à´¿à´¯à´²àµ?à´² . à´¦à´¯à´µà´¾à´¯à´¿ à´?à´¨àµ?à´¨àµ?à´?àµ?à´?àµ? à´¶àµ?à´°àµ?à´®à´¿à´?àµ?à´?àµ?à´? ">
+<!ENTITY torPreferences.viewTorLogs "à´?àµ?àµ¼ à´²àµ?à´?àµ?à´¸àµ? à´?à´¾à´£àµ?à´? .">
+<!ENTITY torPreferences.viewLogs "à´²àµ?à´?àµ?à´¸àµ? à´?à´¾à´£àµ?à´? &amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "à´?àµ?àµ¼ à´²àµ?à´?àµ?à´¸àµ? ">
diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd
index 2e88e08..409ed22 100644
--- a/src/chrome/locale/mr/network-settings.dtd
+++ b/src/chrome/locale/mr/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "à¤ªà¥?à¤°à¥?à¤?">
 <!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Password">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à¤ªà¥?à¤²à¤¾à¤?à¥? à¤µà¤¿à¤¨à¤?à¤¤à¥? à¤?à¤°à¤£à¥?à¤¯à¤¾à¤¸à¤¾à¤ à¥? à¤?à¥?à¤ªà¥?à¤?à¤¾à¤?à¥? à¤¨à¤¿à¤°à¤¸à¤¨ à¤?à¤°à¤¾.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "à¤?à¤ªà¤¾à¤¯ à¤¬à¤°à¥?à¤¬à¤° à¤¨à¤¾à¤¹à¥?. à¤?à¥?à¤ªà¤¯à¤¾ à¤ªà¥?à¤¨à¥?à¤¹à¤¾ à¤ªà¥?à¤°à¤¯à¤¤à¥?à¤¨ à¤?à¤°à¤¾.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "à¤¨à¤µà¥?à¤¨ à¤¬à¥?à¤°à¤¿à¤?à¤?à¥? à¤µà¤¿à¤¨à¤?à¤¤à¥? à¤?à¤°à¤¾ ...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "à¤¬à¥?à¤°à¤¿à¤?à¤¡à¤¿à¤¬à¤¶à¥? à¤¸à¤?à¤ªà¤°à¥?à¤? à¤¸à¤¾à¤§à¤£à¥? à¤?à¥?à¤ªà¤¯à¤¾ à¤¥à¤¾à¤?à¤¬à¤¾.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à¤ªà¥?à¤²à¤¾à¤?à¥? à¤µà¤¿à¤¨à¤?à¤¤à¥? à¤?à¤°à¤£à¥?à¤¯à¤¾à¤¸à¤¾à¤ à¥? à¤?à¥?à¤ªà¥?à¤?à¤¾à¤?à¥? à¤¨à¤¿à¤°à¤¸à¤¨ à¤?à¤°à¤¾.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "à¤?à¤ªà¤¾à¤¯ à¤¬à¤°à¥?à¤¬à¤° à¤¨à¤¾à¤¹à¥?. à¤?à¥?à¤ªà¤¯à¤¾ à¤ªà¥?à¤¨à¥?à¤¹à¤¾ à¤ªà¥?à¤°à¤¯à¤¤à¥?à¤¨ à¤?à¤°à¤¾.">
diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd
index c0a22a9..92d3ea9 100644
--- a/src/chrome/locale/ms-MY/network-settings.dtd
+++ b/src/chrome/locale/ms-MY/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Pilihan">
 
 <!ENTITY torsettings.useProxy.checkbox "Saya guna proksi untuk bersambung dengan Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Jenis Proksi">
+<!ENTITY torsettings.useProxy.type "Jenis Proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "pilih sejenis proksi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Alamat">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "Alamat IP atau nama hos">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nama Pengguna">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "Username">
 <!ENTITY torsettings.useProxy.password "Kata Laluan">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Komputer ini melalui tembok api yang hanya membolehkan sambungan ke port tertentu">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Port Dibenarkan">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor dilarang penggunaannya di negara saya">
 <!ENTITY torsettings.useBridges.default "Pilih satu titi terbina-dalam">
 <!ENTITY torsettings.useBridges.default.placeholder "pilih satu titi">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Jambatan, ataupun Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta satu titi.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Jawapan salah. Cuba sekali lagi.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Pinta satu Titi Baharu...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Menghubungi BridgeDB. Tunggu sebentar.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta satu titi.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Jawapan salah. Cuba sekali lagi.">
diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd
index 33c2410..fe6c103 100644
--- a/src/chrome/locale/my/network-settings.dtd
+++ b/src/chrome/locale/my/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "á??á?±á??á??á?ºá??á?á??á?ºá??á?¬ -">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "á??á?¯á?¶á?¸á??á?½á?²á??á?°á?¡á??á??á?º -">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "á??á??á?¬á?¸á??á?¾á??á?º - ">
+<!ENTITY torsettings.useProxy.username "á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?°á?¡á??á??á?º">
+<!ENTITY torsettings.useProxy.password "á??á??á?¬á?¸á??á?¾á??á?º">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "á??á?½á??á?ºá?·á??á?¼á?¯á??á?¬á?¸â??á??á?±á?¬ Ports á??á?»á?¬á?¸ -">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "á?¡á??á??á?ºá?·á??á?¼á??á?ºá?·">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd
index 3680510..04cffb2 100644
--- a/src/chrome/locale/nb/network-settings.dtd
+++ b/src/chrome/locale/nb/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Valgfritt">
 
 <!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener for Ã¥ koble til Internett">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Mellomtjeningstype">
 <!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjenertype">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresse">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Brukernavn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Passord">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Denne datamaskinen gÃ¥r gjennom en brannmur som kun tillater tilkoblinger til visse porter">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Tillatte porter">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor er sensurert i mitt land">
 <!ENTITY torsettings.useBridges.default "Velg en bro med flere innfartsÃ¥rer">
 <!ENTITY torsettings.useBridges.default.placeholder "velg en bro">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
+<!ENTITY torPreferences.torSettings "Tor Innstillinger">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
 <!ENTITY torPreferences.learnMore "LÃ¦r mer">
 <!ENTITY torPreferences.bridges "Broer">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Avansert">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "LÃ¸s CAPTCHA-en for Ã¥ forespÃ¸rre en bro.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "LÃ¸sningen er ikke riktig. VÃ¦r sÃ¥ snill, prÃ¸v pÃ¥ nytt.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
+<!ENTITY torPreferences.viewTorLogs "Se Tor-loggene.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "ForespÃ¸r ny broâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vennligst vent.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "LÃ¸s CAPTCHA-en for Ã¥ forespÃ¸rre en bro.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "LÃ¸sningen er ikke riktig. VÃ¦r sÃ¥ snill, prÃ¸v pÃ¥ nytt.">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor Logger">
diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd
index fc44a69..12812a4 100644
--- a/src/chrome/locale/ne/network-settings.dtd
+++ b/src/chrome/locale/ne/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Password">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd
index d52710a..41d63c3 100644
--- a/src/chrome/locale/nl-BE/network-settings.dtd
+++ b/src/chrome/locale/nl-BE/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optioneel">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type">
+<!ENTITY torsettings.useProxy.type "Proxy-type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adres">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adres of hostnaam">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Poort">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Gebruikersnaam">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Wachtwoord">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -76,25 +70,15 @@ Dit kan enkele minuten duren.">
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Geavanceerd">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index e735f4e..900da31 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optioneel">
 
 <!ENTITY torsettings.useProxy.checkbox "I gebruik een proxy om met het internet te verbinden.">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxytype">
 <!ENTITY torsettings.useProxy.type.placeholder "selecteer een proxytype">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adres">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-adres of hostnaam">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Poort">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Gebruikersnaam">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Wachtwoord">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die alleen verbindingen naar bepaalde poorten toestaat">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten">
 <!ENTITY torsettings.useBridges.checkbox "Tor is in mijn land gecensureerd.">
 <!ENTITY torsettings.useBridges.default "Een ingebouwde bridge selecteren">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "Tor-instellingen">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser routeert uw verkeer over het Tor-netwerk, mogelijk gemaakt door duizenden vrijwilligers over de hele wereld." >
 <!ENTITY torPreferences.learnMore "Meer info">
 <!ENTITY torPreferences.bridges "Bridges">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgesDescription "Bridges helpen u toegang te krijgen tot het Tor-netwerk op plaatsen waar Tor is geblokkeerd. Afhankelijke van waar u zich bevindt, werkt de ene bridge mogelijk beter dan de andere.">
+<!ENTITY torPreferences.useBridge "Een bridge gebruiken">
+<!ENTITY torPreferences.requestNewBridge "Een nieuwe bridge aanvragen&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "Een bridge aanbieden">
 <!ENTITY torPreferences.advanced "Geavanceerd">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Los de CAPTCHA op om een bridge aan te vragen.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "De oplossing is niet juist. Probeer het opnieuw.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Een nieuwe bridge aanvragenâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contact maken met BridgeDB. Een ogenblik.">
+<!ENTITY torPreferences.advancedDescription "Configureren hoe Tor Browser verbinding maakt met het internet.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Kommagescheiden waarden">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Een bridge aanvragen">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contact maken met BridgeDB. Even geduld.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Los de CAPTCHA op om een bridge aan te vragen.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "De oplossing is niet juist. Probeer het opnieuw.">
+<!ENTITY torPreferences.viewTorLogs "De Tor-logboeken weergeven">
+<!ENTITY torPreferences.viewLogs "Logboeken weergeven&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor-logboeken">
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index b5f8fb1..c5c7518 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -34,7 +34,7 @@ torlauncher.bridge_suffix.meek-azure=(werkt in China)
 
 torlauncher.request_a_bridge=Een bridge aanvragenâ?¦
 torlauncher.request_a_new_bridge=Een nieuwe bridge aanvragenâ?¦
-torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik.
+torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Even geduld.
 torlauncher.captcha_prompt=Los de CAPTCHA op om een bridge aan te vragen.
 torlauncher.bad_captcha_solution=De oplossing is niet juist. Probeer het opnieuw.
 torlauncher.unable_to_get_bridge=Kan geen bridge verkrijgen van BridgeDB.\n\n%S
diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd
index 9513dcd..ceef0a5 100644
--- a/src/chrome/locale/nn/network-settings.dtd
+++ b/src/chrome/locale/nn/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Valfritt">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Mellomtenartype">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Addresse">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller vertsnamn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Brukarnamn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Passord">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Tillatne portar">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bruer">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd
index 57ceea2..9537f7e 100644
--- a/src/chrome/locale/pa/network-settings.dtd
+++ b/src/chrome/locale/pa/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "à¨?à©?à¨£à¨µà¨¾à¨?">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "à¨ªà¨°à¨¾à¨?à¨¸à©? à¨?à¨¿à¨¸à¨®">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "à¨ªà¨¤à¨¾">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP à¨¸à¨¿à¨°à¨¨à¨¾à¨µà¨¾à¨? à¨?à¨¾à¨? à¨¹à©?à¨¸à¨?-à¨¨à¨¾à¨?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "à¨¯à©?à©?à¨°-à¨¨à¨¾à¨?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "à¨ªà¨¾à¨¸à¨µà¨°à¨¡">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "à¨?à©±à¨¨à¨¤">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index f39f5a0..37133aa 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "(opcjonalnie)">
 
 <!ENTITY torsettings.useProxy.checkbox "UÅ¼ywam proxy do Å?Ä?czenia siÄ? z Internetem">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Typ Proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "wybierz typ proxy">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adres">
 <!ENTITY torsettings.useProxy.address.placeholder "Nazwa hosta lub adres IP">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "UÅ¼ytkownik">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "HasÅ?o">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na poÅ?Ä?czenie z ustalonymi portami">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju">
 <!ENTITY torsettings.useBridges.default "Wybierz wbudowany most">
 <!ENTITY torsettings.useBridges.default.placeholder "wybierz most">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Mostki">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Zaawansowane">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "RozwiÄ?Å¼ CAPTCHA, aby poprosiÄ? o most.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "RozwiÄ?zanie nie jest poprawne. ProszÄ? sprÃ³buj ponownie.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "PoproÅ? o nowy most...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakt z BridgeDB. ProszÄ? czekaÄ?.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "RozwiÄ?Å¼ CAPTCHA, aby poprosiÄ? o most.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "RozwiÄ?zanie nie jest poprawne. ProszÄ? sprÃ³buj ponownie.">
diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd
index 6106de4..971ae96 100644
--- a/src/chrome/locale/pt-BR/network-settings.dtd
+++ b/src/chrome/locale/pt-BR/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "Eu uso proxy para me conectar Ã  Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Tipo de Proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "Selecione um tipo de proxy">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "EndereÃ§o">
 <!ENTITY torsettings.useProxy.address.placeholder "EndereÃ§o IP ou Servidor">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Porta">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "UsuÃ¡rio">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Senha">
+<!ENTITY torsettings.useProxy.username "Nome de usuÃ¡rio">
+<!ENTITY torsettings.useProxy.password "Palavra-passe">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "A conexÃ£o Internet deste computador Ã© filtrada por uma firewall que autoriza conexÃµes somente a determinadas portas.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor Ã© censurado no paÃs onde estou">
 <!ENTITY torsettings.useBridges.default "Selecione uma ponte embutida">
 <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "ConfiguraÃ§Ãµes do Tor">
+<!ENTITY torPreferences.torSettingsDescription "O Navegador Tor direciona seu trÃ¡fego pela Rede Tor, administrada por milhares de voluntÃ¡rios em todo o mundo." >
 <!ENTITY torPreferences.learnMore "Saiba Mais">
 <!ENTITY torPreferences.bridges "Pontes">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgesDescription "As pontes ajudam vocÃª a acessar a rede Tor em locais onde o Tor estÃ¡ bloqueado. Dependendo de onde vocÃª estiver, uma ponte pode funcionar melhor que outra.">
+<!ENTITY torPreferences.useBridge "Use uma ponte">
+<!ENTITY torPreferences.requestNewBridge "Solicitar uma nova ponte&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "Fornecer uma ponte">
 <!ENTITY torPreferences.advanced "AvanÃ§ado">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
+<!ENTITY torPreferences.advancedDescription "Configure como o Navegador Tor se conecta Ã  Internet.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valores Separados Por Virgula">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Ponte de solicitaÃ§Ã£o">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Entrando em contato com o BridgeDB. Por favor, espere.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "A soluÃ§Ã£o nÃ£o estÃ¡ correta. Por favor, tente novamente.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
+<!ENTITY torPreferences.viewTorLogs "Veja os logs do Tor.">
+<!ENTITY torPreferences.viewLogs "Ver Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Solicitar uma nova ponte">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Entrando em contato com BridgeDB. Por favor, aguarde.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "A soluÃ§Ã£o nÃ£o estÃ¡ correta. Por favor, tente novamente.">
diff --git a/src/chrome/locale/pt-PT/network-settings.dtd b/src/chrome/locale/pt-PT/network-settings.dtd
index f2ea9bf..baa23ba 100644
--- a/src/chrome/locale/pt-PT/network-settings.dtd
+++ b/src/chrome/locale/pt-PT/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "Eu utilizo um proxy para ligar Ã  Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Tipo de proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "selecionar um tipo de proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "EndereÃ§o">
+<!ENTITY torsettings.useProxy.address "Morada">
 <!ENTITY torsettings.useProxy.address.placeholder "EndereÃ§o de IP ou nome do hospedeiro">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Porta">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nome do utilizador">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.username "nome de utilizador">
 <!ENTITY torsettings.useProxy.password "Palavra-passe">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Este computador liga atravÃ©s de uma firewall que sÃ³ permite ligaÃ§Ãµes para determinadas portas">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "O Tor Ã© censurado no meu paÃs">
 <!ENTITY torsettings.useBridges.default "Selecionar uma ponte integrada">
 <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "DefiniÃ§Ãµes do Tor">
+<!ENTITY torPreferences.torSettingsDescription "O Tor Browse envia o seu trÃ¡fego pela Tor Network, operada por milhares de voluntÃ¡rios em todo o mundo." >
 <!ENTITY torPreferences.learnMore "Saber Mais">
 <!ENTITY torPreferences.bridges "Pontes">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "AvanÃ§ado">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "A soluÃ§Ã£o nÃ£o estÃ¡ correta. Por favor, tente novamente.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Solicitar uma Nova Ponte...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "A contactar a BridgeDB. Por favor, aguarde.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "A soluÃ§Ã£o nÃ£o estÃ¡ correta. Por favor, tente novamente.">
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index 1bdef23..320b9b9 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "OpÈ?ional">
 
 <!ENTITY torsettings.useProxy.checkbox "Folosesc un proxy pentru a mÄ? conecta la Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Tip proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "alege un tip de proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "AdresÄ?">
+<!ENTITY torsettings.useProxy.address "Adresa">
 <!ENTITY torsettings.useProxy.address.placeholder "AdresÄ? IP sau hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Nume utilizator">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Parola">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Acest computer trece printr-un firewall care permite doar conexiuni cÄ?tre anumite porturi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Porturi permise">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor este cenzurat Ã®n È?ara mea">
 <!ENTITY torsettings.useBridges.default "SelecteazÄ? o punte integratÄ?">
 <!ENTITY torsettings.useBridges.default.placeholder "selecteazÄ? o punte">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "PunÈ?i">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Avansat">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "RezolvÄ? acest CAPTCHA pentru a cere o punte.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "SoluÈ?ia nu este corectÄ?. Ã?ncearcÄ? din nou.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Cerere Punte NouÄ?">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Se contacteazÄ? BridgeDB. AÈ?teptaÈ?i.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "RezolvÄ? acest CAPTCHA pentru a cere o punte.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "SoluÈ?ia nu este corectÄ?. Ã?ncearcÄ? din nou.">
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index de75219..4cc49f6 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Ð?ÐµÐ¾Ð±Ñ?Ð·Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾">
 
 <!ENTITY torsettings.useProxy.checkbox "Ð¯ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð´Ð»Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Ð¢Ð¸Ð¿ Ð¿Ñ?Ð¾ÐºÑ?Ð¸">
+<!ENTITY torsettings.useProxy.type "Ð¢Ð¸Ð¿ Ð?Ñ?Ð¾ÐºÑ?Ð¸">
 <!ENTITY torsettings.useProxy.type.placeholder "Ð²Ñ?Ð±Ð¾Ñ? Ñ?Ð¸Ð¿Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Ð?Ð´Ñ?ÐµÑ?">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-Ð°Ð´Ñ?ÐµÑ? Ð¸Ð»Ð¸ Ð¸Ð¼Ñ? Ñ?Ð·Ð»Ð°">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Ð?Ð¾Ñ?Ñ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Ð?Ð¼Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Ð?Ð°Ñ?Ð¾Ð»Ñ?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ð?Ð¾Ð¹ Ñ?ÐµÑ?ÐµÐ²Ð¾Ð¹ Ñ?ÐºÑ?Ð°Ð½ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?ÐµÑ? Ð¼Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ðº Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ?Ð¼ Ð¿Ð¾Ñ?Ñ?Ð°Ð¼">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ð Ð°Ð·Ñ?ÐµÑ?ÐµÐ½Ð½Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ñ?">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor Ð·Ð°Ð¿Ñ?ÐµÑ?ÐµÐ½ Ð² Ð¼Ð¾ÐµÐ¹ Ñ?Ñ?Ñ?Ð°Ð½Ðµ">
 <!ENTITY torsettings.useBridges.default "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð²Ñ?Ñ?Ñ?Ð¾ÐµÐ½Ð½Ñ?Ð¹ Ð¼Ð¾Ñ?Ñ?">
 <!ENTITY torsettings.useBridges.default.placeholder "Ð²Ñ?Ð±Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð°">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettings "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor">
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser Ð¿ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð»Ñ?ÐµÑ? Ð²Ð°Ñ? Ñ?Ñ?Ð°Ñ?Ð¸Ðº Ñ?ÐµÑ?ÐµÐ· Ñ?ÐµÑ?Ñ? Tor, Ñ?Ð¿Ñ?Ð°Ð²Ð»Ñ?ÐµÐ¼Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?Ñ?Ð°Ð¼Ð¸ Ð´Ð¾Ð±Ñ?Ð¾Ð²Ð¾Ð»Ñ?Ñ?ÐµÐ² Ð¿Ð¾ Ð²Ñ?ÐµÐ¼Ñ? Ð¼Ð¸Ñ?Ñ?." >
 <!ENTITY torPreferences.learnMore "Ð?Ð¾Ð´Ñ?Ð¾Ð±Ð½ÐµÐµ">
 <!ENTITY torPreferences.bridges "Ð?Ð¾Ñ?Ñ?Ñ?">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgesDescription "Ð?Ð¾Ñ?Ñ?Ñ? Ð¿Ð¾Ð¼Ð¾Ð³Ð°Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ðº Ñ?ÐµÑ?Ð¸ Tor Ð² Ð¼ÐµÑ?Ñ?Ð°Ñ?, Ð³Ð´Ðµ Ð¾Ð½ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½. Ð? Ð·Ð°Ð²Ð¸Ñ?Ð¸Ð¼Ð¾Ñ?Ñ?Ð¸ Ð¾Ñ? Ð¼ÐµÑ?Ñ?Ð°, Ð³Ð´Ðµ Ð²Ñ? Ð½Ð°Ñ?Ð¾Ð´Ð¸Ñ?ÐµÑ?Ñ?, Ð¾Ð´Ð¸Ð½ Ð¼Ð¾Ñ?Ñ? Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð»Ñ?Ñ?Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¾Ð³Ð¾.">
+<!ENTITY torPreferences.useBridge "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?">
+<!ENTITY torPreferences.requestNewBridge "Ð?Ð°Ð¿Ñ?Ð¾Ñ? Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¼Ð¾Ñ?Ñ?Ð°&amp;#x2026;">
+<!ENTITY torPreferences.provideBridge "Ð?Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?">
 <!ENTITY torPreferences.advanced "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð ÐµÑ?Ð¸Ñ?Ðµ CAPTCHA Ð´Ð»Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð° Ð¼Ð¾Ñ?Ñ?Ð°.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð ÐµÑ?ÐµÐ½Ð¸Ðµ Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ñ?Ð¼. Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ ÐµÑ?Ðµ Ñ?Ð°Ð·.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ð?Ð°Ð¿Ñ?Ð¾Ñ? Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¼Ð¾Ñ?Ñ?Ð°â?¦">
+<!ENTITY torPreferences.advancedDescription "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Tor Browser Ðº Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ?.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Ð?Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ?, Ñ?Ð°Ð·Ð´ÐµÐ»Ñ?Ð½Ð½Ñ?Ðµ Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ð¼Ð¸">
+<!ENTITY torPreferences.requestBridgeDialogTitle "Ð?Ð°Ð¿Ñ?Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð°">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ð?Ð±Ñ?Ð°Ñ?ÐµÐ½Ð¸Ðµ Ðº BridgeDB. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ?Ðµ.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð ÐµÑ?Ð¸Ñ?Ðµ CAPTCHA Ð´Ð»Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð° Ð¼Ð¾Ñ?Ñ?Ð°.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð ÐµÑ?ÐµÐ½Ð¸Ðµ Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ñ?Ð¼. Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ ÐµÑ?Ðµ Ñ?Ð°Ð·.">
+<!ENTITY torPreferences.viewTorLogs "Ð?Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð¾Ð² Tor.">
+<!ENTITY torPreferences.viewLogs "Ð?Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð¾Ð²&amp;#x2026;">
+<!ENTITY torPreferences.torLogsDialogTitle "Ð?Ñ?Ñ?Ð½Ð°Ð»Ñ? Tor">
diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd
index c3c2e4f..d9c3f23 100644
--- a/src/chrome/locale/si-LK/network-settings.dtd
+++ b/src/chrome/locale/si-LK/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "à¶?à¶¸à¶à¶»">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "à¶±à·?à¶ºà·?à¶à·? à·?à·?à·?à·?à¶¯à·?à¶ºà¶? à·?à¶»à·?à¶?à¶º">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "à¶½à·?à¶´à·?à¶±à¶º">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP à¶½à·?à¶´à·?à¶±à¶º à·?à·? à·?à¶à·?à¶?à·?à¶»à¶? à¶±à·?à¶¸à¶º">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "à¶´à·?à¶»à·?à¶§à¶º">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "à¶´à¶»à·?à·?à·?à¶½à¶? à¶±à·?à¶¸à¶º">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
 <!ENTITY torsettings.useProxy.password "à¶¸à·?à¶»à¶´à¶¯à¶º">
 <!ENTITY torsettings.useProxy.type.socks4 "4 à·?à·?à¶±à·? à·?à·?à¶?à¶§à·?à¶§à·?à·?">
 <!ENTITY torsettings.useProxy.type.socks5 "5 à·?à·?à¶±à·? à·?à·?à¶?à¶§à·?à¶§à·?à·?">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "à¶¸à·?à¶¸ à¶´à¶»à·?à¶?à¶«à¶?à¶º à·?à·?à·?à·?à·?à·?à¶ ports à·?à¶¯à·?à·? à·?à¶¸à·?à¶¶à¶±à·?à¶° à·?à·?à¶¸à¶§ à¶?à¶©à¶¯à·?à¶± à¶´à¶»à·?à¶¯à·? firewall à¶?à¶?à¶?à·? à·?à¶»à·?à·? à¶?à¶¸à¶±à·? à¶?à¶»à¶ºà·?.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "à¶?à¶±à·?à¶¸à¶ Ports">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "à·?à·?à¶à·?">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "à¶?à·?à·?à·? ">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd
index c9c4000..32c7e0c 100644
--- a/src/chrome/locale/sk/network-settings.dtd
+++ b/src/chrome/locale/sk/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "VoliteÄ¾nÃ©">
 
 <!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu pouÅ¾Ãvam proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Typ Proxy">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "vybraÅ¥ typ proxy">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adresa">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo nÃ¡zov hostiteÄ¾a">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "UÅ¾.nÃ¡zov">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Heslo?">
+<!ENTITY torsettings.useProxy.username "PouÅ¾ÃvateÄ¾skÃ© meno">
+<!ENTITY torsettings.useProxy.password "Heslo">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Tento poÄ?ÃtaÄ? ide cez firewall, ktorÃ½ povoÄ¾uje iba niektorÃ© porty">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "PovolenÃ© porty">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovanÃ½">
 <!ENTITY torsettings.useBridges.default "ZvoÄ¾te zabudovanÃ© premostenie">
 <!ENTITY torsettings.useBridges.default.placeholder "zvoÄ¾te premostenie">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Mosty">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "PokroÄ?ilÃ©">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "VyrieÅ¡ CAPTCHA na vyÅ¾iadanie premostenia.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "RieÅ¡enie nie je sprÃ¡vne. ProsÃm skÃºste znova.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "PoÅ¾iadaÅ¥ o novÃ© premostenie.">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "SpÃ¡jam sa s databÃ¡zou premostenÃ. ProsÃm Ä?akajte.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "VyrieÅ¡ CAPTCHA na vyÅ¾iadanie premostenia.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "RieÅ¡enie nie je sprÃ¡vne. ProsÃm skÃºste znova.">
diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd
index 3b8b975..52fab81 100644
--- a/src/chrome/locale/sl/network-settings.dtd
+++ b/src/chrome/locale/sl/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Po izbiri">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy tip">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Naslov">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "vrata">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "UporabniÅ¡ko ime">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Vrata">
+<!ENTITY torsettings.useProxy.username "Username">
 <!ENTITY torsettings.useProxy.password "Geslo">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "RaÄ?unalnik uporablja poÅ¾arni zid, ki dovoljuje povezavo le na doloÄ?ena vrata">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Mostovi">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Napredno">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd
index 54593dc..4a059ea 100644
--- a/src/chrome/locale/sq/network-settings.dtd
+++ b/src/chrome/locale/sq/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Me zgjedhje">
 
 <!ENTITY torsettings.useProxy.checkbox "UnÃ« pÃ«rdor njÃ« proxy pÃ«r tu lidhur nÃ« Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Lloji i Proxy-t">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa">
+<!ENTITY torsettings.useProxy.address "AdresÃ«">
 <!ENTITY torsettings.useProxy.address.placeholder "Adresa IP ose emri i pritÃ«sit">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Porta">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Emri i pÃ«rdoruesit">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "FjalÃ«kalimi">
+<!ENTITY torsettings.useProxy.port "PortÃ«">
+<!ENTITY torsettings.useProxy.username "EmÃ«r pÃ«rdoruesi">
+<!ENTITY torsettings.useProxy.password "FjalÃ«kalim">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon pÃ«rmes njÃ« muri mbrojtÃ«s, qÃ« i lejon lidhje vetÃ«m me disa porta.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "TOR Ã«shtÃ« i Ã§ensuruar nÃ« vÃ«ndin tim">
 <!ENTITY torsettings.useBridges.default "Zgjidh njÃ« urÃ« tÃ« paracaktuar">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Urat">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "TÃ« mÃ«tejshme">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index 7141eb0..1a21a60 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Ð?Ð¿Ñ?Ð¸Ð¾Ð½Ð¾">
 
 <!ENTITY torsettings.useProxy.checkbox "Koristim proxy za povezivanje na internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Ð?Ñ?Ñ?Ñ?Ð° proxyja">
+<!ENTITY torsettings.useProxy.type "Ð¢Ð¸Ð¿ Ð¿Ñ?Ð¾ÐºÑ?Ð¸Ñ?Ð°">
 <!ENTITY torsettings.useProxy.type.placeholder "Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð¸Ð¿ Ð¿Ñ?Ð¾ÐºÑ?Ð¸Ñ?Ð°">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP Ð°Ð´Ñ?ÐµÑ?Ð° Ð¸Ð»Ð¸ hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Ð?Ð¾Ñ?Ñ?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
 <!ENTITY torsettings.useProxy.password "Lozinka">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ð?Ð²Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð½Ð°Ñ? Ð¿Ñ?Ð¾Ð»Ð°Ð·Ð¸ ÐºÑ?Ð¾Ð· firewall ÐºÐ¾Ñ?Ð¸ Ð´Ð¾Ð·Ð²Ð¾Ñ?Ð°Ð²Ð° Ñ?Ð°Ð¼Ð¾ ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ðµ.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ð?Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½Ð¸ Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Ð¢Ð¾Ñ? Ñ?Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½ Ñ? Ð¼Ð¾Ñ?Ð¾Ñ? Ð·ÐµÐ¼Ñ?Ð¸">
 <!ENTITY torsettings.useBridges.default "Odaberi ugraÄ?eni most">
 <!ENTITY torsettings.useBridges.default.placeholder "Odaberi most">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Mostovi">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð¾">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ReÅ¡ite CAPTCHA da biste zahtevali most.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "ReÅ¡enje nije ispravno. Molimo pokuÅ¡ajte ponovo.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Zahtevanje novog mosta...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktiranje BridgeDB. Molimo saÄ?ekajte.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ReÅ¡ite CAPTCHA da biste zahtevali most.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "ReÅ¡enje nije ispravno. Molimo pokuÅ¡ajte ponovo.">
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index 2ae558d..c4ccf7b 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Valfritt">
 
 <!ENTITY torsettings.useProxy.checkbox "Jag anvÃ¤nder en proxy fÃ¶r att ansluta till internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxytyp">
+<!ENTITY torsettings.useProxy.type "Proxy-typ">
 <!ENTITY torsettings.useProxy.type.placeholder "VÃ¤lj en proxytyp">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adress">
 <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller vÃ¤rdnamn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "AnvÃ¤ndarnamn">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "LÃ¶senord">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Denna dator gÃ¥r genom en brandvÃ¤gg som bara tillÃ¥ter anslutningar pÃ¥ vissa specifika portar.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "TillÃ¥tna portar">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor Ã¤r censurerat i mitt land">
 <!ENTITY torsettings.useBridges.default "VÃ¤lj en inbyggd bro">
 <!ENTITY torsettings.useBridges.default.placeholder "VÃ¤lj en bro">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Broar">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Avancerat">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "LÃ¶s CAPTCHA:n fÃ¶r att begÃ¤ra en bro.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "LÃ¶sningen Ã¤r inte korrekt. VÃ¤nligen fÃ¶rsÃ¶k igen.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "BegÃ¤r en ny bro...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktar BridgeDB. VÃ¤nligen vÃ¤nta.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "LÃ¶s CAPTCHA:n fÃ¶r att begÃ¤ra en bro.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "LÃ¶sningen Ã¤r inte korrekt. VÃ¤nligen fÃ¶rsÃ¶k igen.">
diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd
index f920ae4..306747a 100644
--- a/src/chrome/locale/sw/network-settings.dtd
+++ b/src/chrome/locale/sw/network-settings.dtd
@@ -26,23 +26,18 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Kituo">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
 <!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password">
+<!ENTITY torsettings.useProxy.password "Nywila
+nenosiri">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +70,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index 33ebde2..b79991b 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "à®µà®¿à®°à¯?à®ªà¯?à®ªà®¤à¯?à®¤à¯?à®°à¯?à®µà¯?">
 
 <!ENTITY torsettings.useProxy.checkbox "à®¨à®¾à®©à¯? à®?à®£à¯?à®¯à®¤à¯?à®¤à¯?à®?à®©à¯? à®?à®£à¯?à®¯ à®?à®°à¯? à®ªà®¤à®¿à®²à®¾à®³à¯?à®ªà¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®?à®¿à®±à¯?à®©à¯?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "à®ªà®¤à®¿à®²à®¾à®³à¯? à®µà®?à¯?">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "à®?à®°à¯? à®ªà®¤à®¿à®²à®¾à®³à¯? à®µà®?à¯?à®¯à¯?à®¤à¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®?à®³à¯?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "à®®à¯?à®?à®µà®°à®¿">
 <!ENTITY torsettings.useProxy.address.placeholder "IP à®®à¯?à®?à®µà®°à®¿ à®?à®²à¯?à®²à®¤à¯? à®¹à¯?à®¾à®¸à¯?à®?à¯?à®ªà¯?à®¯à®°à¯?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "à®ªà¯?à®¯à®°à¯?à®¤à¯?à®¤à¯?à®µà¯?">
 <!ENTITY torsettings.useProxy.username "à®ªà®¯à®©à®°à¯?à®ªà¯?à®¯à®°à¯?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?">
+<!ENTITY torsettings.useProxy.password "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®¾à®²à¯?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "à®?à®¨à¯?à®¤ à®?à®£à®¿à®©à®¿ à®?à®°à¯? à®¤à¯?à®¯à®°à®£à¯? à®µà®´à®¿à®¯à¯? à®?à¯?à®²à¯?à®?à®¿à®±à®¤à¯? à®?à®¤à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®?à¯?à®? à®®à¯?à®©à¯?à®?à®³à¯?à®?à¯?à®?à®¾à®© à®?à®£à¯?à®ªà¯?à®ªà¯?à®?à®³à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®?à®©à¯?à®®à®¤à®¿à®?à¯?à®?à®¿à®±à®¤à¯?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "à®?à®©à¯?à®®à®¤à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®®à¯?à®©à¯?à®?à®³à¯?">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor à®?à®©à®¤à¯? à®¨à®¾à®?à¯?à®?à®¿à®©à¯? à®¤à®£à®¿à®?à¯?à®?à¯?à®¯à®¿à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?">
 <!ENTITY torsettings.useBridges.default "à®?à®°à¯? à®?à®³à¯?à®³à®®à¯? bridge à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®?à®³à¯?">
 <!ENTITY torsettings.useBridges.default.placeholder "à®?à®°à¯? bridge à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®?à®³à¯?">
@@ -76,25 +70,15 @@
 <!ENTITY torPreferences.bridges "Bridgeà®?à®³à¯?">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd
index de2f245..4424b91 100644
--- a/src/chrome/locale/te/network-settings.dtd
+++ b/src/chrome/locale/te/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Optional">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Username">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Password">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd
index 85c2b5a..12d1662 100644
--- a/src/chrome/locale/th/network-settings.dtd
+++ b/src/chrome/locale/th/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "à¹?à¸¡à¹?à¸?à¸³à¹?à¸?à¹?à¸?">
 
 <!ENTITY torsettings.useProxy.checkbox "à¸?à¸±à¸?à¹?à¸?à¹?à¸?à¸£à¹?à¸à¸?à¸?à¸µà¹?à¸?à¸·à¹?à¸à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸?à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "à¸?à¸?à¸´à¸?à¸?à¸£à¹?à¸à¸?à¸?à¸µà¸?à¸·à¸">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "à¹?à¸¥à¸·à¸à¸?à¸?à¸?à¸´à¸?à¸?à¸£à¹?à¸à¸?à¸?à¸µ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "à¸?à¸µà¹?à¸à¸¢à¸¹à¹?à¸?à¸·à¸">
+<!ENTITY torsettings.useProxy.address "à¸?à¸µà¹?à¸à¸¢à¸¹à¹?">
 <!ENTITY torsettings.useProxy.address.placeholder "à¸?à¸µà¹?à¸à¸¢à¸¹à¹? IP à¸«à¸£à¸·à¸à¸?à¸·à¹?à¸à¹?à¸®à¸ªà¸?à¹?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "à¸?à¸à¸£à¹?à¸?à¸?à¸·à¸">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "à¸?à¸·à¹?à¸à¸?à¸¹à¹?à¹?à¸?à¹?à¸?à¸·à¸">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "à¸£à¸«à¸±à¸ªà¸?à¹?à¸²à¸?à¸?à¸·à¸">
+<!ENTITY torsettings.useProxy.port "à¸?à¸à¸£à¹?à¸?">
+<!ENTITY torsettings.useProxy.username "à¸?à¸·à¹?à¸à¸?à¸¹à¹?à¹?à¸?à¹?">
+<!ENTITY torsettings.useProxy.password "à¸£à¸«à¸±à¸ªà¸?à¹?à¸²à¸?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP à¸«à¸£à¸·à¸ HTTPS">
 <!ENTITY torsettings.firewall.checkbox "à¸?à¸à¸¡à¸?à¸´à¸§à¹?à¸?à¸à¸£à¹?à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸?à¸µà¹?à¹?à¸?à¹?à¸?à¸²à¸?à¸?à¹?à¸²à¸?à¹?à¸?à¸£à¹?à¸§à¸à¸¥à¸¥à¹?à¸?à¸µà¹?à¸à¸?à¸¸à¸?à¸²à¸?à¹?à¸«à¹?à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸?à¹?à¸?à¸?à¸²à¸°à¸?à¸²à¸?à¸?à¸à¸£à¹?à¸?à¹?à¸?à¹?à¸²à¸?à¸±à¹?à¸?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "à¸?à¸à¸£à¹?à¸?à¸?à¸µà¹?à¸à¸?à¸¸à¸?à¸²à¸?à¸?à¸·à¸ ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor à¸?à¸¹à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¸?à¸£à¸°à¹?à¸?à¸¨à¸?à¸à¸?à¸?à¸±à¸?">
 <!ENTITY torsettings.useBridges.default "à¹?à¸¥à¸·à¸à¸?à¸ªà¸°à¸?à¸²à¸?à¸?à¸µà¹?à¸¡à¸µà¸¡à¸²à¹?à¸«à¹?à¹?à¸?à¸?à¸±à¸§">
 <!ENTITY torsettings.useBridges.default.placeholder "à¹?à¸¥à¸·à¸à¸?à¸ªà¸°à¸?à¸²à¸?">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "à¸ªà¸°à¸?à¸²à¸?">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "à¸?à¸±à¹?à¸?à¸ªà¸¹à¸?">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à¹?à¸?à¹?à¸?à¸±à¸?à¸«à¸² CAPTCHA à¹?à¸?à¸·à¹?à¸à¸?à¸à¸ªà¸°à¸?à¸²à¸?">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "à¸§à¸´à¸?à¸µà¹?à¸?à¹?à¹?à¸?à¹?à¸¡à¹?à¸?à¸¹à¸?à¸?à¹?à¸à¸? à¸?à¸£à¸¸à¸?à¸²à¸¥à¸à¸?à¸à¸µà¸?à¸?à¸£à¸±à¹?à¸?">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "à¸?à¸à¸ªà¸°à¸?à¸²à¸?à¹?à¸«à¸¡à¹?â?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "à¸?à¸³à¸¥à¸±à¸?à¸?à¸´à¸?à¸?à¹?à¸ BridgeDB. à¸?à¸£à¸¸à¸?à¸²à¸£à¸">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "à¹?à¸?à¹?à¸?à¸±à¸?à¸«à¸² CAPTCHA à¹?à¸?à¸·à¹?à¸à¸?à¸à¸ªà¸°à¸?à¸²à¸?">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "à¸§à¸´à¸?à¸µà¹?à¸?à¹?à¹?à¸?à¹?à¸¡à¹?à¸?à¸¹à¸?à¸?à¹?à¸à¸? à¸?à¸£à¸¸à¸?à¸²à¸¥à¸à¸?à¸à¸µà¸?à¸?à¸£à¸±à¹?à¸?">
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index bd94ba7..ee45caf 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Ä°steÄ?e baÄ?lÄ±">
 
 <!ENTITY torsettings.useProxy.checkbox "Internete eriÅ?mek iÃ§in vekil sunucu kullanÄ±yorum">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Vekil Sunucu TÃ¼rÃ¼">
 <!ENTITY torsettings.useProxy.type.placeholder "vekil sunucu tÃ¼rÃ¼nÃ¼ seÃ§in">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Adres">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adÄ±">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "KapÄ± NumarasÄ±">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "KapÄ± No">
 <!ENTITY torsettings.useProxy.username "KullanÄ±cÄ± AdÄ±">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Parola">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Bu bilgisayarda yalnÄ±z belirli kapÄ± numaralarÄ±ndan baÄ?lanÄ±lmasÄ±na izin veren bir gÃ¼venlik duvarÄ± kullanÄ±lÄ±yor">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "KullanÄ±labilecek KapÄ± NumaralarÄ±">
 <!ENTITY torsettings.useBridges.checkbox "BulunduÄ?um Ã¼lkede Tor aÄ?Ä± engelleniyor">
 <!ENTITY torsettings.useBridges.default "HazÄ±r KÃ¶prÃ¼lerden SeÃ§in">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "KÃ¶prÃ¼ler">
 <!ENTITY torPreferences.bridgesDescription "KÃ¶prÃ¼ler Tor baÄ?lantÄ±sÄ±nÄ±n engellendiÄ?i yerlerden Tor AÄ?Ä±na eriÅ?mek iÃ§in kullanÄ±lÄ±r.. BulunduÄ?unuz konuma gÃ¶re bir kÃ¶prÃ¼ tÃ¼rÃ¼ diÄ?erinden daha uygun olabilir.">
 <!ENTITY torPreferences.useBridge "Bir kÃ¶prÃ¼ kullanÄ±n">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Yeni KÃ¶prÃ¼ Ä°steÄ?inde Bulunun&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Bir kÃ¶prÃ¼ adresi yazÄ±n">
 <!ENTITY torPreferences.advanced "GeliÅ?miÅ?">
 <!ENTITY torPreferences.advancedDescription "Tor Browser uygulamasÄ±nÄ±n Ä°nternete nasÄ±l baÄ?lanacaÄ?Ä±nÄ± yapÄ±landÄ±rÄ±n.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "VirgÃ¼l ile ayrÄ±lmÄ±Å? deÄ?erler">
 <!ENTITY torPreferences.requestBridgeDialogTitle "KÃ¶prÃ¼ Ä°steÄ?inde Bulunun">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "KÃ¶prÃ¼ veritabanÄ±na baÄ?lanÄ±lÄ±yor. LÃ¼tfen bekleyin.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "KÃ¶prÃ¼ isteÄ?i yapmak iÃ§in gÃ¼venlik kodunu Ã§Ã¶zÃ¼n.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ã?Ã¶zÃ¼m doÄ?ru deÄ?il. LÃ¼tfen yeniden deneyin.">
 <!ENTITY torPreferences.viewTorLogs "Tor gÃ¼nlÃ¼k kayÄ±tlarÄ±na bakÄ±n.">
 <!ENTITY torPreferences.viewLogs "GÃ¼nlÃ¼Ä?Ã¼ GÃ¶rÃ¼ntÃ¼le&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor GÃ¼nlÃ¼k KayÄ±tlarÄ±">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Yeni Bir KÃ¶prÃ¼ Ä°steÄ?i Yap...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "KÃ¶prÃ¼ veritabanÄ±na baÄ?lanÄ±lÄ±yor. LÃ¼tfen bekleyin.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "KÃ¶prÃ¼ isteÄ?i yapmak iÃ§in gÃ¼venlik kodunu Ã§Ã¶zÃ¼n.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ã?Ã¶zÃ¼m doÄ?ru deÄ?il. LÃ¼tfen yeniden deneyin.">
diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd
index 7fc8fe7..42c4bba 100644
--- a/src/chrome/locale/uk/network-settings.dtd
+++ b/src/chrome/locale/uk/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Ð?Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ð¾">
 
 <!ENTITY torsettings.useProxy.checkbox "Ð¯ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ñ? Ð´Ð»Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ð· Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð¾Ð¼">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Ð¢Ð¸Ð¿ Ð¿Ñ?Ð¾ÐºÑ?Ñ?">
 <!ENTITY torsettings.useProxy.type.placeholder "Ð¾Ð±ÐµÑ?Ñ?Ñ?Ñ? Ñ?Ð¸Ð¿ Ð¿Ñ?Ð¾ÐºÑ?Ñ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "Ð?Ð´Ñ?ÐµÑ?Ð°">
 <!ENTITY torsettings.useProxy.address.placeholder "Ð?Ð  Ð°Ð´Ñ?ÐµÑ?Ð° Ð°Ð±Ð¾ Ñ?Ð¼'Ñ? Ñ?Ð¾Ñ?Ñ?Ñ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Ð?Ð¾Ñ?Ñ?">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Ð?Ð¼'Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð°">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "Ð?Ð°Ñ?Ð¾Ð»Ñ?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Ð?Ñ?Ð¹ Ð±Ñ?Ð°Ð½Ð´Ð¼Ð°Ñ?ÐµÑ? Ð´Ð¾Ð·Ð²Ð¾Ð»Ñ?Ñ? Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ñ? Ñ?Ñ?Ð»Ñ?ÐºÐ¸ Ð´Ð¾ Ð¿ÐµÐ²Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð²">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ð?Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð½Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Ð¢Ð¾Ñ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð² Ð¼Ð¾Ñ?Ð¹ ÐºÑ?Ð°Ñ?Ð½Ñ?">
 <!ENTITY torsettings.useBridges.default "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð²Ð±Ñ?Ð´Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð¼Ñ?Ñ?Ñ?">
 <!ENTITY torsettings.useBridges.default.placeholder "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð¼Ñ?Ñ?Ñ?">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Ð?Ð¾Ñ?Ñ?Ð¸">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Ð Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð¸Ð¹">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð Ð¾Ð·Ð²'Ñ?Ð¶Ñ?Ñ?Ñ? CAPTCHA, Ñ?Ð¾Ð± Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð·Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð Ð¾Ð·Ð²'Ñ?Ð·Ð°Ð½Ð½Ñ? Ð½ÐµÐ²Ñ?Ñ?Ð½Ðµ. Ð¡Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð½Ð¾Ð²Ñ?.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ð?Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð·Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¼Ð¾Ñ?Ñ?Ñ?...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ð?&#x27;Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ð· Ð±Ð°Ð·Ð¾Ñ? Ð´Ð°Ð½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð². Ð?Ð°Ñ?ÐµÐºÐ°Ð¹Ñ?Ðµ.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ð Ð¾Ð·Ð²&#x27;Ñ?Ð¶Ñ?Ñ?Ñ? CAPTCHA, Ñ?Ð¾Ð± Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð·Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð Ð¾Ð·Ð²&#x27;Ñ?Ð·Ð°Ð½Ð½Ñ? Ð½ÐµÐ²Ñ?Ñ?Ð½Ðµ. Ð¡Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð½Ð¾Ð²Ñ?.">
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index a92aba6..f22dc3f 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Ø§Ø®ØªÛ?Ø§Ø±Û?">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address">
+<!ENTITY torsettings.useProxy.address "Ù¾ØªÛ?">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Ù¾Ù?Ø±Ù¹">
 <!ENTITY torsettings.useProxy.username "ØµØ§Ø±Ù? Ú©Ø§ Ù?Ø§Ù?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Ù¾Ø§Ø³ Ù?Ø±Ú? ">
+<!ENTITY torsettings.useProxy.password "Ù¾Ø§Ø³ Ù?Ø±Ú?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "ØªØ±Ù?Û? Û?Ø§Ù?ØªÛ?">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ù¾Ù? Ú©Û? Ú¯Ø²Ø§Ø±Ø´ Ú©Ø±Ù?Û? Ú©Û?Ù?Ø¦Û? Ú©Û?Ù¾Ú?Ø§ Ú©Ù? ØÙ? Ú©Ø±Û?ÚºÛ?">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Ø§Û?Ú© Ù?Ø¦Û? Ù¾Ù? Ú©Û? Ú¯Ø²Ø§Ø±Ø´ Ú©Ø±Û?ÚºÛ?Û?Û?">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ø¨Ø±Ø¬ Ú?Û? Ø¨Û? Ø³Û? Ø±Ø§Ø¨Ø·Û? Ú©Û?Ø§ Ø¬Ø§ Ø±Û?Ø§ Û?Û?Û? Ø¨Ø±Ø§Ø¦Û? Ù?Û?Ø±Ø¨Ø§Ù?Û? Ø§Ù?ØªØ¸Ø§Ø± Ú©Ø±Û?ÚºØ?">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ù¾Ù? Ú©Û? Ú¯Ø²Ø§Ø±Ø´ Ú©Ø±Ù?Û? Ú©Û?Ù?Ø¦Û? Ú©Û?Ù¾Ú?Ø§ Ú©Ù? ØÙ? Ú©Ø±Û?ÚºÛ?">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd
index 858fe82..6750724 100644
--- a/src/chrome/locale/uz/network-settings.dtd
+++ b/src/chrome/locale/uz/network-settings.dtd
@@ -26,23 +26,17 @@
 <!ENTITY torsettings.optional "Qo'shimcha">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proksi turi">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Manzil">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP manzil yoki host nomi">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Port">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "Foydalanuvchi nomi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Maxfiy so'z">
+<!ENTITY torsettings.useProxy.password "Ð?Ð°Ñ?Ð¾Ð»Ñ?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Qoâ??shimcha">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index e3281db..09ff182 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "Tuá»³ chá»?n">
 
 <!ENTITY torsettings.useProxy.checkbox "TÃ´i sá» dá»¥ng proxy Ä?á»? káº¿t ná»?i tá»?i Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Dáº¡ng proxy">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "chá»?n loáº¡i proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Ä?á»?a chá»?">
+<!ENTITY torsettings.useProxy.address "Ä?á»?a chá»? nhÃ ">
 <!ENTITY torsettings.useProxy.address.placeholder "Ä?á»?a chá»? IP hoáº·c hostname">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "Cá»?ng">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "TÃªn Ä?Ä?ng nháºp">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Máºt kháº©u">
+<!ENTITY torsettings.useProxy.password "Máºt mÃ£">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCK 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCK 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "MÃ¡y tÃnh nÃ y Ä?i qua má»?t tÆ°á»?ng lá»a mÃ  chá»? cho phÃ©p tá»?i má»?t vÃ i cá»?ng">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Nhá»¯ng Cá»?ng Ä?Æ°á»£c phÃ©p">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor Ä?Ã£ bá»? kiá»?m duyá»?t á»? quá»?c gia cá»§a tÃ´i">
 <!ENTITY torsettings.useBridges.default "Sá» dá»¥ng cáº§u ná»?i cÃ³ sáºµn">
 <!ENTITY torsettings.useBridges.default.placeholder "chá»?n loáº¡i cáº§u ná»?i">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Cáº§u Ná»?i">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "NÃ¢ng cao">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index 4ca136b..8f8a169 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "å?¯é??">
 
 <!ENTITY torsettings.useProxy.checkbox "ä½¿ç?¨ä»£ç??è®¿é?®äº?è??ç½?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "ä»£ç??ç±»å??">
+<!ENTITY torsettings.useProxy.type "ä»£ç??æ??å?¡å?¨ç±»å??">
 <!ENTITY torsettings.useProxy.type.placeholder "é??æ?©ä»£ç??ç±»å??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.address "å?°å??">
 <!ENTITY torsettings.useProxy.address.placeholder "IP å?°å??æ??ä¸»æ?ºå??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "ç«¯å?£">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "ç?¨æ?·å??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "å¯?ç ?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "è¯¥è®¡ç®?æ?ºç??é?²ç?«å¢?ä»?å??è®¸ç?¹å®?ç«¯å?£ç??äº?è??ç½?è¿?æ?¥">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "å??è®¸ç??ç«¯å?£">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "æ??æ??å?¨ç??å?½å®¶å¯¹ Tor è¿?è¡?äº?å®¡æ?¥">
 <!ENTITY torsettings.useBridges.default "é??æ?©å??ç½®ç½?æ¡¥">
 <!ENTITY torsettings.useBridges.default.placeholder "é??æ?©ç½?æ¡¥">
@@ -69,31 +63,21 @@
 
 <!-- #31286 about:preferences strings  -->
 <!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor Settings">
+<!ENTITY torPreferences.torSettings "Tor è®¾ç½®">
 <!ENTITY torPreferences.torSettingsDescription "Tor æµ?è§?å?¨å°?ä½ å??ä¸?ç??æ?°å??å??å¿?æ?¿è??æ?¯æ??ç?? Tor ç½?ç»?ç?¸è¿?" >
 <!ENTITY torPreferences.learnMore "äº?è§£æ?´å¤?">
 <!ENTITY torPreferences.bridges "ç½?æ¡¥">
-<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
+<!ENTITY torPreferences.bridgesDescription "ç½?æ¡¥å¸®å?©ä½ å?¨ Tor è¢«é?»å¡?ç??å?°æ?¹è¿?æ?¥ Tor ç½?ç»?ã??å??å?³äº?ä½ å?¨å?ªé??ï¼?æ??ç??ç½?æ¡¥ç??æ??æ??å?¯è?½æ¯?å?¦ä¸?ä¸ªè¦?å¥½ã??">
+<!ENTITY torPreferences.useBridge "ä½¿ç?¨ç½?æ¡¥">
 <!ENTITY torPreferences.requestNewBridge "æ£å?¨è¯·æ±?æ?°ç½?æ¡¥&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "æ·»å? ç½?æ¡¥">
 <!ENTITY torPreferences.advanced "é«?çº§">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "é??ç½® Tor æµ?è§?å?¨å¦?ä½?æ?¥å?¥ç½?ç»?ã??">
+<!ENTITY torPreferences.firewallPortsPlaceholder "é??å?·å??é??å?¼">
 <!ENTITY torPreferences.requestBridgeDialogTitle "æ£å?¨è¯·æ±?ç½?æ¡¥">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "æ£å?¨è¿?æ?¥å?°BridgeDB,è¯·ç?å¾?ã??">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "æ£å?¨è¿?æ?¥å?° BridgeDBï¼?è¯·ç?å¾?ã??">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "è¯·è¾?å?¥éª?è¯?ç ?ä»¥è?·å??ç½?æ¡¥ã??">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "ç»?æ??å¹¶ä¸?æ£ç¡®ï¼?è¯·é??è¯?ã??">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
+<!ENTITY torPreferences.viewTorLogs "æ?¥ç?? Tor æ?¥å¿?ã??">
 <!ENTITY torPreferences.viewLogs "æ?¥ç??æ?¥å¿?&amp;#x2026;">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "æ£å?¨è¯·æ±?æ?°ç½?æ¡¥â?¦â?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "æ£å?¨è¿?æ?¥å?°BridgeDB,è¯·ç?å¾?ã??">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "è¯·è¾?å?¥éª?è¯?ç ?ä»¥è?·å??ç½?æ¡¥ã??">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "ç»?æ??å¹¶ä¸?æ£ç¡®ï¼?è¯·é??è¯?ã??">
+<!ENTITY torPreferences.torLogsDialogTitle "Tor æ?¥å¿?">
diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd
index 9c958cf..9b808de 100644
--- a/src/chrome/locale/zh-HK/network-settings.dtd
+++ b/src/chrome/locale/zh-HK/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "é?¸ç?¨">
 
 <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "ä»£ç??ä¼ºæ??å?¨é¡?å??">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "ä½?å??">
+<!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IPä½?å??æ??ä¸»æ©?å??ç¨±">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.port "é?£æ?¥å? ">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.username "ç?¨æ?¶å??">
-<!-- TODO: remove colon-->
 <!ENTITY torsettings.useProxy.password "å¯?ç¢¼">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "httpâ?±https">
 <!ENTITY torsettings.firewall.checkbox "å?¢é?¨é?»è?¦é??é??æ??å??å?ªå®¹è¨±é?£æ?¥è?³ç?¹å®?é?£ç·?å? å??é?²ç?«ç??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "å®¹è¨±å??é?£æ?¥å? ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "Advanced">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridgeâ?¦">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index 815cab1..729db6c 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -26,24 +26,18 @@
 <!ENTITY torsettings.optional "é?¸ç?¨">
 
 <!ENTITY torsettings.useProxy.checkbox "ä½¿ç?¨ä»£ç??æ??å??é?£ç·?å?°ç¶²é??ç¶²è·¯">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "ä»£ç??ä¼ºæ??å?¨é¡?å??">
+<!ENTITY torsettings.useProxy.type "Proxyé¡?å??">
 <!ENTITY torsettings.useProxy.type.placeholder "é?¸æ??ä»£ç??ä¼ºæ??å?¨é¡?å??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "ä½?å??">
+<!ENTITY torsettings.useProxy.address "å?°å??">
 <!ENTITY torsettings.useProxy.address.placeholder "IP ä½?å??æ??ä¸»æ©?å??ç¨±">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "é?£æ?¥å? ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "ä½¿ç?¨è??å??ç¨±">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "å? ">
+<!ENTITY torsettings.useProxy.username "ç?¨æ?¶å??">
 <!ENTITY torsettings.useProxy.password "å¯?ç¢¼">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "é??å?°é?»è?¦é??é??æ??å??å?ªå??è¨±é?£æ?¥è?³ç?¹å®?é?£æ?¥å? ç??é?²ç?«ç??">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "å??è¨±ç??é?£æ?¥å? ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "æ??ç??å??å®¶ä¸ Tor å??å?°å¯©æ?¥">
 <!ENTITY torsettings.useBridges.default "é?¸æ??å?§å»ºç??æ©?æ?¥">
 <!ENTITY torsettings.useBridges.default.placeholder "é?¸æ??æ©?æ?¥">
@@ -75,25 +69,15 @@
 <!ENTITY torPreferences.bridges "æ©?æ?¥å?¨">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Provide a bridge">
 <!ENTITY torPreferences.advanced "é?²é??ç??">
 <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "è§£æ±ºé©?è?ç¢¼ä¾?è«?æ±?æ©?æ?¥">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "è§£ç?ä¸?æ£ç¢ºã??è«?å??è©¦ä¸?æ¬¡ã??">
 <!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
-
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.requestNewBridge "è«?æ±?ä¸?å??æ?°ç??æ©?æ?¥...">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "æ£å?¨é?£æ?¥å?° BridgeDBï¼?è«?ç¨?ç?ã??">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "è§£æ±ºé©?è?ç¢¼ä¾?è«?æ±?æ©?æ?¥">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "è§£ç?ä¸?æ£ç¢ºã??è«?å??è©¦ä¸?æ¬¡ã??">

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

Prev by Author: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 31740: Remove some unnecessary RemoteSettings instances
Next by Author: [tor-commits] [tor-browser-build/master] Add missing item to Changelog
Previous by thread: [tor-commits] [bridgedb/develop] Merge branch 'release-0.9.0'
Next by thread: [tor-commits] [tor-launcher/master] Translations update
Index(es):
- Author
- Thread