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

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
From: translation@xxxxxxxxxxxxxx
Date: Tue, 15 Oct 2019 12:23:48 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 15 Oct 2019 08:24:12 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit c7035a83e4734767a33d37b4f3d33a7ff1f7944b
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Tue Oct 15 12:23:44 2019 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 ach/network-settings.dtd   | 22 ++++++----------------
 af/network-settings.dtd    | 22 ++++++----------------
 ar/network-settings.dtd    | 22 ++++++----------------
 ast/network-settings.dtd   | 22 ++++++----------------
 az/network-settings.dtd    | 22 ++++++----------------
 be/network-settings.dtd    | 22 ++++++----------------
 bg/network-settings.dtd    | 22 ++++++----------------
 bn/network-settings.dtd    | 22 ++++++----------------
 br/network-settings.dtd    | 22 ++++++----------------
 bs/network-settings.dtd    | 22 ++++++----------------
 ca/network-settings.dtd    | 22 ++++++----------------
 cs/network-settings.dtd    | 22 ++++++----------------
 cy/network-settings.dtd    | 22 ++++++----------------
 da/network-settings.dtd    | 22 ++++++----------------
 de/network-settings.dtd    | 22 ++++++----------------
 el/network-settings.dtd    | 22 ++++++----------------
 en/network-settings.dtd    | 22 ++++++----------------
 en_GB/network-settings.dtd | 22 ++++++----------------
 eo/network-settings.dtd    | 22 ++++++----------------
 es/network-settings.dtd    | 22 ++++++----------------
 es_AR/network-settings.dtd | 22 ++++++----------------
 es_MX/network-settings.dtd | 22 ++++++----------------
 et/network-settings.dtd    | 22 ++++++----------------
 eu/network-settings.dtd    | 22 ++++++----------------
 fa/network-settings.dtd    | 22 ++++++----------------
 fi/network-settings.dtd    | 22 ++++++----------------
 fr/network-settings.dtd    | 22 ++++++----------------
 fy/network-settings.dtd    | 22 ++++++----------------
 ga/network-settings.dtd    | 22 ++++++----------------
 gd/network-settings.dtd    | 22 ++++++----------------
 gl/network-settings.dtd    | 22 ++++++----------------
 gu/network-settings.dtd    | 22 ++++++----------------
 he/network-settings.dtd    | 22 ++++++----------------
 hi/network-settings.dtd    | 20 +++++---------------
 hr/network-settings.dtd    | 22 ++++++----------------
 hu/network-settings.dtd    | 22 ++++++----------------
 hy/network-settings.dtd    | 22 ++++++----------------
 id/network-settings.dtd    | 22 ++++++----------------
 is/network-settings.dtd    | 22 ++++++----------------
 it/network-settings.dtd    | 22 ++++++----------------
 ja/network-settings.dtd    | 22 ++++++----------------
 ka/network-settings.dtd    | 18 ++++--------------
 kab/network-settings.dtd   | 22 ++++++----------------
 kk/network-settings.dtd    | 22 ++++++----------------
 km/network-settings.dtd    | 22 ++++++----------------
 kn/network-settings.dtd    | 22 ++++++----------------
 ko/network-settings.dtd    | 22 ++++++----------------
 lt/network-settings.dtd    | 22 ++++++----------------
 lv/network-settings.dtd    | 22 ++++++----------------
 mk/network-settings.dtd    | 22 ++++++----------------
 ml/network-settings.dtd    | 22 ++++++----------------
 mr/network-settings.dtd    | 22 ++++++----------------
 ms_MY/network-settings.dtd | 22 ++++++----------------
 my/network-settings.dtd    | 22 ++++++----------------
 nb/network-settings.dtd    | 22 ++++++----------------
 ne/network-settings.dtd    | 22 ++++++----------------
 nl/network-settings.dtd    | 22 ++++++----------------
 nl_BE/network-settings.dtd | 22 ++++++----------------
 nn/network-settings.dtd    | 22 ++++++----------------
 oc/network-settings.dtd    | 22 ++++++----------------
 or/network-settings.dtd    | 22 ++++++----------------
 pa/network-settings.dtd    | 22 ++++++----------------
 pl/network-settings.dtd    | 22 ++++++----------------
 pt_BR/network-settings.dtd | 22 ++++++----------------
 pt_PT/network-settings.dtd | 22 ++++++----------------
 ro/network-settings.dtd    | 22 ++++++----------------
 ru/network-settings.dtd    | 22 ++++++----------------
 si_LK/network-settings.dtd | 20 +++++---------------
 sk/network-settings.dtd    | 22 ++++++----------------
 sl/network-settings.dtd    | 22 ++++++----------------
 son/network-settings.dtd   | 22 ++++++----------------
 sq/network-settings.dtd    | 22 ++++++----------------
 sr/network-settings.dtd    | 22 ++++++----------------
 sv/network-settings.dtd    | 22 ++++++----------------
 sw/network-settings.dtd    | 23 +++++++----------------
 ta/network-settings.dtd    | 22 ++++++----------------
 te/network-settings.dtd    | 22 ++++++----------------
 th/network-settings.dtd    | 22 ++++++----------------
 tr/network-settings.dtd    | 22 ++++++----------------
 uk/network-settings.dtd    | 22 ++++++----------------
 ur/network-settings.dtd    | 22 ++++++----------------
 uz/network-settings.dtd    | 22 ++++++----------------
 vi/network-settings.dtd    | 22 ++++++----------------
 zh_CN/network-settings.dtd | 22 ++++++----------------
 zh_HK/network-settings.dtd | 22 ++++++----------------
 zh_TW/network-settings.dtd | 22 ++++++----------------
 86 files changed, 513 insertions(+), 1372 deletions(-)

diff --git a/ach/network-settings.dtd b/ach/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/ach/network-settings.dtd
+++ b/ach/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/af/network-settings.dtd b/af/network-settings.dtd
index ca04ccf7f..0a3269ee2 100644
--- a/af/network-settings.dtd
+++ b/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd
index 5e1673a8c..9f046c375 100644
--- a/ar/network-settings.dtd
+++ b/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 "Ù?Ù?Ø¹ Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù?">
 <!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 "ØªÙ?Ø± Ù?ØØ¬Ù?Ø¨ Ù?Ù? Ø¨Ù?Ø¯Ù?">
 <!ENTITY torsettings.useBridges.default "Ø§Ø®ØªØ± Ø¬Ø³Ø±Ø§ Ù?Ù?Ø¯Ù?Ù?Ø¬Ø§ Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬">
 <!ENTITY torsettings.useBridges.default.placeholder "Ø§Ø®ØªØ± Ø¬Ø³Ø±Ø§">
@@ -75,18 +69,14 @@
 <!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;">
diff --git a/ast/network-settings.dtd b/ast/network-settings.dtd
index d51d04b37..1f67c1daf 100644
--- a/ast/network-settings.dtd
+++ b/ast/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!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.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,18 +69,14 @@
 <!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 "Avanzao">
 <!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;">
diff --git a/az/network-settings.dtd b/az/network-settings.dtd
index b3aeaae41..a4b106efc 100644
--- a/az/network-settings.dtd
+++ b/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 "Ã?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.port "Port">
+<!ENTITY torsettings.useProxy.username "Ä°stifadÉ?Ã§i adÄ±">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/be/network-settings.dtd b/be/network-settings.dtd
index 38e2752cc..4fc669aca 100644
--- a/be/network-settings.dtd
+++ b/be/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd
index 01223d795..0df650617 100644
--- a/bg/network-settings.dtd
+++ b/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 "Ð?Ð´Ñ?ÐµÑ?">
 <!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 "Ð¢Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ñ?Ðµ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð° Ð¿Ñ?ÐµÐ· 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,18 +69,14 @@
 <!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;">
diff --git a/bn/network-settings.dtd b/bn/network-settings.dtd
index 67680f7be..e8e10016b 100644
--- a/bn/network-settings.dtd
+++ b/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.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 "à¦?à¦° à¦?à¦®à¦¾à¦° à¦¦à§?à¦¶à§? à¦¸à§?à¦¨à§?à¦¸à¦° à¦?à¦°à¦¾ à¦¹à¦¯à¦¼">
 <!ENTITY torsettings.useBridges.default "à¦?à¦?à¦?à¦¿ à¦?à¦¨à§?à¦¤à¦°à§?à¦¨à¦¿à¦°à§?à¦®à¦¿à¦¤ à¦¬à§?à¦°à¦¿à¦? à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨">
 <!ENTITY torsettings.useBridges.default.placeholder "à¦?à¦?à¦?à¦¿ à¦¬à§?à¦°à¦¿à¦? à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨">
@@ -75,18 +69,14 @@
 <!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;">
diff --git a/br/network-settings.dtd b/br/network-settings.dtd
index 86eb33d3f..e62c38f04 100644
--- a/br/network-settings.dtd
+++ b/br/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!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.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,18 +69,14 @@
 <!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;">
diff --git a/bs/network-settings.dtd b/bs/network-settings.dtd
index ba458c383..f1c40d8bf 100644
--- a/bs/network-settings.dtd
+++ b/bs/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 "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.port "Port">
+<!ENTITY torsettings.useProxy.username "KorisniÄ?ko ime">
+<!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.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,18 +69,14 @@
 <!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;">
diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd
index 65d4f1678..cede7c37e 100644
--- a/ca/network-settings.dtd
+++ b/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 "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.password "Contrasenya:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!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,18 +70,14 @@
 <!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;">
diff --git a/cs/network-settings.dtd b/cs/network-settings.dtd
index 61c193fa4..191ab878a 100644
--- a/cs/network-settings.dtd
+++ b/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 "Typ proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "vyberte typ proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa:">
+<!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.password "Heslo:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/cy/network-settings.dtd b/cy/network-settings.dtd
index 55cb7db12..741f6cd5d 100644
--- a/cy/network-settings.dtd
+++ b/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.username "Enw defnyddiwr:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Cyfrinair:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Enw defnyddiwr">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/da/network-settings.dtd b/da/network-settings.dtd
index 9cde33f2f..800b30788 100644
--- a/da/network-settings.dtd
+++ b/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 "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.port "Port">
+<!ENTITY torsettings.useProxy.username "Brugernavn">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/de/network-settings.dtd b/de/network-settings.dtd
index 33e1bf427..18e0e767e 100644
--- a/de/network-settings.dtd
+++ b/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 "Proxy-Typ">
 <!ENTITY torsettings.useProxy.type.placeholder "Proxy-Typ auswÃ¤hlen">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresse:">
+<!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.password "Passwort:">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/el/network-settings.dtd b/el/network-settings.dtd
index 740406b57..6e71464cc 100644
--- a/el/network-settings.dtd
+++ b/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 "Î?Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·">
 <!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,18 +69,14 @@
 <!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;">
diff --git a/en/network-settings.dtd b/en/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/en/network-settings.dtd
+++ b/en/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/en_GB/network-settings.dtd b/en_GB/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/en_GB/network-settings.dtd
+++ b/en_GB/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/eo/network-settings.dtd b/eo/network-settings.dtd
index 123b293a1..224f4740b 100644
--- a/eo/network-settings.dtd
+++ b/eo/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 "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.password "Pasvorto:">
+<!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.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,18 +69,14 @@
 <!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;">
diff --git a/es/network-settings.dtd b/es/network-settings.dtd
index ade6e5dfc..55e774077 100644
--- a/es/network-settings.dtd
+++ b/es/network-settings.dtd
@@ -26,24 +26,18 @@
 <!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 "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 "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.port "Puerto">
+<!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 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.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "En mi paÃs se censura a Tor">
 <!ENTITY torsettings.useBridges.default "Seleccionar un puente construido">
 <!ENTITY torsettings.useBridges.default.placeholder "seleccionar un puente">
@@ -75,18 +69,14 @@
 <!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.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;">
diff --git a/es_AR/network-settings.dtd b/es_AR/network-settings.dtd
index f796d84bb..fa412724d 100644
--- a/es_AR/network-settings.dtd
+++ b/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "seleccionÃ¡ un tipo de proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "DirecciÃ³n:">
+<!ENTITY torsettings.useProxy.address "Address">
 <!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.password "ContraseÃ±a:">
+<!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 "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 "Allowed Ports">
 <!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">
@@ -75,18 +69,14 @@
 <!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;">
diff --git a/es_MX/network-settings.dtd b/es_MX/network-settings.dtd
index 02fef6203..f2460de64 100644
--- a/es_MX/network-settings.dtd
+++ b/es_MX/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 "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 "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.password "ContraseÃ±a:">
+<!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.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,18 +69,14 @@
 <!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;">
diff --git a/et/network-settings.dtd b/et/network-settings.dtd
index e4f9b2e30..8fcdff25a 100644
--- a/et/network-settings.dtd
+++ b/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.port "Port">
+<!ENTITY torsettings.useProxy.username "Kasutajanimi">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd
index e04cc7ef1..6a7eb5de2 100644
--- a/eu/network-settings.dtd
+++ b/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 "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.password "Pasahitza:">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/fa/network-settings.dtd b/fa/network-settings.dtd
index 89dd4d46c..4ef23bb42 100644
--- a/fa/network-settings.dtd
+++ b/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 "Ø¢Ø¯Ø±Ø³">
 <!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 "Ø³Ø§Ú©Ø³ Û´">
 <!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,18 +69,14 @@
 <!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;">
diff --git a/fi/network-settings.dtd b/fi/network-settings.dtd
index 75c4ad3bd..2ac6e04af 100644
--- a/fi/network-settings.dtd
+++ b/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 "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.port "Portti">
+<!ENTITY torsettings.useProxy.username "KÃ¤yttÃ¤jÃ¤tunnus">
+<!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,18 +70,14 @@ 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;">
diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd
index 82a935316..17db9d969 100644
--- a/fr/network-settings.dtd
+++ b/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 proxy">
 <!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 "Allowed Ports">
 <!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">
@@ -75,18 +69,14 @@
 <!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 "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;">
diff --git a/fy/network-settings.dtd b/fy/network-settings.dtd
index 74c947eb6..4424b9194 100644
--- a/fy/network-settings.dtd
+++ b/fy/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Wachtwurd:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/ga/network-settings.dtd b/ga/network-settings.dtd
index e83332efb..713f4ecc9 100644
--- a/ga/network-settings.dtd
+++ b/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.password "Focal faire:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/gd/network-settings.dtd b/gd/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/gd/network-settings.dtd
+++ b/gd/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/gl/network-settings.dtd b/gl/network-settings.dtd
index 88b07803d..1c623d4c0 100644
--- a/gl/network-settings.dtd
+++ b/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 "Tipo de Proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Enderezo:">
+<!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.port "Porto">
+<!ENTITY torsettings.useProxy.username "Nome de usuario">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/gu/network-settings.dtd b/gu/network-settings.dtd
index 9a46a2a27..f2581983f 100644
--- a/gu/network-settings.dtd
+++ b/gu/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!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.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/he/network-settings.dtd b/he/network-settings.dtd
index 148f6cf67..b053543df 100644
--- a/he/network-settings.dtd
+++ b/he/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,18 +69,14 @@
 <!ENTITY torPreferences.bridges "×?×©×¨×?×?">
 <!ENTITY torPreferences.bridgesDescription "×?×©×¨×?×? ×¢×?×?×¨×?×? ×?×? ×?×?×©×?×? ×?×?×©×? ×?×? ×¨×©×ª Tor ×?×?×§×?×?×?×ª ×?×?×? Tor ×?×¡×?×?. ×¢×? ×¡×?×? ×?×?×§×?×? ×©×?×ª×? × ×?×¦×? ×?×?, ×?×©×¨ ×?×?×? ×¢×©×?×? ×?×¢×?×?×? ×?×¦×?×¨×? ×?×?×?×? ×?×?×ª×¨ ×?×?×?×? ×?×?×¨.">
 <!ENTITY torPreferences.useBridge "×?×©×ª×?×© ×?×?×©×¨">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "×?×§×© ×?×©×¨ ×?×?×©&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "×¡Ö·×¤Ö¼Öµ×§ ×?×©×¨">
 <!ENTITY torPreferences.advanced "×?×ª×§×?×?">
 <!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.requestBridgeDialogSolvePrompt "×¤×ª×?×¨ ×?×ª ×?Ö¾CAPTCHA ×?×?×? ×?×?×§×© ×?×©×¨.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "×?×¤×ª×¨×?×? ×?×?× ×? × ×?×?×?. ×?× ×? × ×¡×? ×©×?×?.">
 <!ENTITY torPreferences.viewTorLogs "×?×¦×? ×?×ª ×?×?×?× ×? Tor.">
 <!ENTITY torPreferences.viewLogs "×?×¦×? ×?×?×?× ×?×?&amp;#x2026;">
diff --git a/hi/network-settings.dtd b/hi/network-settings.dtd
index 6ef9422e0..8696c9491 100644
--- a/hi/network-settings.dtd
+++ b/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 "à¤ªà¥?à¤°à¥?à¤?à¥?à¤¸à¥? à¤ªà¥?à¤°à¤?à¤¾à¤°">
 <!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,18 +69,14 @@
 <!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;">
diff --git a/hr/network-settings.dtd b/hr/network-settings.dtd
index 5a5dcf90b..f1ab21ecf 100644
--- a/hr/network-settings.dtd
+++ b/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.port "Port">
+<!ENTITY torsettings.useProxy.username "KorisniÄ?ko ime">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd
index 487fd657d..3b77a306a 100644
--- a/hu/network-settings.dtd
+++ b/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 "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.port "Port">
+<!ENTITY torsettings.useProxy.username "FelhasznÃ¡lÃ³nÃ©v">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/hy/network-settings.dtd b/hy/network-settings.dtd
index 958b4c460..039ad1ddf 100644
--- a/hy/network-settings.dtd
+++ b/hy/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/id/network-settings.dtd b/id/network-settings.dtd
index 5fefae6a9..353a66caa 100644
--- a/id/network-settings.dtd
+++ b/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 "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.password "Kata sandi:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/is/network-settings.dtd b/is/network-settings.dtd
index 300510009..0b1c4082c 100644
--- a/is/network-settings.dtd
+++ b/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.port "GÃ¡tt">
+<!ENTITY torsettings.useProxy.username "Notandanafn">
+<!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Ãº">
@@ -75,18 +69,14 @@
 <!ENTITY torPreferences.bridges "BrÃ½r">
 <!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Ãº">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "BiÃ°ja um nÃ½ja brÃº&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Ã?tvega brÃº">
 <!ENTITY torPreferences.advanced "Ã?tarlegra">
 <!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Ãº">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Tengist BridgeDB. BÃddu aÃ°eins.">
-<!-- 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 "SkoÃ°a atvikaskrÃ¡r Tor.">
 <!ENTITY torPreferences.viewLogs "SkoÃ°a atvikaskrÃ¡r&amp;#x2026;">
diff --git a/it/network-settings.dtd b/it/network-settings.dtd
index eccf9b263..1c2bed6b7 100644
--- a/it/network-settings.dtd
+++ b/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 "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.password "Password:">
+<!ENTITY torsettings.useProxy.port "Porta">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd
index 3eb98a7f6..8560d67b4 100644
--- a/ja/network-settings.dtd
+++ b/ja/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 "ä½?æ??">
 <!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,18 +69,14 @@
 <!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;">
diff --git a/ka/network-settings.dtd b/ka/network-settings.dtd
index b0612a4ad..fc28f441e 100644
--- a/ka/network-settings.dtd
+++ b/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,18 +69,14 @@
 <!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;">
diff --git a/kab/network-settings.dtd b/kab/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/kab/network-settings.dtd
+++ b/kab/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/kk/network-settings.dtd b/kk/network-settings.dtd
index 832326930..db23ec84d 100644
--- a/kk/network-settings.dtd
+++ b/kk/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "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.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,18 +69,14 @@
 <!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;">
diff --git a/km/network-settings.dtd b/km/network-settings.dtd
index ff360289b..51837873d 100644
--- a/km/network-settings.dtd
+++ b/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,18 +69,14 @@
 <!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;">
diff --git a/kn/network-settings.dtd b/kn/network-settings.dtd
index d31b5c1b3..4424b9194 100644
--- a/kn/network-settings.dtd
+++ b/kn/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "à²?à³?à²ªà³?à²¤à²ªà²¦:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/ko/network-settings.dtd b/ko/network-settings.dtd
index fbb93cf83..ec4adc4b2 100644
--- a/ko/network-settings.dtd
+++ b/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 "í??ë¡?ì?? ì¢?ë¥?">
 <!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 "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,18 +69,14 @@
 <!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;">
diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index 3619ee2ac..878acbf3e 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -26,24 +26,18 @@
 <!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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "pasirinkite Ä¯galiotojo serverio tipÄ?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresas:">
+<!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.port "Prievadas">
+<!ENTITY torsettings.useProxy.username "Naudotojo vardas">
+<!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.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Mano Å¡alyje Tor yra cenzÅ«ruojamas">
 <!ENTITY torsettings.useBridges.default "Pasirinkite Ä¯taisytÄ?jÄ¯ tinklÅ³ tiltÄ?">
 <!ENTITY torsettings.useBridges.default.placeholder "pasirinkite tinklÅ³ tiltÄ?">
@@ -75,18 +69,14 @@
 <!ENTITY torPreferences.bridges "TinklÅ³ tiltai">
 <!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Ä?">
-<!-- torlauncher.request_a_new_bridge -->
 <!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 "SukonfigÅ«ruokite kaip Tor narÅ¡yklÄ? jungsis prie interneto.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Kableliais atskirtos reikÅ¡mÄ?s">
 <!ENTITY torPreferences.requestBridgeDialogTitle "UÅ¾klausti tinklÅ³ tiltÄ?â?¦">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Susisiekiama su BridgeDB. Palaukite.">
-<!-- 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 "Å½iÅ«rÄ?ti Tor Å¾urnalÄ?.">
 <!ENTITY torPreferences.viewLogs "Å½iÅ«rÄ?ti Å¾urnalÄ?&amp;#x2026;">
diff --git a/lv/network-settings.dtd b/lv/network-settings.dtd
index c7feeb9cf..85bef23d9 100644
--- a/lv/network-settings.dtd
+++ b/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.port "Ports">
+<!ENTITY torsettings.useProxy.username "LietotÄ?jvÄ?rds">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/mk/network-settings.dtd b/mk/network-settings.dtd
index 70becabb6..4e9a19846 100644
--- a/mk/network-settings.dtd
+++ b/mk/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 "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,18 +69,14 @@
 <!ENTITY torPreferences.bridges "Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸">
 <!ENTITY torPreferences.bridgesDescription "Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ð¸ Ð¿Ð¾Ð¼Ð°Ð³Ð°Ð°Ñ? Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ð°Ð¿Ð¸Ñ?Ðµ Ð½Ð° Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð° Ð½Ð° Ð¼ÐµÑ?Ñ?Ð° ÐºÐ°Ð´Ðµ Tor Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½. Ð?Ð°Ð²Ð¸Ñ?Ð½Ð¾ Ð¾Ð´ Ñ?Ð¾Ð° ÐºÐ°Ð´Ðµ Ñ?Ñ?Ðµ, ÐµÐ´ÐµÐ½ Ð¼Ð¾Ñ?Ñ? Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ð°Ð±Ð¾Ñ?Ð¸ Ð¿Ð¾Ð´Ð¾Ð±Ñ?Ð¾ Ð¾Ð´ Ð´Ñ?Ñ?Ð³.">
 <!ENTITY torPreferences.useBridge "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Ð?Ð¾Ð±Ð°Ñ?Ð°Ñ? Ð?Ð¾Ð² Ð¼Ð¾Ñ?Ñ?&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Ð?Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ Ð¼Ð¾Ñ?Ñ?">
 <!ENTITY torPreferences.advanced "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð¾">
 <!ENTITY torPreferences.advancedDescription "Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ ÐºÐ°ÐºÐ¾ Tor Browser Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð° Ð½Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?.">
 <!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.requestBridgeDialogSolvePrompt "Ð ÐµÑ?ÐµÑ?Ðµ Ñ?Ð° Ð?Ð?Ð?Ð?Ð§Ð?Ð¢Ð? Ð·Ð° Ð´Ð° Ð¿Ð¾Ð±Ð°Ñ?Ð°Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð ÐµÑ?ÐµÐ½Ð¸ÐµÑ?Ð¾ Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾. Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¾Ð±Ð¸Ð´ÐµÑ?Ðµ Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ð¾.">
 <!ENTITY torPreferences.viewTorLogs "Ð?Ð¸Ð´Ð¸ Ð³Ð¸ Tor Ð»Ð¾Ð³Ð¾Ð²Ð¸Ñ?Ðµ.">
 <!ENTITY torPreferences.viewLogs "Ð?Ð¸Ð´Ð¸ Ð»Ð¾Ð³Ð¾Ð²Ð¸&amp;#x2026;">
diff --git a/ml/network-settings.dtd b/ml/network-settings.dtd
index de2a7aeca..180a6b189 100644
--- a/ml/network-settings.dtd
+++ b/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 "à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´? ">
@@ -75,18 +69,14 @@
 <!ENTITY torPreferences.bridges "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾  ">
 <!ENTITY torPreferences.bridgesDescription "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?àµ?àµ¼ à´¤à´?à´?àµ?à´?à´¿à´?àµ?à´?àµ?à´³àµ?à´³ à´¸àµ?à´¥à´²à´?àµ?à´?à´³à´¿àµ½ à´?àµ?àµ¼ à´¨àµ?à´±àµ?à´±àµ¼à´?àµ? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?à´¾àµ» à´¸à´¹à´¾à´¯à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ? . à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´®à´±àµ?à´±àµ?à´±àµ?à´¨àµ?à´¨à´¿à´¨àµ?à´?àµ?à´?à´¾àµ¾ à´¨à´¨àµ?à´¨à´¾à´¯à´¿ à´ªàµ?à´°àµ?à´µà´°àµ?à´¤à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤àµ? à´¨à´¿à´?àµ?à´?àµ¾ à´?à´µà´¿à´?àµ?à´¯à´¾à´£àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ? à´?à´¶àµ?à´°à´¯à´¿à´?àµ?à´?à´¿à´°à´¿à´?àµ?à´?àµ?à´? .">
 <!ENTITY torPreferences.useBridge "à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ?à´?  ">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "à´?à´°àµ? à´ªàµ?à´¤à´¿à´¯ à´¬àµ?à´°à´¿à´¡àµ?à´?à´¿à´¨àµ? à´?àµ?à´¦à´¿à´?àµ?à´?àµ?à´? &amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¨à´²àµ?â??à´?àµ?à´?">
 <!ENTITY torPreferences.advanced "à´ªàµ?à´°àµ?à´¾à´?à´®à´¿à´?àµ?à´?">
 <!ENTITY torPreferences.advancedDescription "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´?à´?àµ?à´?à´¨àµ?à´¯à´¾à´£àµ? à´?à´¨àµ?à´±àµ¼à´¨àµ?à´±àµ?à´±à´¿à´²àµ?à´?àµ?à´?àµ? à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?àµ?à´¨àµ?à´¨à´¤àµ? à´?à´¨àµ?à´¨àµ? à´?àµ?àµºà´«à´¿à´?àµ¼ à´?àµ?à´¯àµ?à´¯àµ?à´? .">
 <!ENTITY torPreferences.firewallPortsPlaceholder "à´?àµ?à´® à´µàµ?à´°àµ?à´¤à´¿à´°à´¿à´?àµ?à´?à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´µà´¾àµ½à´¯àµ?">
 <!ENTITY torPreferences.requestBridgeDialogTitle "à´¬àµ?à´°à´¿à´¡àµ?à´?à´¿à´¨àµ? à´?àµ?à´¦à´¿à´?àµ?à´?àµ?à´? ">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¡à´¿ à´¬à´¿à´¯àµ? à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?àµ?à´¨àµ?à´¨àµ? , à´¦à´¯à´µà´¾à´¯à´¿ à´?à´¾à´¤àµ?à´¤à´¿à´°à´¿à´?àµ?à´?àµ?à´? .">
-<!-- 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 "à´?àµ?àµ¼ à´²àµ?à´?àµ?à´¸àµ? à´?à´¾à´£àµ?à´? .">
 <!ENTITY torPreferences.viewLogs "à´²àµ?à´?àµ?à´¸àµ? à´?à´¾à´£àµ?à´? &amp;#x2026;">
diff --git a/mr/network-settings.dtd b/mr/network-settings.dtd
index e372640d2..409ed224d 100644
--- a/mr/network-settings.dtd
+++ b/mr/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/ms_MY/network-settings.dtd b/ms_MY/network-settings.dtd
index 9c6299eea..92d3ea942 100644
--- a/ms_MY/network-settings.dtd
+++ b/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.password "Kata Laluan:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/my/network-settings.dtd b/my/network-settings.dtd
index e461e30c6..fe6c103be 100644
--- a/my/network-settings.dtd
+++ b/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 "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.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 "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,18 +69,14 @@
 <!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;">
diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd
index a6c10b27e..04cffb2e5 100644
--- a/nb/network-settings.dtd
+++ b/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 "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.port "Port">
+<!ENTITY torsettings.useProxy.username "Brukernavn">
+<!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">
@@ -75,18 +69,14 @@
 <!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 "Se Tor-loggene.">
 <!ENTITY torPreferences.viewLogs "View Logs&amp;#x2026;">
diff --git a/ne/network-settings.dtd b/ne/network-settings.dtd
index 57042065a..12812a4f0 100644
--- a/ne/network-settings.dtd
+++ b/ne/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd
index b930b5c95..bc3d87099 100644
--- a/nl/network-settings.dtd
+++ b/nl/network-settings.dtd
@@ -26,24 +26,18 @@
 <!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 "Proxy type">
 <!ENTITY torsettings.useProxy.type.placeholder "selecteer een proxytype">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adres:">
+<!ENTITY torsettings.useProxy.address "Adres 2">
 <!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.port "Poort">
+<!ENTITY torsettings.useProxy.username "Gebruikersnaam">
+<!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.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "Tor is in mijn land gecensureerd.">
 <!ENTITY torsettings.useBridges.default "Een ingebouwde bridge selecteren">
 <!ENTITY torsettings.useBridges.default.placeholder "selecteer een bridge">
@@ -75,18 +69,14 @@
 <!ENTITY torPreferences.bridges "Bridges">
 <!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">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Een nieuwe bridge aanvragen&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Een bridge aanbieden">
 <!ENTITY torPreferences.advanced "Geavanceerd">
 <!ENTITY torPreferences.advancedDescription "Configureren hoe Tor Browser verbinding maakt met het internet.">
 <!ENTITY torPreferences.firewallPortsPlaceholder "Kommagescheiden waarden">
 <!ENTITY torPreferences.requestBridgeDialogTitle "Een bridge aanvragen">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contact maken met BridgeDB. Even geduld.">
-<!-- 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 "De Tor-logboeken weergeven">
 <!ENTITY torPreferences.viewLogs "Logboeken weergeven&amp;#x2026;">
diff --git a/nl_BE/network-settings.dtd b/nl_BE/network-settings.dtd
index d6ec3f7dc..41d63c39d 100644
--- a/nl_BE/network-settings.dtd
+++ b/nl_BE/network-settings.dtd
@@ -26,24 +26,18 @@
 <!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.port "Poort">
+<!ENTITY torsettings.useProxy.username "Gebruikersnaam">
+<!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.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">
@@ -76,18 +70,14 @@ 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;">
diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd
index d94e449d6..ceef0a5cc 100644
--- a/nn/network-settings.dtd
+++ b/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.port "Port">
+<!ENTITY torsettings.useProxy.username "Brukarnamn">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/oc/network-settings.dtd b/oc/network-settings.dtd
index da2e5c85d..6ce1579ce 100644
--- a/oc/network-settings.dtd
+++ b/oc/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Senhal">
 <!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.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,18 +69,14 @@
 <!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;">
diff --git a/or/network-settings.dtd b/or/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/or/network-settings.dtd
+++ b/or/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/pa/network-settings.dtd b/pa/network-settings.dtd
index 17f12d890..9537f7e1f 100644
--- a/pa/network-settings.dtd
+++ b/pa/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 "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "à¨¯à©?à©?à¨°-à¨¨à¨¾à¨?:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "à¨ªà¨¾à¨¸à¨µà¨°à¨¡:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd
index e8c508d75..37133aa35 100644
--- a/pl/network-settings.dtd
+++ b/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 "Typ Proxy">
 <!ENTITY torsettings.useProxy.type.placeholder "wybierz typ proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adres:">
+<!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.port "Port">
+<!ENTITY torsettings.useProxy.username "UÅ¼ytkownik">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index 4cf2969f9..971ae963b 100644
--- a/pt_BR/network-settings.dtd
+++ b/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 "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 "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.port "Porta">
+<!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">
@@ -75,18 +69,14 @@
 <!ENTITY torPreferences.bridges "Pontes">
 <!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">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Solicitar uma nova ponte&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Fornecer uma ponte">
 <!ENTITY torPreferences.advanced "AvanÃ§ado">
 <!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">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Entrando em contato com o BridgeDB. Por favor, espere.">
-<!-- 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 "Veja os logs do Tor.">
 <!ENTITY torPreferences.viewLogs "Ver Logs&amp;#x2026;">
diff --git a/pt_PT/network-settings.dtd b/pt_PT/network-settings.dtd
index ba3cedd0d..baa23ba9d 100644
--- a/pt_PT/network-settings.dtd
+++ b/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 "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.password "Palavra-passe:">
+<!ENTITY torsettings.useProxy.port "Porta">
+<!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">
@@ -75,18 +69,14 @@
 <!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;">
diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd
index 602aa09d5..320b9b94a 100644
--- a/ro/network-settings.dtd
+++ b/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 "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.port "Port">
+<!ENTITY torsettings.useProxy.username "Nume utilizator">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd
index 112aa0973..4cc49f69d 100644
--- a/ru/network-settings.dtd
+++ b/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 "Ð?Ð´Ñ?ÐµÑ?">
 <!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,18 +69,14 @@
 <!ENTITY torPreferences.bridges "Ð?Ð¾Ñ?Ñ?Ñ?">
 <!ENTITY torPreferences.bridgesDescription "Ð?Ð¾Ñ?Ñ?Ñ? Ð¿Ð¾Ð¼Ð¾Ð³Ð°Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ðº Ñ?ÐµÑ?Ð¸ Tor Ð² Ð¼ÐµÑ?Ñ?Ð°Ñ?, Ð³Ð´Ðµ Ð¾Ð½ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½. Ð? Ð·Ð°Ð²Ð¸Ñ?Ð¸Ð¼Ð¾Ñ?Ñ?Ð¸ Ð¾Ñ? Ð¼ÐµÑ?Ñ?Ð°, Ð³Ð´Ðµ Ð²Ñ? Ð½Ð°Ñ?Ð¾Ð´Ð¸Ñ?ÐµÑ?Ñ?, Ð¾Ð´Ð¸Ð½ Ð¼Ð¾Ñ?Ñ? Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð»Ñ?Ñ?Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¾Ð³Ð¾.">
 <!ENTITY torPreferences.useBridge "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "Ð?Ð°Ð¿Ñ?Ð¾Ñ? Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¼Ð¾Ñ?Ñ?Ð°&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "Ð?Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?">
 <!ENTITY torPreferences.advanced "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾">
 <!ENTITY torPreferences.advancedDescription "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Tor Browser Ðº Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ?.">
 <!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.requestBridgeDialogSolvePrompt "Ð ÐµÑ?Ð¸Ñ?Ðµ CAPTCHA Ð´Ð»Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð° Ð¼Ð¾Ñ?Ñ?Ð°.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ð ÐµÑ?ÐµÐ½Ð¸Ðµ Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ñ?Ð¼. Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ ÐµÑ?Ðµ Ñ?Ð°Ð·.">
 <!ENTITY torPreferences.viewTorLogs "Ð?Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð¾Ð² Tor.">
 <!ENTITY torPreferences.viewLogs "Ð?Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð¾Ð²&amp;#x2026;">
diff --git a/si_LK/network-settings.dtd b/si_LK/network-settings.dtd
index bbc63226e..d9c3f2339 100644
--- a/si_LK/network-settings.dtd
+++ b/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,18 +69,14 @@
 <!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;">
diff --git a/sk/network-settings.dtd b/sk/network-settings.dtd
index f73bc29f3..32c7e0c90 100644
--- a/sk/network-settings.dtd
+++ b/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 "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.port "Port">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/sl/network-settings.dtd b/sl/network-settings.dtd
index d3119fdcf..52fab8134 100644
--- a/sl/network-settings.dtd
+++ b/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.password "Geslo:">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/son/network-settings.dtd b/son/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/son/network-settings.dtd
+++ b/son/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/sq/network-settings.dtd b/sq/network-settings.dtd
index e5ca0fc16..4a059ea71 100644
--- a/sq/network-settings.dtd
+++ b/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,18 +69,14 @@
 <!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;">
diff --git a/sr/network-settings.dtd b/sr/network-settings.dtd
index 8c46da87e..1a21a609d 100644
--- a/sr/network-settings.dtd
+++ b/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.password "Lozinka:">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index 09616d1c2..c4ccf7b86 100644
--- a/sv/network-settings.dtd
+++ b/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 "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.port "Port">
+<!ENTITY torsettings.useProxy.username "AnvÃ¤ndarnamn">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/sw/network-settings.dtd b/sw/network-settings.dtd
index 879715c34..306747ac0 100644
--- a/sw/network-settings.dtd
+++ b/sw/network-settings.dtd
@@ -26,24 +26,19 @@
 <!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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!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.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!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.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,18 +70,14 @@
 <!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;">
diff --git a/ta/network-settings.dtd b/ta/network-settings.dtd
index 544797f59..b79991b60 100644
--- a/ta/network-settings.dtd
+++ b/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 "à®®à¯?à®?à®µà®°à®¿">
 <!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.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 à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®?à®³à¯?">
@@ -76,18 +70,14 @@
 <!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;">
diff --git a/te/network-settings.dtd b/te/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/te/network-settings.dtd
+++ b/te/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 "Proxy Type">
 <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "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 "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/th/network-settings.dtd b/th/network-settings.dtd
index e4fa0b1b1..12d1662e9 100644
--- a/th/network-settings.dtd
+++ b/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,18 +69,14 @@
 <!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;">
diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd
index a0179c496..4e811d2b7 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -26,24 +26,18 @@
 <!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 "Proxy 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 "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.username "KullanÄ±cÄ± AdÄ±:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Parola:">
+<!ENTITY torsettings.useProxy.port "KapÄ± No">
+<!ENTITY torsettings.useProxy.username "KullanÄ±cÄ± adÄ±">
+<!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.firewall.allowedPorts "Allowed Ports">
 <!ENTITY torsettings.useBridges.checkbox "BulunduÄ?um Ã¼lkede Tor aÄ?Ä± engelleniyor">
 <!ENTITY torsettings.useBridges.default "HazÄ±r KÃ¶prÃ¼lerden SeÃ§in">
 <!ENTITY torsettings.useBridges.default.placeholder "bir kÃ¶prÃ¼ seÃ§in">
@@ -75,18 +69,14 @@
 <!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;">
diff --git a/uk/network-settings.dtd b/uk/network-settings.dtd
index e7a986294..42c4bba28 100644
--- a/uk/network-settings.dtd
+++ b/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 "Ð¢Ð¸Ð¿ Ð¿Ñ?Ð¾ÐºÑ?Ñ?">
 <!ENTITY torsettings.useProxy.type.placeholder "Ð¾Ð±ÐµÑ?Ñ?Ñ?Ñ? Ñ?Ð¸Ð¿ Ð¿Ñ?Ð¾ÐºÑ?Ñ?">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Ð?Ð´Ñ?ÐµÑ?Ð°:">
+<!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 "Ð¢Ð¾Ñ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð² Ð¼Ð¾Ñ?Ð¹ ÐºÑ?Ð°Ñ?Ð½Ñ?">
 <!ENTITY torsettings.useBridges.default "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð²Ð±Ñ?Ð´Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð¼Ñ?Ñ?Ñ?">
 <!ENTITY torsettings.useBridges.default.placeholder "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð¼Ñ?Ñ?Ñ?">
@@ -75,18 +69,14 @@
 <!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;">
diff --git a/ur/network-settings.dtd b/ur/network-settings.dtd
index 7b763244e..f22dc3f5b 100644
--- a/ur/network-settings.dtd
+++ b/ur/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 "Proxy Type:">
+<!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.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 "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed 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,18 +69,14 @@
 <!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;">
diff --git a/uz/network-settings.dtd b/uz/network-settings.dtd
index aaae5c131..6750724ee 100644
--- a/uz/network-settings.dtd
+++ b/uz/network-settings.dtd
@@ -26,24 +26,18 @@
 <!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.port "Port">
+<!ENTITY torsettings.useProxy.username "Foydalanuvchi nomi">
+<!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.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,18 +69,14 @@
 <!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;">
diff --git a/vi/network-settings.dtd b/vi/network-settings.dtd
index 1910e2aa7..09ff182b9 100644
--- a/vi/network-settings.dtd
+++ b/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.port "Cá»?ng">
+<!ENTITY torsettings.useProxy.username "TÃªn Ä?Ä?ng nháºp">
+<!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,18 +69,14 @@
 <!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;">
diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd
index 203a3a286..8f8a16954 100644
--- a/zh_CN/network-settings.dtd
+++ b/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 "å?°å??">
 <!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,18 +69,14 @@
 <!ENTITY torPreferences.bridges "ç½?æ¡¥">
 <!ENTITY torPreferences.bridgesDescription "ç½?æ¡¥å¸®å?©ä½ å?¨ Tor è¢«é?»å¡?ç??å?°æ?¹è¿?æ?¥ Tor ç½?ç»?ã??å??å?³äº?ä½ å?¨å?ªé??ï¼?æ??ç??ç½?æ¡¥ç??æ??æ??å?¯è?½æ¯?å?¦ä¸?ä¸ªè¦?å¥½ã??">
 <!ENTITY torPreferences.useBridge "ä½¿ç?¨ç½?æ¡¥">
-<!-- torlauncher.request_a_new_bridge -->
 <!ENTITY torPreferences.requestNewBridge "æ£å?¨è¯·æ±?æ?°ç½?æ¡¥&amp;#x2026;">
 <!ENTITY torPreferences.provideBridge "æ·»å? ç½?æ¡¥">
 <!ENTITY torPreferences.advanced "é«?çº§">
 <!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.requestBridgeDialogSolvePrompt "è¯·è¾?å?¥éª?è¯?ç ?ä»¥è?·å??ç½?æ¡¥ã??">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "ç»?æ??å¹¶ä¸?æ£ç¡®ï¼?è¯·é??è¯?ã??">
 <!ENTITY torPreferences.viewTorLogs "æ?¥ç?? Tor æ?¥å¿?ã??">
 <!ENTITY torPreferences.viewLogs "æ?¥ç??æ?¥å¿?&amp;#x2026;">
diff --git a/zh_HK/network-settings.dtd b/zh_HK/network-settings.dtd
index 4e4e3591a..9b808de8f 100644
--- a/zh_HK/network-settings.dtd
+++ b/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.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,18 +69,14 @@
 <!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;">
diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd
index 01f2e2984..729db6cc8 100644
--- a/zh_TW/network-settings.dtd
+++ b/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.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,18 +69,14 @@
 <!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;">

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

Prev by Author: [tor-commits] [translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
Next by Author: [tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
Previous by thread: [tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
Next by thread: [tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
Index(es):
- Author
- Thread