[tbb-commits] [tor-launcher/master] Update translations

Wed Oct 21 08:00:46 UTC 2015

commit 7175e912d8d9d1ed0ef51dd35d845e613219b572
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Oct 21 08:00:02 2015 +0000

    Update translations
---
 src/chrome/locale/ach/network-settings.dtd         |    4 +
 src/chrome/locale/ady/network-settings.dtd         |    4 +
 src/chrome/locale/af/network-settings.dtd          |    4 +
 src/chrome/locale/ak/network-settings.dtd          |    4 +
 src/chrome/locale/am-ET/torlauncher.properties     |    8 +-
 src/chrome/locale/am/network-settings.dtd          |    4 +
 src/chrome/locale/ar/network-settings.dtd          |   12 ++-
 src/chrome/locale/arn/network-settings.dtd         |    4 +
 src/chrome/locale/ast/network-settings.dtd         |    4 +
 src/chrome/locale/az/network-settings.dtd          |    4 +
 src/chrome/locale/be/network-settings.dtd          |    4 +
 src/chrome/locale/bg/network-settings.dtd          |    4 +
 src/chrome/locale/bn-IN/network-settings.dtd       |    4 +
 src/chrome/locale/bn/network-settings.dtd          |    4 +
 src/chrome/locale/bo/network-settings.dtd          |    4 +
 src/chrome/locale/br/network-settings.dtd          |    4 +
 src/chrome/locale/bs/network-settings.dtd          |    4 +
 src/chrome/locale/ca/network-settings.dtd          |    4 +
 src/chrome/locale/cs/network-settings.dtd          |    8 +-
 src/chrome/locale/csb/network-settings.dtd         |    4 +
 src/chrome/locale/cv/network-settings.dtd          |    4 +
 src/chrome/locale/cy/network-settings.dtd          |    4 +
 src/chrome/locale/da/network-settings.dtd          |    4 +
 src/chrome/locale/de/network-settings.dtd          |    6 +-
 src/chrome/locale/dz/network-settings.dtd          |    4 +
 src/chrome/locale/el/network-settings.dtd          |   16 ++--
 src/chrome/locale/en-GB/network-settings.dtd       |    4 +
 src/chrome/locale/eo/network-settings.dtd          |    4 +
 src/chrome/locale/es-AR/network-settings.dtd       |    4 +
 src/chrome/locale/es-CL/network-settings.dtd       |    4 +
 src/chrome/locale/es-CO/network-settings.dtd       |    4 +
 src/chrome/locale/es-MX/network-settings.dtd       |    6 +-
 src/chrome/locale/es/network-settings.dtd          |    4 +
 src/chrome/locale/et/network-settings.dtd          |    4 +
 src/chrome/locale/eu/network-settings.dtd          |    4 +
 src/chrome/locale/fa/network-settings.dtd          |    4 +
 src/chrome/locale/fi/network-settings.dtd          |    4 +
 src/chrome/locale/fil/network-settings.dtd         |    4 +
 src/chrome/locale/fo/network-settings.dtd          |    4 +
 src/chrome/locale/fr-CA/network-settings.dtd       |    4 +
 src/chrome/locale/fr/network-settings.dtd          |   28 ++++---
 src/chrome/locale/fr/torlauncher.properties        |    6 +-
 src/chrome/locale/fur/network-settings.dtd         |    4 +
 src/chrome/locale/fy/network-settings.dtd          |    4 +
 src/chrome/locale/ga/network-settings.dtd          |    4 +
 src/chrome/locale/gl/network-settings.dtd          |    4 +
 src/chrome/locale/gu-IN/network-settings.dtd       |    4 +
 src/chrome/locale/gu/network-settings.dtd          |    4 +
 src/chrome/locale/gun/network-settings.dtd         |    4 +
 src/chrome/locale/ha/network-settings.dtd          |    4 +
 src/chrome/locale/he/network-settings.dtd          |   78 +++++++++++---------
 src/chrome/locale/he/progress.dtd                  |    2 +-
 src/chrome/locale/he/torlauncher.properties        |   74 +++++++++----------
 src/chrome/locale/hi/network-settings.dtd          |    4 +
 src/chrome/locale/hr-HR/network-settings.dtd       |    4 +
 src/chrome/locale/hr/network-settings.dtd          |    4 +
 src/chrome/locale/ht/network-settings.dtd          |    4 +
 src/chrome/locale/hu/network-settings.dtd          |    4 +
 src/chrome/locale/hu/torlauncher.properties        |    2 +-
 src/chrome/locale/hy-AM/network-settings.dtd       |    4 +
 src/chrome/locale/hy/network-settings.dtd          |    4 +
 src/chrome/locale/ia/network-settings.dtd          |    4 +
 src/chrome/locale/id/network-settings.dtd          |    4 +
 src/chrome/locale/is/network-settings.dtd          |    4 +
 src/chrome/locale/it/network-settings.dtd          |    4 +
 src/chrome/locale/ja/network-settings.dtd          |    4 +
 src/chrome/locale/jv/network-settings.dtd          |    4 +
 src/chrome/locale/ka/network-settings.dtd          |    4 +
 src/chrome/locale/kk/network-settings.dtd          |    4 +
 src/chrome/locale/km/network-settings.dtd          |    4 +
 src/chrome/locale/kn/network-settings.dtd          |    4 +
 src/chrome/locale/ko-KR/network-settings.dtd       |    4 +
 src/chrome/locale/ko/network-settings.dtd          |    4 +
 src/chrome/locale/ku/network-settings.dtd          |    4 +
 src/chrome/locale/kw/network-settings.dtd          |    4 +
 src/chrome/locale/ky/network-settings.dtd          |    4 +
 src/chrome/locale/lb/network-settings.dtd          |   10 ++-
 src/chrome/locale/lb/torlauncher.properties        |    2 +-
 src/chrome/locale/lg/network-settings.dtd          |    4 +
 src/chrome/locale/ln/network-settings.dtd          |    4 +
 src/chrome/locale/lo/network-settings.dtd          |    4 +
 src/chrome/locale/lt/network-settings.dtd          |   12 ++-
 src/chrome/locale/lt/progress.dtd                  |    6 +-
 src/chrome/locale/lv/network-settings.dtd          |    4 +
 src/chrome/locale/mg/network-settings.dtd          |    4 +
 src/chrome/locale/mi/network-settings.dtd          |    4 +
 src/chrome/locale/mk/network-settings.dtd          |    4 +
 src/chrome/locale/ml/network-settings.dtd          |    4 +
 src/chrome/locale/mn/network-settings.dtd          |    4 +
 src/chrome/locale/mr/network-settings.dtd          |    4 +
 src/chrome/locale/ms-MY/network-settings.dtd       |    4 +
 src/chrome/locale/mt/network-settings.dtd          |    4 +
 src/chrome/locale/my/network-settings.dtd          |    4 +
 src/chrome/locale/my/progress.dtd                  |    2 +-
 src/chrome/locale/nah/network-settings.dtd         |    4 +
 src/chrome/locale/nap/network-settings.dtd         |    4 +
 src/chrome/locale/nb/network-settings.dtd          |    4 +
 src/chrome/locale/nds/network-settings.dtd         |    4 +
 src/chrome/locale/ne/network-settings.dtd          |    4 +
 src/chrome/locale/nl-BE/network-settings.dtd       |   54 +++++++-------
 src/chrome/locale/nl-BE/torlauncher.properties     |   22 +++---
 src/chrome/locale/nl/network-settings.dtd          |    4 +
 src/chrome/locale/nn/network-settings.dtd          |    4 +
 src/chrome/locale/nso/network-settings.dtd         |    4 +
 src/chrome/locale/oc/network-settings.dtd          |    4 +
 src/chrome/locale/or/network-settings.dtd          |    4 +
 src/chrome/locale/pa/network-settings.dtd          |    4 +
 src/chrome/locale/pap/network-settings.dtd         |    4 +
 src/chrome/locale/pl/network-settings.dtd          |    4 +
 src/chrome/locale/pms/network-settings.dtd         |    4 +
 src/chrome/locale/ps/network-settings.dtd          |    4 +
 src/chrome/locale/pt-BR/network-settings.dtd       |    4 +
 src/chrome/locale/pt/network-settings.dtd          |    8 +-
 src/chrome/locale/pt/torlauncher.properties        |    8 +-
 src/chrome/locale/ro/network-settings.dtd          |    4 +
 src/chrome/locale/ru/network-settings.dtd          |    4 +
 src/chrome/locale/ru at petr1708/network-settings.dtd |    4 +
 src/chrome/locale/sco/network-settings.dtd         |    4 +
 src/chrome/locale/si-LK/network-settings.dtd       |    4 +
 src/chrome/locale/sk-SK/network-settings.dtd       |    4 +
 src/chrome/locale/sk/network-settings.dtd          |    4 +
 src/chrome/locale/sl-SI/network-settings.dtd       |    4 +
 src/chrome/locale/sl/network-settings.dtd          |    4 +
 src/chrome/locale/sn/network-settings.dtd          |    4 +
 src/chrome/locale/so/network-settings.dtd          |    4 +
 src/chrome/locale/son/network-settings.dtd         |    4 +
 src/chrome/locale/sq-AL/torlauncher.properties     |    8 +-
 src/chrome/locale/sq/network-settings.dtd          |    4 +
 src/chrome/locale/sr/network-settings.dtd          |    4 +
 src/chrome/locale/sr at latin/network-settings.dtd    |    4 +
 src/chrome/locale/st/network-settings.dtd          |    4 +
 src/chrome/locale/su/network-settings.dtd          |    4 +
 src/chrome/locale/sv/network-settings.dtd          |    8 +-
 src/chrome/locale/sw/network-settings.dtd          |    4 +
 src/chrome/locale/szl/network-settings.dtd         |    4 +
 src/chrome/locale/ta/network-settings.dtd          |    4 +
 src/chrome/locale/te-IN/network-settings.dtd       |    6 +-
 src/chrome/locale/te/network-settings.dtd          |    4 +
 src/chrome/locale/tg/network-settings.dtd          |    4 +
 src/chrome/locale/th/network-settings.dtd          |    4 +
 src/chrome/locale/ti/network-settings.dtd          |    4 +
 src/chrome/locale/tk/network-settings.dtd          |    4 +
 src/chrome/locale/tr/network-settings.dtd          |   56 +++++++-------
 src/chrome/locale/tr/torlauncher.properties        |   10 +--
 src/chrome/locale/uk/network-settings.dtd          |    4 +
 src/chrome/locale/ur-PK/network-settings.dtd       |    8 +-
 src/chrome/locale/ur-PK/progress.dtd               |    9 ++-
 src/chrome/locale/ur-PK/torlauncher.properties     |    2 +-
 src/chrome/locale/ur/network-settings.dtd          |    4 +
 src/chrome/locale/uz/network-settings.dtd          |    4 +
 src/chrome/locale/ve/network-settings.dtd          |    4 +
 src/chrome/locale/vi/network-settings.dtd          |   10 ++-
 src/chrome/locale/vi/torlauncher.properties        |    2 +-
 src/chrome/locale/wa/network-settings.dtd          |    4 +
 src/chrome/locale/wo/network-settings.dtd          |    4 +
 src/chrome/locale/zh-CN/network-settings.dtd       |    4 +
 src/chrome/locale/zh-HK/network-settings.dtd       |    4 +
 src/chrome/locale/zh-TW/network-settings.dtd       |    4 +
 src/chrome/locale/zu/network-settings.dtd          |    4 +
 159 files changed, 795 insertions(+), 206 deletions(-)

diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ach/network-settings.dtd
+++ b/src/chrome/locale/ach/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ady/network-settings.dtd
+++ b/src/chrome/locale/ady/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/af/network-settings.dtd
+++ b/src/chrome/locale/af/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ak/network-settings.dtd
+++ b/src/chrome/locale/ak/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/am-ET/torlauncher.properties b/src/chrome/locale/am-ET/torlauncher.properties
index a2550db..02be756 100644
--- a/src/chrome/locale/am-ET/torlauncher.properties
+++ b/src/chrome/locale/am-ET/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,12 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
@@ -55,3 +58,4 @@ torlauncher.bootstrapWarning.identity=identity mismatch
 torlauncher.bootstrapWarning.timeout=connection timeout
 torlauncher.bootstrapWarning.noroute=no route to host
 torlauncher.bootstrapWarning.ioerror=read/write error
+torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/am/network-settings.dtd
+++ b/src/chrome/locale/am/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index 8b34b08..a581606 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -1,4 +1,8 @@
-<!ENTITY torsettings.dialog.title "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø´Ø¨ÙƒØ© Ø§Ù„Ø®Ø§ØµØ© Ø¨ØªÙˆØ±">
+<!ENTITY torsettings.dialog.title "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø´Ø¨ÙƒØ©">
+
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
 
 <!-- For "first run" wizard: -->
 
@@ -9,18 +13,18 @@
 
 <!ENTITY torSettings.firstQuestion "Ø£ÙŠ Ù…Ù…Ø§ ÙŠÙ„ÙŠ ÙŠØ¹ØªØ¨Ø± ÙˆØµÙ Ø§ÙØ¶Ù„ Ù„Ù…ÙˆÙ‚ÙÙƒØŸ">
 <!ENTITY torSettings.configurePrompt1 "Ø§ØªØµØ§Ù„ Ù‡Ø°Ø§ Ø§Ù„ØØ§Ø³Ø¨ Ø¨Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ù…ØØ¬ÙˆØ¨ Ø£Ùˆ Ù„Ù‡ Ø¨Ø±ÙˆÙƒØ³ÙŠ.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "Ø£ØØªØ§Ø¬ Ù„Ø¥Ø¹Ø¯Ø§Ø¯ Ø¬Ø³Ø± Ø£Ùˆ Ø¨Ø±ÙˆÙƒØ³ÙŠ Ù…ØÙ„ÙŠ.">
 <!ENTITY torSettings.configure "ØªÙƒÙˆÙŠÙ†">
 <!ENTITY torSettings.connectPrompt2 "Ø£ÙˆØ¯ Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¨Ø§Ø´Ø±Ø© Ø¥Ù„Ù‰ Ø´Ø¨ÙƒØ© ØªÙˆØ±.">
 <!ENTITY torSettings.connectPrompt3 "Ø³ÙŠØµÙ„Ø Ù‡Ø°Ø§ ÙÙŠ Ù…Ø¹Ø¸Ù… Ø§Ù„ØØ§Ù„Ø§Øª.">
 <!ENTITY torSettings.connect "Ø§ØªØµÙ„">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
+<!ENTITY torSettings.proxyPageTitle "Ø¥Ø¹Ø¯Ø§Ø¯ Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ Ø§Ù„Ù…ØÙ„Ù‘ÙŠ">
 <!ENTITY torSettings.proxyQuestion "Ù‡Ù„ ÙŠØØªØ§Ø¬ Ù‡Ø°Ø§ Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± Ù„Ø§Ø³ØªØ®Ø¯Ø§Ù… ÙˆÙƒÙŠÙ„ Ù…ØÙ„ÙŠ Ù„Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø¥Ù†ØªØ±Ù†ØªØŸ">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ø¥Ø°Ø§ ÙƒÙ†Øª ØºÙŠØ± Ù…ØªØ£ÙƒØ¯ Ù…Ù† ÙƒÙŠÙÙŠØ© Ø§Ù„Ø¥Ø¬Ø§Ø¨Ø© Ø¹Ù„Ù‰ Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¤Ø§Ù„ØŒ Ø£Ù†Ø¸Ø± Ø§Ù„Ù‰ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª ÙÙŠ Ù…ØªØµÙØ Ø¢Ø®Ø± Ù„Ù…Ø¹Ø±ÙØ© Ù…Ø§ Ø¥Ø°Ø§ ØªÙ…Øª ØªÙ‡ÙŠØ¦ØªØ© Ù„Ø§Ø³ØªØ®Ø¯Ø§Ù… ÙˆÙƒÙŠÙ„ Ù…ØÙ„ÙŠ.">
 <!ENTITY torSettings.enterProxy "Ø£Ø¯Ø®Ù„ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
+<!ENTITY torSettings.bridgePageTitle "Ø¥Ø¹Ø¯Ø§Ø¯ Ø¬Ø³ÙˆØ± ØªÙˆØ±.">
 <!ENTITY torSettings.bridgeQuestion "Ù‡Ù„ ÙŠÙ‚ÙˆÙ… Ù…Ù‚Ø¯Ù… Ø®Ø¯Ù…Ø© Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª (ISP) Ø§Ù„Ø°ÙŠ ØªØªØ¹Ø§Ù…Ù„ Ù…Ø¹Ù‡ Ø¨ØØ¬Ø¨ Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ø¨Ø´Ø¨ÙƒØ© Tor Ø£Ùˆ Ù…Ø±Ø§Ù‚Ø¨ØªÙ‡Ø§ Ø¨Ø·Ø±ÙŠÙ‚Ø© Ø£Ø®Ø±Ù‰ØŸ">
 <!ENTITY torSettings.bridgeHelp "Ø¥Ø°Ø§ Ù„Ù… ØªÙƒÙ† Ù…ØªØ£ÙƒØ¯Ø§ Ù…Ù† Ø¥Ø¬Ø§Ø¨Ø© Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¤Ø§Ù„ØŒ Ù‚Ù… Ø¨Ø§Ø®ØªÙŠØ§Ø± Ù„Ø§.   Ø¥Ø°Ø§ Ù‚Ù…Øª Ø¨Ø§Ø®ØªÙŠØ§Ø± Ù†Ø¹Ù…ØŒ ÙØ³ÙŠØ·Ù„Ø¨ Ù…Ù†Ùƒ ØªÙƒÙˆÙŠÙ† Ø¬Ø³ÙˆØ± Tor ÙˆØ§Ù„ØªÙŠ Ù‡ÙŠ Ù…Ù†Ø§ÙØ° ØªØ±ØÙŠÙ„ ØºÙŠØ± Ù…Ø¯Ø±Ø¬Ø© ØªØµØ¹Ø¨ Ø¹Ù…Ù„ÙŠØ© ØØ¸Ø± Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ø¨Ø´Ø¨ÙƒØ© Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø¬Ø³ÙˆØ± Ø§Ù„Ù…ØªÙˆÙØ±Ø© Ø£Ùˆ Ø§Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¬Ù…ÙˆØ¹Ø© Ù…Ø®ØµØµØ© Ù…Ù† Ø§Ù„Ø¬Ø³ÙˆØ±.">
diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/arn/network-settings.dtd
+++ b/src/chrome/locale/arn/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd
index 63cdbe1..fdbc39c 100644
--- a/src/chrome/locale/ast/network-settings.dtd
+++ b/src/chrome/locale/ast/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd
index a1c3dff..cd8cbcb 100644
--- a/src/chrome/locale/az/network-settings.dtd
+++ b/src/chrome/locale/az/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor ÅŸÉ™bÉ™kÉ™ paramertlÉ™ri">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Tor ÅŸÉ™bÉ™kÉ™sinÉ™ qoÅŸulmaq Ã¼Ã§Ã¼n, kompÃ¼terin intrenet baÄŸlantÄ±sÄ± haqqÄ±nda bÉ™zi mÉ™lumatlarÄ± vermÉ™lisiniz.">
diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd
index 8ded736..fe05a5c 100644
--- a/src/chrome/locale/be/network-settings.dtd
+++ b/src/chrome/locale/be/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ÐÐ°Ð»Ð°Ð´Ñ‹ ÑÐµÑ‚ÐºÑ– Ð¢Ð¾Ñ€">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "ÐŸÐµÑ€Ð°Ð´ Ñ‚Ñ‹Ð¼ ÑÐº Ð¿Ð°Ð´ÐºÐ»ÑŽÑ‡Ñ‹Ñ†Ñ†Ð° Ð´Ð° ÑÐµÑ‚ÐºÑ– Ð¢Ð¾Ñ€, Ð²Ð°Ð¼ Ñ‚Ñ€ÑÐ±Ð° Ð¿Ð°Ð´Ð°Ñ†ÑŒ Ð¸Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹ÑŽ Ð°Ð± Ð·Ð»ÑƒÑ‡ÑÐ½Ð½Ñ– Ð³ÑÑ‚Ð°Ð³Ð° ÐºÐ°Ð¿ÑƒÑ‚Ð°Ñ€Ð° Ð· Ñ–Ð½Ñ‚ÑÑ€Ð½ÑÑ‚Ð°Ð¼.">
diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd
index 4452961..5802488 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð½Ð° Tor Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "ÐŸÑ€ÐµÐ´Ð¸ Ð´Ð° ÑÐµ ÑÐ²ÑŠÑ€Ð¶ÐµÑ‚Ðµ ÐºÑŠÐ¼ Tor Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°, Ð’Ð¸Ðµ Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾ÑÐ½Ð¾ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ð²Ñ€ÑŠÐ·ÐºÐ°Ñ‚Ð° Ð½Ð° Ñ‚Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€">
diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/bn-IN/network-settings.dtd
+++ b/src/chrome/locale/bn-IN/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd
index b9de48e..8f2f987 100644
--- a/src/chrome/locale/bn/network-settings.dtd
+++ b/src/chrome/locale/bn/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/bo/network-settings.dtd
+++ b/src/chrome/locale/bo/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/br/network-settings.dtd
+++ b/src/chrome/locale/br/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd
index 523378e..3750fd2 100644
--- a/src/chrome/locale/bs/network-settings.dtd
+++ b/src/chrome/locale/bs/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd
index 32ecd67..78253a0 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ConfiguraciÃ³ de la Tor Network">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Abans de connectar-te a la xarxa Thor, necessites introduir informaciÃ³ sobre el ordinador que fas servir per la connexiÃ³ a internet.">
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index a48ba53..4829311 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "SÃÅ¥ovÃ© nastavenÃ TORu">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "NeÅ¾ se pÅ™ipojÃte s sÃti TORu je potÅ™eba poskytnout Ãºdaje o internetovÃ©m pÅ™ipojenÃ tohoto poÄÃtaÄe.">
@@ -15,12 +19,12 @@
 <!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve vÄ›tÅ¡inÄ› pÅ™ÃpadÅ¯.">
 <!ENTITY torSettings.connect "PÅ™ipojit">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
+<!ENTITY torSettings.proxyPageTitle "Konfigurace mÃstnÃ proxy">
 <!ENTITY torSettings.proxyQuestion "PotÅ™ebuje tento poÄÃtaÄ zapnutÃ lokÃ¡lnÃ proxy, aby se pÅ™ipojil k internetu?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Pokud nevÃte, jak odpovÄ›dÄ›t, podÃvejte se na nastavenÃ sÃtÄ› Internet v jinÃ©m prohlÃÅ¾eÄi, abyste zjistili, zda je nakonfigurovÃ¡n k pouÅ¾ÃvÃ¡nÃ proxy.">
 <!ENTITY torSettings.enterProxy "Zadejte nastavenÃ serveru proxy.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
+<!ENTITY torSettings.bridgePageTitle "Konfigurace Tor pÅ™emostÄ›nÃ">
 <!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje vÃ¡Å¡ poskytovatel internetovÃ©ho pÅ™ipojenÃ (ISP) spojenÃ se sÃtÃ TORu?">
 <!ENTITY torSettings.bridgeHelp "Pokud si nejste jistÃ jak odpovÄ›dÄ›t na tuto otÃ¡zku, zvolte No.  Pokud vyberete Ano, budete vyzvÃ¡ni k nastavenÃ MostÅ¯ TORu, coÅ¾ jsou pÅ™enaÅ¡eÄe neuvedenÃ© v seznamu, kterÃ© dÄ›lajÃ blokovÃ¡nÃ spojenÃ se sÃtÃ TORu sloÅ¾itÄ›jÅ¡Ã.">
 <!ENTITY torSettings.bridgeSettingsPrompt "MÅ¯Å¾ete pouÅ¾Ãt poskytnutou sadu sÃÅ¥ovÃ½ch mostÅ¯ nebo mÅ¯Å¾ete zÃskat a zadat vlastnÃ sadu.">
diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/csb/network-settings.dtd
+++ b/src/chrome/locale/csb/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd
index 9869ab4..866ddd6 100644
--- a/src/chrome/locale/cv/network-settings.dtd
+++ b/src/chrome/locale/cv/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd
index 1f39f08..7dfcd46 100644
--- a/src/chrome/locale/cy/network-settings.dtd
+++ b/src/chrome/locale/cy/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Gosodiadau Rhwydwaith Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Cyn cysylltu Ã¢ rhwydwaith Tor, mae angen i chi roi gwybodaeth am gysylltiad y cyfrifiadur hwn Ã¢'r rhyngrwyd.">
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index f9baa01..a59c8d6 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor netvÃ¦rksindstillinger">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Sprog">
+<!ENTITY torlauncher.localePicker.prompt "VÃ¦lg venligst et sprog.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "FÃ¸r du forbinder til Tor netvÃ¦rket, skal du indtaste information om denne computers Internetforbindelse.">
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index 22a4ef5..cf394a3 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor-Netzwerkeinstellungen">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Sprache">
+<!ENTITY torlauncher.localePicker.prompt "Bitte wÃ¤hlen Sie eine Sprache.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Bevor Sie sich zum Tor-Netzwerk verbinden kÃ¶nnen, mÃ¼ssen Sie Informationen Ã¼ber den Internetanschluss Ihres Rechners bereitstellen.">
@@ -18,7 +22,7 @@
 <!ENTITY torSettings.proxyPageTitle "Lokale Proxy-Konfiguration">
 <!ENTITY torSettings.proxyQuestion "BenÃ¶tigt dieser Rechner einen lokalen Proxy um auf das Internet zuzugreifen?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Wenn Sie unsicher sind, schauen Sie in den Interneteinstellungen in einem andern Browser nach, um zu erkennen ob ein lokaler Proxy konfiguriert ist.">
+<!ENTITY torSettings.proxyHelp "Wenn Sie unsicher sind, schauen Sie in den Interneteinstellungen in einem andern Browser nach, um zu sehen ob ein lokaler Proxy konfiguriert ist.">
 <!ENTITY torSettings.enterProxy "Proxy-Einstellungen eingeben.">
 <!ENTITY torSettings.bridgePageTitle "TorbrÃ¼cken-Konfiguration">
 <!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?">
diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/dz/network-settings.dtd
+++ b/src/chrome/locale/dz/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index 90753f1..64c7ccf 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î”Î¹ÎºÏ„ÏÎ¿Ï… ">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Î ÏÎ¹Î½ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor, Î¸Î± Ï‡ÏÎµÎ¹Î±ÏƒÏ„Î¿ÏÎ¼Îµ Î»Î¯Î³ÎµÏ‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Ï„Î¿ Ï€ÏŽÏ‚ ÏƒÏ…Î½Î´ÎÎµÏƒÏ„Îµ ÏƒÏ„Î¿ Internet.">
@@ -9,18 +13,18 @@
 
 <!ENTITY torSettings.firstQuestion "Î Î¿Î¹Î¿ Î±Ï€ÏŒ Ï„Î± Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï€ÎµÏÎ¹Î³ÏÎ¬Ï†ÎµÎ¹ ÎºÎ±Î»ÏÏ„ÎµÏÎ± Ï„Î·Î½ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ® ÏƒÎ±Ï‚;">
 <!ENTITY torSettings.configurePrompt1 "Î£ÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Internet Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® Î»Î¿Î³Î¿ÎºÏÎ¯Î½ÎµÏ„Î±Î¹ Î® Ï€ÏÎ¿ÏƒÎµÎ³Î³Î¯Î¶ÎµÏ„Î±Î¹">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "Î§ÏÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÏ‰ Ï„Î·Î½ Î³ÎÏ†Ï…ÏÎ± Î® Ï„Î¹Ï‚ Ï„Î¿Ï€Î¹ÎºÎÏ‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ proxy">
 <!ENTITY torSettings.configure "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· ">
 <!ENTITY torSettings.connectPrompt2 "Î˜Î± Î®Î¸ÎµÎ»Î± Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯ Î¬Î¼ÎµÏƒÎ± Î¼Îµ Ï„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor.">
 <!ENTITY torSettings.connectPrompt3 "Î‘Ï…Ï„ÏŒ Î¸Î± Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î®ÏƒÎµÎ¹ ÏƒÏ„Î¹Ï‚ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€ÎµÏÎ¹Ï€Ï„ÏŽÏƒÎµÎ¹Ï‚.">
 <!ENTITY torSettings.connect "Î£ÏÎ½Î´ÎµÏƒÎ·">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
+<!ENTITY torSettings.proxyPageTitle "Î¤Î¿Ï€Î¹ÎºÎ® Î´Î¹Î±Î¼ÏŒÏÏ†Ï‰ÏƒÎ· Proxy">
+<!ENTITY torSettings.proxyQuestion "ÎœÎ®Ï€Ï‰Ï‚ Î±Ï…Ï„ÏŒÏ‚ Î¿ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ ÎÎ½Î± Ï„Î¿Ï€Î¹ÎºÏŒ proxy Î³Î¹Î± Ï„Î·Î½ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÏ„Î¿ Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿;">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!ENTITY torSettings.proxyHelp "Î‘Î½ Î´ÎµÎ½ ÎµÎ¯ÏƒÏ„Îµ ÏƒÎ¯Î³Î¿Ï…ÏÎ¿Î¹ Ï€Ï‰Ï‚ Î½Î± Î±Ï€Î±Î½Ï„Î®ÏƒÎµÏ„Îµ ÏƒÎµ Î±Ï…Ï„Î®Î½ Ï„Î·Î½ ÎµÏÏŽÏ„Î·ÏƒÎ·, ÎºÎ¿Î¹Ï„Î¬Î¾Ï„Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Ï„Î¿Ï… Internet ÏƒÎµ ÎºÎ¬Ï€Î¿Î¹Î¿ Î¬Î»Î»Î¿ Ï€ÏÏŒÎ³ÏÎ±Î¼Î¼Î± Ï€ÎµÏÎ¹Î®Î³Î·ÏƒÎ·Ï‚ Î³Î¹Î± Î½Î± Î´ÎµÎ¯Ï„Îµ Î±Î½ ÎÏ‡ÎµÎ¹ ÏÏ…Î¸Î¼Î¹ÏƒÏ„ÎµÎ¯ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ ÎÎ½Î± Ï„Î¿Ï€Î¹ÎºÏŒ proxy.">
 <!ENTITY torSettings.enterProxy "Î•Î¹ÏƒÎ¬Î³Ï‰Î³Î· Ï„Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Î¼ÎµÏƒÎ¿Î»Î¬Î²Î·ÏƒÎ·Ï‚.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
+<!ENTITY torSettings.bridgePageTitle "Î”Î¹Î±Î¼ÏŒÏÏ†Ï‰ÏƒÎ· Î“ÎµÏ†Ï…ÏÏŽÎ½ Tor">
 <!ENTITY torSettings.bridgeQuestion "Î“Î½Ï‰ÏÎ¯Î¶ÎµÏ„Îµ Î±Î½ Î¿ Ï€Î¬ÏÎ¿Ï‡Î¿Ï‚ (ISP) ÏƒÎ±Ï‚ Î¼Ï€Î»Î¿ÎºÎ¬ÏÎµÎ¹ Î® Î¼Îµ Î¿Ï€Î¿Î¹Î¿Î´Î®Ï€Î¿Ï„Îµ Ï„ÏÏŒÏ€Î¿ ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ ÏƒÏ…Î½Î´ÎÏƒÎµÎ¹Ï‚
 ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor?">
 <!ENTITY torSettings.bridgeHelp "Î‘Î½ Î´Îµ Î¾ÎÏÎµÏ„Îµ Ï€ÏŽÏ‚ Î½Î± Î±Ï€Î±Î½Ï„Î®ÏƒÎµÏ„Îµ ÎµÎ´ÏŽ, ÎµÏ€Î¹Î»ÎÎ¾Ï„Îµ "ÎŒÏ‡Î¹".  Î‘Î½ ÎµÏ€Î¹Î»ÎÎ¾ÎµÏ„Îµ "ÎÎ±Î¹", Î¸Î± ÏƒÎ±Ï‚ Î¶Î·Ï„Î®ÏƒÏ‰ Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ Î³ÎÏ†Ï…ÏÎµÏ‚ Tor, Ï€Î¿Ï… ÎµÎ¯Î½Î±Î¹ Î¼Î· ÎµÏ…ÏÎÏ‰Ï‚ Î³Î½Ï‰ÏƒÏ„Î¬ ÎºÎ±Î½Î¬Î»Î¹Î± ÎµÎ¹ÏƒÏŒÎ´Î¿Ï… ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor, Ï€Î¿Ï… Î´Ï…ÏƒÎºÎ¿Î»ÎµÏÎ¿Ï…Î½ ÏŒÏƒÎ¿Ï…Ï‚ Ï€ÏÎ¿ÏƒÏ€Î±Î¸Î¿ÏÎ½ Î½Î± Î¼Ï€Î»Î¿ÎºÎ¬ÏÎ¿Ï…Î½ Ï„Î¹Ï‚ ÏƒÏ…Î½Î´ÎÏƒÎµÎ¹Ï‚ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Tor.">
@@ -33,7 +37,7 @@
 
 <!ENTITY torsettings.optional "Î ÏÎ¿ÎµÏÎ±Î¹Ï„Î¹ÎºÎ±">
 
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
+<!ENTITY torsettings.useProxy.checkbox "Î‘Ï…Ï„ÏŒÏ‚ Î¿ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®Ï‚ Ï‡ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ ÎÎ½Î± Ï„Î¿Ï€Î¹ÎºÏŒ proxy Î³Î¹Î± Ï„Î·Î½ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÏ„Î¿ Internet">
 <!ENTITY torsettings.useProxy.type "Î¤ÏÏ€Î¿Ï‚ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Î¼ÎµÏƒÎ¿Î»Î¬Î²Î·ÏƒÎ·Ï‚:">
 <!ENTITY torsettings.useProxy.address "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·:">
 <!ENTITY torsettings.useProxy.address.placeholder "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î™Î¡ Î· ÏŒÎ½Î¿Î¼Î± Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ">
diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/en-GB/network-settings.dtd
+++ b/src/chrome/locale/en-GB/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd
index b62d50b..263ade0 100644
--- a/src/chrome/locale/eo/network-settings.dtd
+++ b/src/chrome/locale/eo/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index fdee9cb..2c3f300 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Configuraciones de la red Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd
index 12f4a5d..c3b8e6e 100644
--- a/src/chrome/locale/es-CL/network-settings.dtd
+++ b/src/chrome/locale/es-CL/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Configuracion De Internet Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd
index c764147..b630a4a 100644
--- a/src/chrome/locale/es-CO/network-settings.dtd
+++ b/src/chrome/locale/es-CO/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Configuraciones de red de Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Antes de conectar con la red de Tor, necesitas proveer informacion acerca de la coneccion de internet de este computador.">
diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd
index 5112f08..0c7dbb6 100644
--- a/src/chrome/locale/es-MX/network-settings.dtd
+++ b/src/chrome/locale/es-MX/network-settings.dtd
@@ -1,4 +1,8 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.dialog.title "ConfiguraciÃ³n de red Tor">
+
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
 
 <!-- For "first run" wizard: -->
 
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index a117fa0..ed03009 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ConfiguraciÃ³n de la red Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Antes de que se conecte a la red Tor, necesita proporcionar informaciÃ³n sobre la conexiÃ³n a Internet de este equipo.">
diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd
index a43df36..b5db33d 100644
--- a/src/chrome/locale/et/network-settings.dtd
+++ b/src/chrome/locale/et/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd
index 26a3d03..6190d66 100644
--- a/src/chrome/locale/eu/network-settings.dtd
+++ b/src/chrome/locale/eu/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor sare ezarpenak">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Tor sarera konektatu baino lehen, ordenagailu honen Interneteko konexioari buruzko informazioa eman behar duzu.">
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index b1da1e7..9a66be2 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø´Ø¨Ú©Ù‡ ØªÙˆØ±">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Ù‚Ø¨Ù„ Ø§Ø² Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ±ØŒ Ø¨Ø§ÛŒØ¯ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ Ø§Ø² Ù†ØÙˆÙ‡ Ø§ØªØµØ§Ù„ Ø§ÛŒÙ† Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø¨Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª ÙØ±Ø§Ù‡Ù… Ú©Ù†ÛŒØ¯.">
diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd
index 66a1e54..55a218f 100644
--- a/src/chrome/locale/fi/network-settings.dtd
+++ b/src/chrome/locale/fi/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor-verkkoasetukset">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor-selaimen kieli">
+<!ENTITY torlauncher.localePicker.prompt "Valitse kieli, ole hyvÃ¤.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Ennen kuin voit yhdistÃ¤Ã¤ Tor-verkkoon, sinun on annettava tietoja tietokoneesi internet-yhteydestÃ¤.">
diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd
index db7d3fa..001b446 100644
--- a/src/chrome/locale/fil/network-settings.dtd
+++ b/src/chrome/locale/fil/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Bago ka maka-connect sa Tor network, kailangan mong mag-bigay ng impormasyon tungkol sa koneksyon sa Internet ng kompyuter na ito. ">
diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd
index d85d5e4..e113692 100644
--- a/src/chrome/locale/fo/network-settings.dtd
+++ b/src/chrome/locale/fo/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd
index 6e0c02f..9e3094d 100644
--- a/src/chrome/locale/fr-CA/network-settings.dtd
+++ b/src/chrome/locale/fr-CA/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ParamÃ¨tres du rÃ©seau Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor">
+<!ENTITY torlauncher.localePicker.prompt "Veuillez choisir une langue">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Avant de vous connecter au rÃ©seau Tor, vous devez fournir des informations sur la connexion Internet de cet ordinateur.">
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index f5c1581..9b4f6d0 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -1,8 +1,12 @@
 <!ENTITY torsettings.dialog.title "ParamÃ¨tres du rÃ©seau Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Merci de sÃ©lectionner une langue.">
+
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Vous devez fournir des informations concernant la connexion Ã  Internet de cet ordinateur afin que vous puissiez vous connecter au rÃ©seau Tor.">
+<!ENTITY torsettings.prompt "Vous devez fournir des informations concernant la connexion Ã  Internet de cet ordinateur afin de pouvoir vous connecter au rÃ©seau Tor.">
 
 <!ENTITY torSettings.yes "Oui">
 <!ENTITY torSettings.no "Non">
@@ -15,15 +19,15 @@
 <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations.">
 <!ENTITY torSettings.connect "Se connecter">
 
-<!ENTITY torSettings.proxyPageTitle "Configuration du Proxy local">
+<!ENTITY torSettings.proxyPageTitle "Configuration du proxy local">
 <!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur a besoin d'utiliser un proxy pour accÃ©der Ã  internet ?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Si vous n'Ãªtes pas sure de la rÃ©ponse Ã  cette question, regardez les paramÃ¨tres internet dans un autre navigateur pour voir si il est configurÃ© pour l'utilisation d'un proxy.">
+<!ENTITY torSettings.proxyHelp "Si vous n'Ãªtes pas sur de la rÃ©ponse Ã  cette question, regardez les paramÃ¨tres internet dans un autre navigateur pour voir si il est configurÃ© pour l'utilisation d'un proxy.">
 <!ENTITY torSettings.enterProxy "Entrez les paramÃ¨tres de votre proxy.">
-<!ENTITY torSettings.bridgePageTitle "Configuration Tor Bridges">
+<!ENTITY torSettings.bridgePageTitle "Configuration des relais TOR">
 <!ENTITY torSettings.bridgeQuestion "Est-ce que votre Fournisseur d'AccÃ¨s Internet (FAI) bloque les connexions au rÃ©seau Tor ?">
-<!ENTITY torSettings.bridgeHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, choisissez Non.  Si vous choisissez Oui, il vous sera demandÃ© de configurer les bridges Tor qui sont des relais non listÃ©s et qui rendent plus difficile le blocage du rÃ©seau Tor.">
-<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les bridges fournis ou bien saisir votre liste de bridges personnels.">
+<!ENTITY torSettings.bridgeHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, choisissez Non.  Si vous choisissez Oui, il vous sera demandÃ© de configurer les ponts Tor qui sont des relais non listÃ©s et qui rendent plus difficile le blocage du rÃ©seau Tor.">
+<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les ponts fournis ou bien saisir votre liste de ponts personnels.">
 
 <!-- Other: -->
 
@@ -45,16 +49,16 @@
 <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui autorise uniquement les connexions Ã  certains ports">
 <!ENTITY torsettings.firewall.allowedPorts "Ports autorisÃ©s :">
 <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'AccÃ¨s Ã  Internet (FAI) bloque les connexions au rÃ©seau Tor">
-<!ENTITY torsettings.useBridges.default "Se connecter en utilisant les bridges prÃ©configurÃ©s">
+<!ENTITY torsettings.useBridges.default "Se connecter en utilisant les ponts prÃ©-configurÃ©s">
 <!ENTITY torsettings.useBridges.type "Mode de transport:">
-<!ENTITY torsettings.useBridges.custom "Entrez vos bridges personnels">
-<!ENTITY torsettings.useBridges.label "Saisir un ou davantage de bridges relais (un par ligne).">
-<!ENTITY torsettings.useBridges.placeholder "type adresse:port">
+<!ENTITY torsettings.useBridges.custom "Entrez vos ponts personnels">
+<!ENTITY torsettings.useBridges.label "Saisir un ou davantage de ponts relais (un par ligne).">
+<!ENTITY torsettings.useBridges.placeholder "tapez adresse:port">
 
 <!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier">
-<!ENTITY torsettings.bridgeHelpTitle "Aide pour les bridges">
+<!ENTITY torsettings.bridgeHelpTitle "Aide pour les ponts">
 <!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au rÃ©seau Tor, il se pourrait que votre fournisseur d'accÃ¨s Ã  Internet (FAI) ou une autre agence bloque le Tor.  Souvent, vous pouvez contourner ce problÃ¨me en utilisant des ponts Tor, qui sont des relais non listÃ©s qui sont plus difficiles Ã  bloquer.">
-<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser les liste de bridges prÃ©configurÃ©s par dÃ©faut ou en obtenir une liste personnalisÃ©e d'adresses en utilisant l'une des trois mÃ©thodes ci-dessous :">
+<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser les liste de ponts prÃ©-configurÃ©s par dÃ©faut ou en obtenir une liste personnalisÃ©e d'adresses en utilisant l'une des trois mÃ©thodes ci-dessous :">
 <!ENTITY torsettings.bridgeHelp2Heading "Par le Web">
 <!ENTITY torsettings.bridgeHelp2 "Utilisez un navigateur web pour visiter https://bridges.torproject.org">
 <!ENTITY torsettings.bridgeHelp3Heading "Par le rÃ©pondeur automatique de courriel">
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index 6949020..209755b 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor est lancÃ©.
 torlauncher.error_proxy_addr_missing=Pour configurer Tor afin qu'il utilise un proxy, vous devez spÃ©cifier une adresse IP ou un nom d'hÃ´te ainsi qu'un numÃ©ro de port.
 torlauncher.error_proxy_type_missing=Vous devez sÃ©lectionner un type de proxy.
 torlauncher.error_bridges_missing=Vous devez spÃ©cifier un ou plusieurs bridges.
-torlauncher.error_default_bridges_type_missing=Vous devez sÃ©lectionner un type de transport pour les bridges fournis.
-torlauncher.error_bridge_bad_default_type=Aucun des bridges fournis n'a le type de transport %S. Merci d'ajuster vos paramÃ¨tres.
+torlauncher.error_default_bridges_type_missing=Vous devez sÃ©lectionner un type de transport pour les ponts fournis.
+torlauncher.error_bridge_bad_default_type=Aucun des ponts fournis n'a le type de transport %S. Merci d'ajuster vos paramÃ¨tres.
 
 torlauncher.recommended_bridge=(recommandÃ©)
 
@@ -44,7 +44,7 @@ torlauncher.bootstrapStatus.handshake_dir=Ã‰tablissement d'une connexion annuair
 torlauncher.bootstrapStatus.requesting_status=RÃ©cupÃ©ration de l'Ã©tat du rÃ©seau
 torlauncher.bootstrapStatus.loading_status=Chargement de l'Ã©tat du rÃ©seau
 torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autoritÃ©
-torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relai
+torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais
 torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais
 torlauncher.bootstrapStatus.conn_or=Connexion au rÃ©seau Tor
 torlauncher.bootstrapStatus.handshake_or=RÃ©alisation d'un circuit Tor
diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/fur/network-settings.dtd
+++ b/src/chrome/locale/fur/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd
index ace4158..6c6c869 100644
--- a/src/chrome/locale/fy/network-settings.dtd
+++ b/src/chrome/locale/fy/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ga/network-settings.dtd
+++ b/src/chrome/locale/ga/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd
index cee7f9d..bcf88eb 100644
--- a/src/chrome/locale/gl/network-settings.dtd
+++ b/src/chrome/locale/gl/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Axustes da rede Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/gu-IN/network-settings.dtd
+++ b/src/chrome/locale/gu-IN/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd
index ce2cae5..2e06d74 100644
--- a/src/chrome/locale/gu/network-settings.dtd
+++ b/src/chrome/locale/gu/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/gun/network-settings.dtd
+++ b/src/chrome/locale/gun/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ha/network-settings.dtd
+++ b/src/chrome/locale/ha/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd
index 5f0a53d..d4b3d16 100644
--- a/src/chrome/locale/he/network-settings.dtd
+++ b/src/chrome/locale/he/network-settings.dtd
@@ -1,64 +1,72 @@
 <!ENTITY torsettings.dialog.title "×”×’×“×¨×•×ª ×¨×©×ª Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "×œ×¤× ×™ ×©××ª×” ×ž×ª×—×‘×¨ ×œ×¨×©×ª ×”-Tor, ××ª×” ×¦×¨×™×š ×œ×¡×¤×§ ×ž×™×“×¢ ×¢×œ ×—×™×‘×•×¨ ×”××™× ×˜×¨× ×˜ ×©×œ ×ž×—×©×‘ ×–×”.">
+<!ENTITY torsettings.prompt "×œ×¤× ×™ ×©×ª×ª×—×‘×¨ ×œ×¨×©×ª Tor, ×¢×œ×™×š ×œ×¡×¤×§ ×ž×™×“×¢ ×¢×œ ×—×™×‘×•×¨ ×”××™× ×˜×¨× ×˜ ×©×œ ×ž×—×©×‘ ×–×”.">
 
 <!ENTITY torSettings.yes "×›×Ÿ">
 <!ENTITY torSettings.no "×œ×">
 
-<!ENTITY torSettings.firstQuestion "××™×œ×• ×ž×Ÿ ×”×‘××™× ×ž×ª××¨ ××ª ×”×ž×¦×‘ ×©×œ×š ×‘××•×¤×Ÿ ×”×˜×•×‘ ×‘×™×•×ª×¨?">
-<!ENTITY torSettings.configurePrompt1 "×—×™×‘×•×¨ ×”××™× ×˜×¨× ×˜ ×©×œ ×”×ž×—×©×‘ ×”×–×” ×ž×¦×•× ×–×¨ ××• ×¢×•×‘×¨ ×‘×©×¨×ª ×¤×¨×•×§×¡×™">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.firstQuestion "××™×œ×• ×ž×Ÿ ×”×‘××™× ×ž×ª××¨ ××ª ×ž×¦×‘×š ×‘×¦×•×¨×” ×”×ž×“×•×™×§×ª ×‘×™×•×ª×¨?">
+<!ENTITY torSettings.configurePrompt1 "×—×™×‘×•×¨ ×”××™× ×˜×¨× ×˜ ×©×œ ×ž×—×©×‘ ×–×” ×ž×¡×•× ×Ÿ ××• ×¢×•×‘×¨ ×“×¨×š ×©×¨×ª ×¤×¨×•×§×¡×™.">
+<!ENTITY torSettings.configurePrompt2 "×‘×¨×¦×•× ×™ ×œ×”×’×“×™×¨ ×’×©×¨ ××• ×©×¨×ª ×¤×¨×•×§×¡×™ ×ž×§×•×ž×™.">
 <!ENTITY torSettings.configure "×”×’×“×¨">
-<!ENTITY torSettings.connectPrompt2 "×‘×¨×¦×•× ×™ ×œ×”×ª×—×‘×¨ ×™×©×™×¨×•×ª ××œ ×”×¨×©×ª Tor.">
-<!ENTITY torSettings.connectPrompt3 "×–×” ×™×¢×‘×•×“ ×‘×¨×•×‘ ×”×ž×§×¨×™×.">
+<!ENTITY torSettings.connectPrompt2 "×‘×¨×¦×•× ×™ ×œ×”×ª×—×‘×¨ ×™×©×™×¨×•×ª ×œ×¨×©×ª Tor.">
+<!ENTITY torSettings.connectPrompt3 "×“×‘×¨ ×–×” ×™×¢×‘×•×“ ×‘×ž×¨×‘×™×ª ×”×ž×§×¨×™×.">
 <!ENTITY torSettings.connect "×”×ª×—×‘×¨">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
+<!ENTITY torSettings.proxyPageTitle "×”×’×“×¨×•×ª ×©×¨×ª ×¤×¨×•×§×¡×™ ×ž×§×•×ž×™">
+<!ENTITY torSettings.proxyQuestion "×”×× ×ž×—×©×‘ ×–×” ×ž×•×›×¨×— ×œ×”×©×ª×ž×© ×‘×©×¨×ª ×¤×¨×•×§×¡×™ ×ž×§×•×ž×™ ×›×“×™ ×œ×§×‘×œ ×’×™×©×” ×œ××™× ×˜×¨× ×˜?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!ENTITY torSettings.proxyHelp "×× ××™× ×š ×‘×˜×•×— ×›×™×¦×“ ×œ×”×©×™×‘ ×œ×©××œ×” ×–×•, ×‘×—×Ÿ ××ª ×”×’×“×¨×•×ª ×”××™× ×˜×¨× ×˜ ×‘×“×¤×“×¤×Ÿ ××—×¨ ×›×“×™ ×œ×¨××•×ª ×”×× ×”×’×“×¨×•×ª ×”×”×ª×—×‘×¨×•×ª ×©×œ×• ×›×•×œ×œ×•×ª ×©×™×ž×•×© ×‘×©×¨×ª ×¤×¨×•×§×¡×™ ×ž×§×•×ž×™.">
 <!ENTITY torSettings.enterProxy "×”×–×Ÿ ××ª ×”×’×“×¨×•×ª ×”×¤×¨×•×§×¡×™.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "×”×× ×¡×¤×§ ×©×™×¨×•×ª×™ ×”××™× ×˜×¨× ×˜ (ISP) ×©×œ×š ×—×•×¡× ××• ×ž×¦× ×–×¨ ××—×¨×ª ×—×™×‘×•×¨×™× ×œ×¨×©×ª Tor ?">
-<!ENTITY torSettings.bridgeHelp "×× ××™× ×š ×‘×˜×•×— ××™×š ×œ×¢× ×•×ª ×œ×©××œ×” ×”×–×•, ×‘×—×¨ No.  ×‘×ž×™×“×” ×•×ª×‘×—×¨ ×›×Ÿ, ×ª×ª×‘×§×© ×œ×”×’×“×™×¨ ××ª ×’×©×¨×™ Tor, ×©×”× ×ž×ž×¡×¨×™× ×œ× ×¨×©×•×ž×™× ×©×ž×§×©×™× ×œ×—×¡×•× ×—×™×‘×•×¨×™× ×œ×¨×©×ª Tor.">
-<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
+<!ENTITY torSettings.bridgePageTitle "×”×’×“×¨×ª ×’×©×¨×™× ×œ-Tor">
+<!ENTITY torSettings.bridgeQuestion "×”×× ×¡×¤×§ ×©×™×¨×•×ª×™ ×”××™× ×˜×¨× ×˜ (ISP) ×©×œ×š ×—×•×¡× ××• ×ž×¡× ×Ÿ ×—×™×‘×•×¨×™× ×œ×¨×©×ª Tor ?">
+<!ENTITY torSettings.bridgeHelp "×× ××™× ×š ×‘×˜×•×— ×›×™×¦×“ ×œ×¢× ×•×ª ×œ×©××œ×” ×–×•, ×‘×—×¨ ×‘-'×œ×'. ×× ×ª×‘×—×¨ ×‘-'×›×Ÿ', ×ª×ª×‘×§×© ×œ×”×’×“×™×¨ ×’×©×¨×™× ×œ-Tor, ×©×”× ×©×¨×ª×™× ×œ× ×¤×•×ž×‘×™×™× ×”×ž×¡×™×™×¢×™× ×œ×¢×§×•×£ ×—×¡×™×ž×•×ª ×’×™×©×” ×œ×¨×©×ª Tor. ">
+<!ENTITY torSettings.bridgeSettingsPrompt "×‘××¤×©×¨×•×ª×š ×œ×”×©×ª×ž×© ×‘×¨×©×™×ž×ª ×”×’×©×¨×™× ×”×ž×•×›× ×” ××• ×œ×”×©×™×’ ×‘×¢×¦×ž×š ×•×œ×”×–×™×Ÿ ×¨×©×™×ž×ª ×’×©×¨×™× ×—×“×©×”.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "×ž×ž×ª×™×Ÿ ×›×¢×ª ×¢×‘×•×¨ Tor ×›×“×™ ×œ×”×ª×—×™×œâ€¦">
 <!ENTITY torsettings.restartTor "×”×ª×—×œ ×ž×—×“×© ××ª Tor">
 
-<!ENTITY torsettings.optional "×¨×©×•×ª">
+<!ENTITY torsettings.optional "××•×¤×¦×™×•× ×œ×™">
 
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
-<!ENTITY torsettings.useProxy.type "×˜×™×¤×•×¡ ×¤×¨×•×§×¡×™:">
+<!ENTITY torsettings.useProxy.checkbox "×ž×—×©×‘ ×–×” ×—×™×™×‘ ×œ×”×©×ª×ž×© ×‘×©×¨×ª ×¤×¨×•×§×¡×™ ×ž×§×•×ž×™ ×¢×œ ×ž× ×ª ×œ×”×ª×—×‘×¨ ×œ××™× ×˜×¨× ×˜">
+<!ENTITY torsettings.useProxy.type "×¡×•×’ ×¤×¨×•×§×¡×™:">
 <!ENTITY torsettings.useProxy.address "×›×ª×•×‘×ª:">
 <!ENTITY torsettings.useProxy.address.placeholder "×›×ª×•×‘×ª IP ××• ×©× ×ž××¨×—">
-<!ENTITY torsettings.useProxy.port "×™×¦×™××”:">
+<!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 "×ž×—×©×‘ ×–×” ×¢×•×‘×¨ ×“×¨×š ×—×•×ž×ª ××© ×©×¨×§ ×ž××¤×©×¨ ×—×™×‘×•×¨×™× ×œ×™×¦×™××•×ª ×ž×¡×•×™×ž×•×ª">
-<!ENTITY torsettings.firewall.allowedPorts "×™×¦×™××•×ª ×ž×•×¨×©×•×ª:">
-<!ENTITY torsettings.useBridges.checkbox "×¡×¤×§ ×”××™× ×˜×¨× ×˜ ×©×œ×™ (ISP) ×—×•×¡× ×—×™×‘×•×¨×™× ××œ ×”×¨×©×ª Tor">
-<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.type "Transport type:">
-<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
-<!ENTITY torsettings.useBridges.label "×”×§×œ×“ ××—×“ ××• ×™×•×ª×¨ ×ž×ž×¡×¨×™ ×’×©×¨ (××—×“ ×œ×›×œ ×©×•×¨×”)">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
+<!ENTITY torsettings.firewall.checkbox "×ž×—×©×‘ ×–×” ×ž×—×•×‘×¨ ×œ××™× ×˜×¨× ×˜ ×“×¨×š ×—×•×ž×ª ××© ×”×ž××¤×©×¨ ×—×™×‘×•×¨×™× ×¨×§ ×œ×¤×•×¨×˜×™× ×ž×¡×•×™×™×ž×™× ">
+<!ENTITY torsettings.firewall.allowedPorts "×¤×•×¨×˜×™× ×ž×•×¨×©×™×:">
+<!ENTITY torsettings.useBridges.checkbox "×¡×¤×§ ×”××™× ×˜×¨× ×˜ ×©×œ×™ (ISP) ×—×•×¡× ×—×™×‘×•×¨×™× ×œ×¨×©×ª Tor">
+<!ENTITY torsettings.useBridges.default "×”×ª×—×‘×¨ ×‘××ž×¦×¢×•×ª ×”×’×©×¨×™× ×”×ž×•×›× ×™× ×ž×¨××©">
+<!ENTITY torsettings.useBridges.type "×¡×•×’ ×ž×¡×•×•×” ×ª×¢×‘×•×¨×”:">
+<!ENTITY torsettings.useBridges.custom "×”×–×Ÿ ×¨×©×™×ž×ª ×’×©×¨×™× ×—×“×©×”">
+<!ENTITY torsettings.useBridges.label "×”×–×Ÿ ×¤×¨×˜×™ ×’×©×¨ ××—×“ ×œ×¤×—×•×ª (××—×“ ×œ×›×œ ×©×•×¨×”)">
+<!ENTITY torsettings.useBridges.placeholder "×”×–×Ÿ ×›×ª×•×‘×ª:×¤×•×¨×˜ address:port">
 
 <!ENTITY torsettings.copyLog "×”×¢×ª×§ ××ª ×™×•×ž×Ÿ Tor ××œ ×œ×•×— ×’×–×™×¨×”">
-<!ENTITY torsettings.bridgeHelpTitle "×¢×–×¨×ª ×ž×ž×¡×¨ ×’×©×¨">
-<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges at torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
-<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help at rt.torproject.org.  Please note that a person will need to respond to each request.">
+<!ENTITY torsettings.bridgeHelpTitle "×¢×–×¨×” ×‘× ×•×’×¢ ×œ×’×©×¨×™×">
+<!ENTITY torsettings.bridgeHelp1 "×× ××™×Ÿ ×‘××¤×©×¨×•×ª×š ×œ×”×ª×—×‘×¨ ×œ×¨×©×ª Tor, ×™×™×ª×›×Ÿ ×©×”×¡×™×‘×” ×œ×›×š ×”×™× ×©×¡×¤×§ ×”××™× ×˜×¨× ×˜ ×©×œ×š ××• ×’×•×¨× ××—×¨ ×—×•×¡×ž×™× ××ª Tor. ×œ×¢×ª×™× ×§×¨×•×‘×•×ª, × ×™×ª×Ÿ ×œ×”×ª×’×‘×¨ ×¢×œ ×‘×¢×™×” ×–×• ×‘××ž×¦×¢×•×ª ×©×™×ž×•×© ×‘×’×©×¨×™×, ×©×”× ×©×¨×ª×™× ×—×¡×•×™×™× ×©×§×©×” ×™×•×ª×¨ ×œ×—×¡×•× ××•×ª×.">
+<!ENTITY torsettings.bridgeHelp1B "×‘××¤×©×¨×•×ª×š ×œ×”×©×ª×ž×© ×‘×¨×©×™×ž×” ×ž×•×›× ×” ×ž×¨××© ×©×œ ×’×©×¨×™× ××• ×œ×”×©×™×’ ×‘×¢×¦×ž×š ×¨×©×™×ž×” ×—×“×©×” ×©×œ ×›×ª×•×‘×•×ª ×‘××ž×¦×¢×•×ª ××—×ª ×ž×©×œ×•×© ×”×“×¨×›×™× ×”×‘××•×ª:">
+<!ENTITY torsettings.bridgeHelp2Heading "×‘××ž×¦×¢×•×ª ×¨×©×ª ×”××™× ×˜×¨× ×˜">
+<!ENTITY torsettings.bridgeHelp2 "×”×™×¢×–×¨ ×‘×“×¤×“×¤×Ÿ ××™× ×˜×¨× ×˜ ×¢×œ ×ž× ×ª ×œ×‘×§×¨ ×‘××ª×¨ https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "×“×¨×š ×©×™×¨×•×ª ×”×“×•××œ ×”××•×˜×•×ž×˜×™">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "×©×œ×— ×“×•××œ ×œ×›×ª×•×‘×ª bridges at torproject.org ×¢× ×”×©×•×¨×” "get bridges" ×œ×œ× ×’×¨×©×™×™× ×‘×ª×•×š ×’×•×£ ×”×”×•×“×¢×”. ××•×œ×, ×›×“×™ ×œ×”×§×©×•×ª ×¢×•×“ ×™×•×ª×¨ ×¢×œ ×ª×•×§×¤×™× ×œ×¦×‘×•×¨ ×ž××’×¨ ×›×ª×•×‘×•×ª ×©×œ ×’×©×¨×™×, ×¢×œ×™×š ×œ×©×œ×•×— ×‘×§×©×” ×–×• ×ž×ª×•×š ××—×“ ×ž×¡×¤×§×™ ×”×“×•××œ ×”×‘××™× ×‘×œ×‘×“ (×‘×¡×“×¨ ×¢×“×™×¤×•×™×•×ª ×™×•×¨×“):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net
+https://mail.google.com
+https://mail.yahoo.com">
+<!ENTITY torsettings.bridgeHelp4Heading "×‘××ž×¦×¢×•×ª ×¦×•×•×ª ×”×ª×ž×™×›×” ×©×œ× ×•">
+<!ENTITY torsettings.bridgeHelp4 "×›×ž×•×¦× ××—×¨×•×Ÿ, ×ª×•×›×œ ×œ×‘×§×© ×¨×©×™×ž×ª ×’×©×¨×™× ×‘××ž×¦×¢×•×ª ×¤× ×™×™×” ×ž× ×•×ž×¡×ª ×‘×“×•××œ ×œ×›×ª×•×‘×ª ×”×‘××”: 
+help at rt.torproject.org
+×× × ×–×›×•×¨ ×©×‘×Ÿ ×× ×•×© ×™×™××œ×¥ ×œ×”×©×™×‘ ×‘××•×¤×Ÿ ××™×©×™ ×œ×›×œ ×‘×§×©×” ×©×›×–×•.">
diff --git a/src/chrome/locale/he/progress.dtd b/src/chrome/locale/he/progress.dtd
index 2e3d2c3..891697d 100644
--- a/src/chrome/locale/he/progress.dtd
+++ b/src/chrome/locale/he/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "×ž×¦×‘ Tor">
 <!ENTITY torprogress.openSettings "×¤×ª×— ×”×’×“×¨×•×ª">
 <!ENTITY torprogress.heading "×ž×ª×—×‘×¨ ×›×¢×ª ××œ ×¨×©×ª Tor">
-<!ENTITY torprogress.pleaseWait "×‘×‘×§×©×” ×”×ž×ª×Ÿ ×‘×–×ž×Ÿ ×©×× ×—× ×• ×™×•×¦×¨×™× ×—×™×‘×•×¨ ×œ×¨×©×ª ×”-Tor">
+<!ENTITY torprogress.pleaseWait "×× × ×”×ž×ª×Ÿ ×‘×¢×ª ×©×× ×• ×ž×ª×—×‘×¨×™× ×œ×¨×©×ª Tor.">
diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties
index 55224f5..66cd550 100644
--- a/src/chrome/locale/he/torlauncher.properties
+++ b/src/chrome/locale/he/torlauncher.properties
@@ -1,61 +1,61 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=×ž×©×’×¨ Tor
+torlauncher.error_title=×ª×•×›× ×ª ×”×”×¤×¢×œ×” ×©×œ Tor
 
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited=Tor ×”×¤×¡×™×§ ×œ×¢×‘×•×“ ×‘××•×¤×Ÿ ×¤×ª××•×ž×™. ×™×™×ª×›×Ÿ ×©×”×“×‘×¨ ××™×¨×¢ ×¢×§×‘ ×ª×§×œ×” ×‘-Tor ×¢×¦×ž×”, ×‘×©×œ ×ª×•×›× ×” ××—×¨×ª ×”×¤×•×¢×œ×ª ×¢×œ ×”×ž×¢×¨×›×ª ×©×œ×š, ××• ×‘×’×™×Ÿ ×ª×§×œ×ª ×—×•×ž×¨×”. ×›×œ ×¢×•×“ ×œ× ×ª×¤×¢×™×œ ×ž×—×“×© ××ª Tor, ×“×¤×“×¤×Ÿ Tor ×™×ž× ×¢ ×ž×ž×š ×œ×’×œ×•×© ×‘××™× ×˜×¨× ×˜. ×× ×”×‘×¢×™×” × ×ž×©×›×ª, ×× × ×©×œ×— ×¢×•×ª×§ ×ž×™×•×ž×Ÿ ×”×¨×™×©×•× ×©×œ Tor ×œ×¦×•×•×ª ×”×ª×ž×™×›×” ×©×œ× ×•.
 torlauncher.tor_exited2=×”×ª×—×œ×” ×ž×—×“×© ×©×œ Tor ×œ× ×ª×¡×’×•×¨ ××ª ×›×¨×˜×™×¡×™×•×ª ×”×“×¤×“×¤×Ÿ ×©×œ×š.
-torlauncher.tor_controlconn_failed=×œ× ×”×¦×œ×™×— ×œ×”×ª×—×‘×¨ ×œ×™×¦×™××ª ×©×œ×™×˜×ª Tor.
-torlauncher.tor_failed_to_start=Tor × ×›×©×œ ×‘×”×¤×¢×œ×”.
-torlauncher.tor_control_failed=× ×›×©×œ ×œ×§×‘×œ ×©×œ×™×˜×” ×¢×œ Tor.
-torlauncher.tor_bootstrap_failed=Tor × ×›×©×œ ×œ×‘×¡×¡ ×—×™×‘×•×¨ ×¨×©×ª Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
-
-torlauncher.unable_to_start_tor=××™×Ÿ ××¤×©×¨×•×ª ×œ×”×ª×—×™×œ ××ª Tor.\n\n%S
-torlauncher.tor_missing=×‘×¨ ×”×¨×¦×” Tor ×”×™× ×• ×—×¡×¨.
-torlauncher.torrc_missing=×”×§×•×‘×¥ torrc ×”×™× ×• ×—×¡×¨.
-torlauncher.datadir_missing=×¡×¤×¨×™×™×ª × ×ª×•× ×™× Tor ×œ× ×§×™×™×ž×ª.
+torlauncher.tor_controlconn_failed=× ×›×©×œ ×”×—×™×‘×•×¨ ×œ×¤×•×¨×˜ ×”×©×œ×™×˜×” ×©×œ Tor.
+torlauncher.tor_failed_to_start=×”×¤×¢×œ×ª Tor × ×›×©×œ×”.
+torlauncher.tor_control_failed=×›×©×œ×” × ×˜×™×œ×ª ×”×©×œ×™×˜×” ×¢×œ Tor.
+torlauncher.tor_bootstrap_failed=× ×›×©×œ ×”× ×™×¡×™×•×Ÿ ×œ×”×§×™× ×—×™×‘×•×¨ ×™×¦×™×‘ ×œ×¨×©×ª Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S × ×›×©×œ (%2$S).
+
+torlauncher.unable_to_start_tor=××™×Ÿ ××¤×©×¨×•×ª ×œ×”×¤×¢×™×œ ××ª Tor.\n\n%S
+torlauncher.tor_missing=×§×•×‘×¥ ×”×”×¤×¢×œ×” ×©×œ Tor ××™× × ×• ×§×™×™×.
+torlauncher.torrc_missing=×§×•×‘×¥ torrc ××™× × ×• ×§×™×™×.
+torlauncher.datadir_missing=×ª×™×§×™×™×ª ×”× ×ª×•× ×™× Tor ××™× × ×” ×§×™×™×ž×ª.
 torlauncher.password_hash_missing=×›×©×œ ×‘×”×©×’×ª ×¡×™×¡×ž×” ×ž×¢×•×¨×‘×œ×ª.
 
 torlauncher.failed_to_get_settings=××™×Ÿ ××¤×©×¨×•×ª ×œ××—×–×¨ ×”×’×“×¨×•×ª Tor.\n\n%S
 torlauncher.failed_to_save_settings=××™×Ÿ ××¤×©×¨×•×ª ×œ×©×ž×•×¨ ×”×’×“×¨×•×ª Tor.\n\n%S
-torlauncher.ensure_tor_is_running=×× × ×•×•×“× ×›×™ Tor ×ž×•×¨×¥ ×›×¢×ª.
+torlauncher.ensure_tor_is_running=×× × ×•×•×“× ×›×™ Tor ×¤×•×¢×œ ×›×¢×ª.
 
-torlauncher.error_proxy_addr_missing=×¢×œ×™×š ×œ×¦×™×™×Ÿ ×›×ª×•×‘×ª IP ××• ×©× ×ž××¨×— ×•×’× ×ž×¡×¤×¨ ×™×¦×™××” ×‘×›×“×™ ×œ×”×’×“×™×¨ ××ª Tor ×œ×©×™×ž×•×© ×‘×©×¨×ª ×¤×¨×•×§×¡×™ ×›×“×™ ×œ×¢×©×•×ª ×©×™×ž×•×© ×‘×¤×¨×•×§×¡×™ ×›×“×™ ×œ×”×™×›× ×¡ ××œ ×”××™× ×˜×¨× ×˜.
-torlauncher.error_proxy_type_missing=×¢×œ×™×š ×œ×‘×—×•×¨ ××ª ×˜×™×¤×•×¡ ×”×¤×¨×•×§×¡×™.
-torlauncher.error_bridges_missing=×¢×œ×™×š ×œ×¦×™×™×Ÿ ×’×©×¨ ××—×“ ××• ×™×•×ª×¨.
-torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
+torlauncher.error_proxy_addr_missing=×¢×œ×™×š ×œ×¦×™×™×Ÿ ×’× ×›×ª×•×‘×ª IP ××• ×©× ×ž××¨×— ×•×’× ×ž×¡×¤×¨ ×¤×•×¨×˜ ×›×“×™ ×œ××¤×©×¨ ×œ-Tor ×œ×”×™×¢×–×¨ ×‘×©×¨×ª ×¤×¨×•×§×¡×™ ×¢×œ ×ž× ×ª ×œ×’×©×ª ×œ×¨×©×ª ×”××™× ×˜×¨× ×˜.
+torlauncher.error_proxy_type_missing=×¢×œ×™×š ×œ×‘×—×•×¨ ××ª ×¡×•×’ ×©×¨×ª ×”×¤×¨×•×§×¡×™.
+torlauncher.error_bridges_missing=×¢×œ×™×š ×œ×‘×—×•×¨ ×‘×’×©×¨ ××—×“ ×œ×¤×—×•×ª.
+torlauncher.error_default_bridges_type_missing=×¢×œ×™×š ×œ×‘×—×•×¨ ×‘××™×–×” ×¡×•×’ ×©×œ ×ž×¡×•×•×” ×ª×¢×‘×•×¨×” ×ª×¨×¦×” ×œ×”×©×ª×ž×© ×‘×’×©×¨×™× ×©×‘×—×¨×ª.
+torlauncher.error_bridge_bad_default_type=×’×©×¨×™× ×‘×¢×œ×™ ×ž×¡×•×•×” ×ª×¢×‘×•×¨×” ×ž×¡×•×’ %S ××™× × ×–×ž×™× ×™× ×›×¢×ª. ×× × ×‘×—×¨ ×¡×•×’ ××—×¨.
 
 torlauncher.recommended_bridge=(×ž×•×ž×œ×¥)
 
 torlauncher.connect=×”×ª×—×‘×¨
 torlauncher.restart_tor=×”×ª×—×œ ×ž×—×“×© ××ª Tor
-torlauncher.quit=×™×¦×™××”
-torlauncher.quit_win=×¦×
-torlauncher.done=×”×•×©×œ×
-
-torlauncher.forAssistance=×œ×¢×–×¨×”, ×¦×¨×• ×§×©×¨ ×¢× %S
-
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-
-torlauncher.bootstrapStatus.conn_dir=×ž×ª×—×‘×¨ ×›×¢×ª ××œ ×ž×“×•×¨ ×ž×ž×¡×¨
-torlauncher.bootstrapStatus.handshake_dir=×ž×§×™× ×›×¢×ª ×—×™×‘×•×¨ ×¡×¤×¨×™×•×ª ×ž×•×¦×¤×Ÿ
-torlauncher.bootstrapStatus.requesting_status=×ž××ª×¨ ×›×¢×ª ××ª ×ž×¦×‘ ×”×¨×©×ª
-torlauncher.bootstrapStatus.loading_status=×˜×•×¢×Ÿ ×›×¢×ª ××ª ×ž×¦×‘ ×”×¨×©×ª
-torlauncher.bootstrapStatus.loading_keys=×˜×•×¢×Ÿ ×›×¢×ª ××™×©×•×¨×™× ××ž×™× ×™×
-torlauncher.bootstrapStatus.requesting_descriptors=×ž×‘×§×© ×›×¢×ª ×ž×™×“×¢ ×ž×ž×¡×¨
-torlauncher.bootstrapStatus.loading_descriptors=×˜×•×¢×Ÿ ×›×¢×ª ×ž×™×“×¢ ×ž×ž×¡×¨
-torlauncher.bootstrapStatus.conn_or=×ž×ª×—×‘×¨ ×›×¢×ª ××œ ×¨×©×ª Tor
-torlauncher.bootstrapStatus.handshake_or=×ž×§×™× ×›×¢×ª ×ž×¢×’×œ Tor
+torlauncher.quit=×¦×
+torlauncher.quit_win=×™×¦×™××”
+torlauncher.done=×‘×•×¦×¢
+
+torlauncher.forAssistance=×œ×ª×ž×™×›×”, ×¦×•×¨ ×§×©×¨ ×¢× %S
+
+torlauncher.copiedNLogMessages=×”×”×¢×ª×§×” ×”×•×©×œ×ž×”. %S ×”×•×“×¢×•×ª ×ž×™×•×ž×Ÿ ×”×¨×™×©×•× ×©×œ Tor ×ž×•×›× ×•×ª ×œ×”×¢×ª×§×” ×œ×ª×•×š ×¢×•×¨×š ×˜×§×¡×˜ ××• ×œ×”×•×“×¢×ª ×“×•××œ.
+
+torlauncher.bootstrapStatus.conn_dir=×ž×ª×—×‘×¨ ×œ×ž××’×¨ ×©×¨×ª×™×
+torlauncher.bootstrapStatus.handshake_dir=×ž×§×™× ×›×¢×ª ×—×™×‘×•×¨ ×ž×•×¦×¤×Ÿ ×œ×ž××’×¨ ×©×¨×ª×™×
+torlauncher.bootstrapStatus.requesting_status=×ž×ª×¢×“×›×Ÿ ×›×¢×ª ×‘×ž×¦×‘ ×”×¨×©×ª
+torlauncher.bootstrapStatus.loading_status=×˜×•×¢×Ÿ ××ª ×ž×¦×‘ ×”×¨×©×ª
+torlauncher.bootstrapStatus.loading_keys=×˜×•×¢×Ÿ ××ª ××™×©×•×¨×™ ×”××‘×˜×—×” ×©×œ ×”×¨×©×•×ª
+torlauncher.bootstrapStatus.requesting_descriptors=×ž×‘×§×© ×¨×©×™×ž×ª ×©×¨×ª×™×
+torlauncher.bootstrapStatus.loading_descriptors=×˜×•×¢×Ÿ ×¨×©×™×ž×ª ×©×¨×ª×™×
+torlauncher.bootstrapStatus.conn_or=×ž×ª×—×‘×¨ ××œ ×¨×©×ª Tor
+torlauncher.bootstrapStatus.handshake_or=×ž×§×™× × ×ª×™×‘ Tor
 torlauncher.bootstrapStatus.done=×ž×—×•×‘×¨ ×œ×¨×©×ª Tor!
 
 torlauncher.bootstrapWarning.done=×‘×•×¦×¢
-torlauncher.bootstrapWarning.connectrefused=×”×—×™×‘×•×¨ × ×“×—×”
+torlauncher.bootstrapWarning.connectrefused=×”×—×™×‘×•×¨ ×¡×•×¨×‘
 torlauncher.bootstrapWarning.misc=×©×•× ×•×ª
 torlauncher.bootstrapWarning.resourcelimit=×ž×©××‘×™× ×œ× ×ž×¡×¤×™×§×™×
 torlauncher.bootstrapWarning.identity=×–×”×•×ª ××™× ×” ×ª×•××ž×ª
 torlauncher.bootstrapWarning.timeout=×”×—×™×‘×•×¨ ×¤×§×¢
 torlauncher.bootstrapWarning.noroute=××™×Ÿ × ×ª×™×‘ ×œ××¨×—
 torlauncher.bootstrapWarning.ioerror=×©×’×™××ª ×§×¨×™××”/×›×ª×™×‘×”
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.pt_missing=×—×¡×¨ ×ž×¡×•×•×” ×ª×¢×‘×•×¨×”
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd
index 56e4906..95ec84d 100644
--- a/src/chrome/locale/hi/network-settings.dtd
+++ b/src/chrome/locale/hi/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
index 0b41d35..74d4ce2 100644
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ b/src/chrome/locale/hr-HR/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor mreÅ¾ne postavke">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Jezik Tor Preglednika">
+<!ENTITY torlauncher.localePicker.prompt "Molimo odaberite jezik.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Prije nego se spojite na Tor mreÅ¾u, trebate dati informacije o
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index 7f24263..0ccf030 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Postavke Tor MreÅ¾e">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ht/network-settings.dtd
+++ b/src/chrome/locale/ht/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd
index f89464c..afdfafc 100644
--- a/src/chrome/locale/hu/network-settings.dtd
+++ b/src/chrome/locale/hu/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser nyelv">
+<!ENTITY torlauncher.localePicker.prompt "KÃ©rlek vÃ¡lassz egy nyelvet.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "MielÅ‘tt a Tor hÃ¡lÃ³zatra csatlakoznÃ¡l, informÃ¡ciÃ³t kell adj a szÃ¡mÃtÃ³gÃ©p internet kapcsolatÃ¡rÃ³l.">
diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties
index c841168..d2b6ea2 100644
--- a/src/chrome/locale/hu/torlauncher.properties
+++ b/src/chrome/locale/hu/torlauncher.properties
@@ -3,7 +3,7 @@
 
 torlauncher.error_title=Tor IndÃtÃ³
 
-torlauncher.tor_exited=A Tor vÃ¡ratlanul kilÃ©pet. Ez bekÃ¶vetkezhet a Tor-ban talÃ¡lhatÃ³ hibÃ¡bÃ³l, egy a rendszeren talÃ¡lhatÃ³ mÃ¡sik programbÃ³l, vagy hibÃ¡s harverbÅ‘l. AmÃg nem indÃtja Ãºjra a tor-t addig a Tor bÃ¶ngÃ©szÅ‘ nem Ã©r el semmilyen oldalt. Ha a hiba folyamatosan fennÃ¡ll, kÃ©rjÃ¼k kÃ¼ldje le a Tor Log-ot a tÃ¡mogatÃ¡si csoportnak.
+torlauncher.tor_exited=A Tor vÃ¡ratlanul kilÃ©pet. Ez bekÃ¶vetkezhet a Tor-ban talÃ¡lhatÃ³ hibÃ¡bÃ³l, egy a rendszeren talÃ¡lhatÃ³ mÃ¡sik programbÃ³l, vagy hibÃ¡s hardverbÅ‘l. AmÃg nem indÃtja Ãºjra a tor-t addig a Tor Browser nem Ã©r el semmilyen oldalt. Ha a hiba folyamatosan fennÃ¡ll, kÃ©rjÃ¼k kÃ¼ldje le a Tor Log-ot a tÃ¡mogatÃ¡si csoportnak.
 torlauncher.tor_exited2=A Tor ÃºjraindÃtÃ¡sa nem fogja bezÃ¡rni a bÃ¶ngÃ©szÅ‘ fÃ¼leket.
 torlauncher.tor_controlconn_failed=Nem lehetsÃ©ges csatlakozni a Tor vezÃ©rlÅ‘ portjÃ¡ra
 torlauncher.tor_failed_to_start=Nem sikerÃ¼lt elindulnia a Tor-nak.
diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd
index f4460b2..0daa0a7 100644
--- a/src/chrome/locale/hy-AM/network-settings.dtd
+++ b/src/chrome/locale/hy-AM/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/hy/network-settings.dtd
+++ b/src/chrome/locale/hy/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd
index 2328ab6..13fc151 100644
--- a/src/chrome/locale/ia/network-settings.dtd
+++ b/src/chrome/locale/ia/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index e410043..2062d8c 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Pengaturan Jaringan Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Bahasa Peramban Tor">
+<!ENTITY torlauncher.localePicker.prompt "Silahkan pilih bahasa.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Sebelum Anda terhubung ke jaringan Tor, Anda perlu memberikan informasi tentang koneksi internet komputer ini.">
diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd
index 00e059c..9af70e1 100644
--- a/src/chrome/locale/is/network-settings.dtd
+++ b/src/chrome/locale/is/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index 026e63e..2f9859e 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Impostazioni rete Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Prima di connetterti alla rete Tor, devi fornire le informazioni riguardo la connessione internet di questo computer.">
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 68ebd96..dc7f76f 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¨å®š">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã™ã‚‹å‰ã«ã€ã“ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ãƒ¼ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã«ã¤ã„ã¦ã®æƒ…å ±ã‚’æä¾›ã—ã¦é ‚ãå¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚">
diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/jv/network-settings.dtd
+++ b/src/chrome/locale/jv/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index 8faeef4..7551c74 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd
index 61cb458..f1d2205 100644
--- a/src/chrome/locale/kk/network-settings.dtd
+++ b/src/chrome/locale/kk/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd
index 65c3328..eff2770 100644
--- a/src/chrome/locale/km/network-settings.dtd
+++ b/src/chrome/locale/km/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž”ážŽáŸ’ážŠáž¶áž‰ Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "áž˜áž»áž“â€‹áž–áŸáž›â€‹áž¢áŸ’áž“áž€áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…áž”ážŽáŸ’ážŠáž¶áž‰ Tor áž¢áŸ’áž“áž€ážáŸ’ážšáž¼ážœâ€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áŸ†áž–áž¸â€‹áž€áž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž¢áŸŠáž¸áž“áž’ážºážŽáž·ážâ€‹áž€áž»áŸ†áž–áŸ’áž™áž¼áž‘áŸážšâ€‹áž“áŸáŸ‡áŸ”">
diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd
index a88ceb2..2c14637 100644
--- a/src/chrome/locale/kn/network-settings.dtd
+++ b/src/chrome/locale/kn/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd
index bc07f76..63fb382 100644
--- a/src/chrome/locale/ko-KR/network-settings.dtd
+++ b/src/chrome/locale/ko-KR/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index 9f67a86..88ba8b1 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor ë„¤íŠ¸ì›Œí¬ ì„¤ì •">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Tor ë„¤íŠ¸ì›Œí¬ì— ì—°ê²°ì„ ì‹œë„í•˜ê¸° ì „ì—, ì´ ì»´í“¨í„°ì˜ ì¸í„°ë„· ì—°ê²°ì— ëŒ€í•œ ì •ë³´ë¥¼ ì œê³µí•´ì•¼í•©ë‹ˆë‹¤.">
diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ku/network-settings.dtd
+++ b/src/chrome/locale/ku/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/kw/network-settings.dtd
+++ b/src/chrome/locale/kw/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd
index 29fa570..ef50668 100644
--- a/src/chrome/locale/ky/network-settings.dtd
+++ b/src/chrome/locale/ky/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd
index 07d3d09..0aabd24 100644
--- a/src/chrome/locale/lb/network-settings.dtd
+++ b/src/chrome/locale/lb/network-settings.dtd
@@ -1,11 +1,15 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
-<!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "No">
+<!ENTITY torSettings.yes "Jo">
+<!ENTITY torSettings.no "Nee">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
@@ -38,7 +42,7 @@
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
 <!ENTITY torsettings.useProxy.port "Port:">
 <!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.password "Passwuert:">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties
index 02be756..9edd40f 100644
--- a/src/chrome/locale/lb/torlauncher.properties
+++ b/src/chrome/locale/lb/torlauncher.properties
@@ -33,7 +33,7 @@ torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
-torlauncher.done=Done
+torlauncher.done=FÃ¤erdeg
 
 torlauncher.forAssistance=For assistance, contact %S
 
diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/lg/network-settings.dtd
+++ b/src/chrome/locale/lg/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ln/network-settings.dtd
+++ b/src/chrome/locale/ln/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd
index 52c6e42..bc62da0 100644
--- a/src/chrome/locale/lo/network-settings.dtd
+++ b/src/chrome/locale/lo/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "àºàº²àº™àº•àº±à»‰àº‡àº„à»ˆàº²à»€àº„àº·àºàº‚à»ˆàº²àº Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "àºà»ˆàºàº™àº—àºµà»ˆàº—à»ˆàº²àº™àºˆàº°à»€àºŠàº·à»ˆàºàº¡àº•à»à»ˆà»€àº‚àº»à»‰àº²à»€àº„àº·àºàº‚à»ˆàº²àº Tor, àº—à»ˆàº²àº™àº•à»‰àºàº‡à»„àº”à»‰à»ƒàº«à»‰àº¥àº²àºàº¥àº°àºàº½àº”àºà»ˆàº½àº§àºàº±àºš àºàº²àº™à»€àºŠàº·à»ˆàºàº¡àº•à»à»ˆ àºàº´àº™à»€àº•àºµà»€àº™àº±àº” àº‚àºàº‡ àº„àº±àºàº¡àºžàº´àº§à»€àº•àºµàº£à»Œ àº™àºµà»‰àºà»ˆàºàº™.">
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index 624c09e..4966246 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor tinklo parametrai">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
@@ -12,11 +16,11 @@
 <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
+<!ENTITY torSettings.connectPrompt3 "Tai suveiks daugeliu situacijÅ³.">
 <!ENTITY torSettings.connect "Prisijungti">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
+<!ENTITY torSettings.proxyQuestion "Ar Å¡is kompiuteris naudoja vietinÄ¯ proxy prisijungimui prie interneto?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
@@ -30,10 +34,10 @@
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ€¦">
 <!ENTITY torsettings.restartTor "Pakartotinai paleisti Tor">
 
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "NebÅ«tina">
 
 <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy tipas:">
 <!ENTITY torsettings.useProxy.address "Adresas:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
 <!ENTITY torsettings.useProxy.port "Prievadas:">
diff --git a/src/chrome/locale/lt/progress.dtd b/src/chrome/locale/lt/progress.dtd
index 253043b..24b4319 100644
--- a/src/chrome/locale/lt/progress.dtd
+++ b/src/chrome/locale/lt/progress.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
+<!ENTITY torprogress.dialog.title "Tor statusas">
+<!ENTITY torprogress.openSettings "Atidaryti nustatymus">
 <!ENTITY torprogress.heading "Jungiamasi prie Tor tinklo">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "PraÅ¡ome palaukti kol sujungsime su Tor tinklu.">
diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd
index 7c369cd..1f2c90d 100644
--- a/src/chrome/locale/lv/network-settings.dtd
+++ b/src/chrome/locale/lv/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor tÄ«kla iestatÄ«jumi">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Pirms pievienojaties pie tÄ«kla Tor, Jums jÄnorÄda informÄcija par Å¡Ä« datora interneta savienojumu.">
diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/mg/network-settings.dtd
+++ b/src/chrome/locale/mg/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/mi/network-settings.dtd
+++ b/src/chrome/locale/mi/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index bfd4124..d62a729 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/mn/network-settings.dtd
+++ b/src/chrome/locale/mn/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd
index 1895b72..aa410db 100644
--- a/src/chrome/locale/mr/network-settings.dtd
+++ b/src/chrome/locale/mr/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd
index a5db7dd..20a6de7 100644
--- a/src/chrome/locale/ms-MY/network-settings.dtd
+++ b/src/chrome/locale/ms-MY/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tetapan Rangkaian Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Sebelum anda menyambung ke jaringan Tor, anda mestilah memberi maklumat tentang talian internet komputer ini terlebih dahulu.">
diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/mt/network-settings.dtd
+++ b/src/chrome/locale/mt/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd
index 3af4515..b1adfef 100644
--- a/src/chrome/locale/my/network-settings.dtd
+++ b/src/chrome/locale/my/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/my/progress.dtd b/src/chrome/locale/my/progress.dtd
index a5a4e99..7b35c53 100644
--- a/src/chrome/locale/my/progress.dtd
+++ b/src/chrome/locale/my/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor á€¡á€”á€±á€¡á€‘á€¬á€¸">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Tor á€€á€½á€”á€ºá€›á€€á€ºá€€á€á€¯ á€†á€€á€ºá€žá€½á€šá€ºá€”á€±á€žá€Šá€º">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Tor á€€á€½á€”á€ºá€šá€€á€ºá€”á€¾á€„á€ºá€· á€á€»á€á€á€ºá€†á€€á€ºá€™á€¾á€¯á€•á€¼á€¯â€Œá€œá€¯á€•á€ºá€”á€±á€…á€¥á€ºá€…á€±á€¬á€„á€ºá€·á€†á€á€¯á€„á€ºá€¸á€•á€±á€¸á€•á€«á‹">
diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/nah/network-settings.dtd
+++ b/src/chrome/locale/nah/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/nap/network-settings.dtd
+++ b/src/chrome/locale/nap/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd
index ad43941..1bc8963 100644
--- a/src/chrome/locale/nb/network-settings.dtd
+++ b/src/chrome/locale/nb/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Nettverksinnstillinger">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "SprÃ¥k i Tor-nettleser">
+<!ENTITY torlauncher.localePicker.prompt "Velg sprÃ¥k">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "FÃ¸r du kan koble til Tor-nettverket, mÃ¥ du gi informasjon om denne datamaskinens internett-tilkobling.">
diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/nds/network-settings.dtd
+++ b/src/chrome/locale/nds/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd
index ad59738..a853c53 100644
--- a/src/chrome/locale/ne/network-settings.dtd
+++ b/src/chrome/locale/ne/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd
index 2de3c52..0cb285b 100644
--- a/src/chrome/locale/nl-BE/network-settings.dtd
+++ b/src/chrome/locale/nl-BE/network-settings.dtd
@@ -1,43 +1,47 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.dialog.title "Tor Netwerk Instellingen">
+
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
+<!ENTITY torsettings.prompt "Voordat u connecteert met het Tor netwerk, dient u informatie op te geven inzake uw internetconnectie.">
 
 <!ENTITY torSettings.yes "Ja">
 <!ENTITY torSettings.no "Nee">
 
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
-<!ENTITY torSettings.connect "Connect">
+<!ENTITY torSettings.firstQuestion "Welke van devolgende situaties beschrijft uw situatie het best?">
+<!ENTITY torSettings.configurePrompt1 "De Internet connectie van deze computer is gecensureerd of connecteert via een proxy.">
+<!ENTITY torSettings.configurePrompt2 "Ik dien bridge of lokale proxy instellingen te configureren.">
+<!ENTITY torSettings.configure "Configureer">
+<!ENTITY torSettings.connectPrompt2 "Ik zou direct naar het Tor netwerk willen connecteren.">
+<!ENTITY torSettings.connectPrompt3 "Dit zal werken in de meeste situaties.">
+<!ENTITY torSettings.connect "Verbinden">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
+<!ENTITY torSettings.proxyPageTitle "Lokale Proxy Configuratie.">
+<!ENTITY torSettings.proxyQuestion "Gebruikt deze computer een lokale proxy om verbinding te maken met het Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.enterProxy "Geef de proxy instellingen in">
+<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuratie">
+<!ENTITY torSettings.bridgeQuestion "Blokkeert of censureert uw internetleverancier (ISP) connecties naar het Tor netwerk?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "Waiting for Tor to startâ€¦">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.startingTor "Wachten tot Tor opstart...">
+<!ENTITY torsettings.restartTor "Tor herstarten">
 
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "Optioneel">
 
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
+<!ENTITY torsettings.useProxy.checkbox "Deze computer heeft een lokale proxy nodig om toegang te krijgen tot het Internet">
 <!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.address "Address:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port:">
-<!ENTITY torsettings.useProxy.username "Username:">
+<!ENTITY torsettings.useProxy.address "Adres:">
+<!ENTITY torsettings.useProxy.address.placeholder "IP adres of hostnaam">
+<!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">
@@ -55,10 +59,10 @@
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
 <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp2Heading "Via het Web">
+<!ENTITY torsettings.bridgeHelp2 "Gebruik een web browser om https://bridges.torproject.org te bezoeken">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
 <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges at torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
+<!ENTITY torsettings.bridgeHelp4Heading "Via de Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help at rt.torproject.org.  Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties
index 8d3941b..e231325 100644
--- a/src/chrome/locale/nl-BE/torlauncher.properties
+++ b/src/chrome/locale/nl-BE/torlauncher.properties
@@ -6,14 +6,14 @@ torlauncher.error_title=Tor Launcher
 torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
 torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
+torlauncher.tor_failed_to_start=Kan Tor niet starten.
 torlauncher.tor_control_failed=Failed to take control of Tor.
 torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
 torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+torlauncher.unable_to_start_tor=Kan Tor niet starten.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
+torlauncher.torrc_missing=Het torcc bestand ontbreekt
 torlauncher.datadir_missing=The Tor data directory does not exist.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
@@ -29,20 +29,20 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 
 torlauncher.recommended_bridge=(aanbevolen)
 
-torlauncher.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
+torlauncher.connect=Verbinden
+torlauncher.restart_tor=Tor herstarten
+torlauncher.quit=Afsluiten
 torlauncher.quit_win=Afsluiten
 torlauncher.done=Klaar
 
-torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance=Voor assistentie, gelieve %S te contacteren
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
-torlauncher.bootstrapStatus.requesting_status=Retrieving network status
-torlauncher.bootstrapStatus.loading_status=Loading network status
+torlauncher.bootstrapStatus.requesting_status=Netwerkstatus aan het ophalen
+torlauncher.bootstrapStatus.loading_status=Netwerkstatus aan het lasen
 torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
 torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
 torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
@@ -50,12 +50,12 @@ torlauncher.bootstrapStatus.conn_or=Connecteren naar het Tor netwerk
 torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
 torlauncher.bootstrapStatus.done=Connected to the Tor network!
 
-torlauncher.bootstrapWarning.done=done
+torlauncher.bootstrapWarning.done=klaar
 torlauncher.bootstrapWarning.connectrefused=connection refused
 torlauncher.bootstrapWarning.misc=miscellaneous
 torlauncher.bootstrapWarning.resourcelimit=insufficient resources
 torlauncher.bootstrapWarning.identity=identity mismatch
 torlauncher.bootstrapWarning.timeout=connection timeout
 torlauncher.bootstrapWarning.noroute=no route to host
-torlauncher.bootstrapWarning.ioerror=read/write error
+torlauncher.bootstrapWarning.ioerror=read/write foutmelding
 torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index 8bb2a1e..5415366 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor netwerkinstellingen">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Taal">
+<!ENTITY torlauncher.localePicker.prompt "Selecteer een taal.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Voordat je verbindt met het Tor-netwerk moet je eerst wat meer informatie geven over de internetverbinding van deze computer.">
diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd
index 41af041..8a75a1f 100644
--- a/src/chrome/locale/nn/network-settings.dtd
+++ b/src/chrome/locale/nn/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor nettverksinnstillingar">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/nso/network-settings.dtd
+++ b/src/chrome/locale/nso/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/oc/network-settings.dtd
+++ b/src/chrome/locale/oc/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/or/network-settings.dtd
+++ b/src/chrome/locale/or/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd
index 4052c35..4270144 100644
--- a/src/chrome/locale/pa/network-settings.dtd
+++ b/src/chrome/locale/pa/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "à¨Ÿà©‹à¨° à¨¨à©ˆà©±à¨Ÿà¨µà¨°à¨• à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/pap/network-settings.dtd
+++ b/src/chrome/locale/pap/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index 0640c15..a7af06b 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Ustawienia Sieci">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "JÄ™zyk przeglÄ…darki Tor.">
+<!ENTITY torlauncher.localePicker.prompt "Wybierz jÄ™zyk.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Zanim podÅ‚Ä…czysz siÄ™ do sieci Tor, uzupeÅ‚nij informacje o parametrach poÅ‚Ä…czenia tego komputera z internetem.">
diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/pms/network-settings.dtd
+++ b/src/chrome/locale/pms/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ps/network-settings.dtd
+++ b/src/chrome/locale/ps/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd
index c8bbdf7..544bc0b 100644
--- a/src/chrome/locale/pt-BR/network-settings.dtd
+++ b/src/chrome/locale/pt-BR/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ConfiguraÃ§Ãµes da Rede Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Idioma do navegador Tor">
+<!ENTITY torlauncher.localePicker.prompt "Por favor selecione um idioma.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Antes de se conectar Ã  rede Tor, vocÃª deve fornecer informaÃ§Ãµes sobre a conexÃ£o a Internet desse computador.">
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index 0ba38a3..251a592 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ConfiguraÃ§Ãµes da Rede Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Linguagem do Navegador Tor">
+<!ENTITY torlauncher.localePicker.prompt "Por favor seleccione um idioma.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Antes de se ligar Ã  rede Tor, precisa de fornecer informaÃ§Ã£o sobre a ligaÃ§Ã£o deste computador Ã  Internet.">
@@ -9,13 +13,13 @@
 
 <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situaÃ§Ã£o?">
 <!ENTITY torSettings.configurePrompt1 "Esta ligaÃ§Ã£o Ã  Internet deste computador estÃ¡ censurada ou Ã© efetuada via proxy.">
-<!ENTITY torSettings.configurePrompt2 "Preciso de configurar a ponte ou as definiÃ§Ãµes locais de proxy.">
+<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar a ponte ou as definiÃ§Ãµes de proxy local.">
 <!ENTITY torSettings.configure "Configurar">
 <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me ligar diretamente Ã  rede Tor.">
 <!ENTITY torSettings.connectPrompt3 "Isto funciona na maior parte das situaÃ§Ãµes.">
 <!ENTITY torSettings.connect "Ligar">
 
-<!ENTITY torSettings.proxyPageTitle "ConfiguraÃ§Ã£o do servidor local">
+<!ENTITY torSettings.proxyPageTitle "ConfiguraÃ§Ã£o do Proxy Local">
 <!ENTITY torSettings.proxyQuestion "Este computador precisa de usar um acesso proxy Ã  Intrnet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Se nÃ£o tem a certeza da resposta, veja as definiÃ§Ãµes de Internet noutro navegador para confirmar se estÃ¡ configurado para usar um proxy local.">
diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties
index 45b7a61..61b4aa9 100644
--- a/src/chrome/locale/pt/torlauncher.properties
+++ b/src/chrome/locale/pt/torlauncher.properties
@@ -5,7 +5,7 @@ torlauncher.error_title=Executor Tor
 
 torlauncher.tor_exited=O Tor encerrou inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. AtÃ© que reinicie o Tor, o Navegador Tor nÃ£o irÃ¡ poder aceder a quaisquer sÃtios da Web. Se o problema persistir, por favor, envie uma cÃ³pia do Registo de Eventos do seu Tor para a equipa de suporte.
 torlauncher.tor_exited2=Ao reiniciar o Tor nÃ£o irÃ¡ fechar os separadores do seu navegador.
-torlauncher.tor_controlconn_failed=NÃ£o foi possÃvel conetar Ã  porta de controlo do Tor.
+torlauncher.tor_controlconn_failed=NÃ£o foi possÃvel ligar Ã  porta de controlo do Tor.
 torlauncher.tor_failed_to_start=O Tor nÃ£o foi iniciado.
 torlauncher.tor_control_failed=NÃ£o foi possÃvel obter o controlo do Tor
 torlauncher.tor_bootstrap_failed=O Tor nÃ£o conseguiu estabelecer uma ligaÃ§Ã£o de rede Tor.
@@ -17,8 +17,8 @@ torlauncher.torrc_missing=O ficheiro torrc estÃ¡ em falta.
 torlauncher.datadir_missing=A pasta dos dados do Tor nÃ£o existe.
 torlauncher.password_hash_missing=NÃ£o foi possÃvel obter a senha "hashed".
 
-torlauncher.failed_to_get_settings=NÃ£o Ã© possÃvel obter as definiÃ§Ãµes do Tor\n\n %S
-torlauncher.failed_to_save_settings=NÃ£o Ã© possÃvel guardar as definiÃ§Ãµes do Tor\n\n %S
+torlauncher.failed_to_get_settings=NÃ£o Ã© possÃvel obter as configuraÃ§Ãµes do Tor\n\n %S
+torlauncher.failed_to_save_settings=NÃ£o Ã© possÃvel guardar as configuraÃ§Ãµes do Tor\n\n %S
 torlauncher.ensure_tor_is_running=Por favor, assegure que o Tor estÃ¡ em execuÃ§Ã£o.
 
 torlauncher.error_proxy_addr_missing=Deve especificar ambos, um endereÃ§o de IP ou o nome de hospedeiro e um nÃºmero de porta para configurar o Tor, para utilizar um proxy para aceder Ã  Internet.
@@ -32,7 +32,7 @@ torlauncher.recommended_bridge=(recomendado)
 torlauncher.connect=Ligar
 torlauncher.restart_tor=Reiniciar o Tor
 torlauncher.quit=Sair
-torlauncher.quit_win=Sair
+torlauncher.quit_win=Fechar
 torlauncher.done=ConcluÃdo
 
 torlauncher.forAssistance=Para assistÃªncia, contacte %S
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index dfceb1b..6561901 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "SetÄƒri reÈ›ea Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "ÃŽnainte de a vÄƒ conecta la reÈ›eaua Tor, trebuie sÄƒ oferiÈ›i informaÈ›ii despre conexiunea acestui computer la Internet.">
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index f7d2be0..4880f19 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "ÐŸÑ€ÐµÐ¶Ð´Ðµ Ñ‡ÐµÐ¼ Ð²Ñ‹ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐµÑ‚Ð¸ Tor, Ð²Ð°Ð¼ Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾Ð± Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸ ÑÑ‚Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°.">
diff --git a/src/chrome/locale/ru at petr1708/network-settings.dtd b/src/chrome/locale/ru at petr1708/network-settings.dtd
index 7caaf17..3c1d225 100644
--- a/src/chrome/locale/ru at petr1708/network-settings.dtd
+++ b/src/chrome/locale/ru at petr1708/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/sco/network-settings.dtd
+++ b/src/chrome/locale/sco/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd
index 658325d..0ef880c 100644
--- a/src/chrome/locale/si-LK/network-settings.dtd
+++ b/src/chrome/locale/si-LK/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "TOR à¶¢à·à¶½ à·ƒà·’à¶§à·”à·€à¶¸à·Š">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd
index 2cd33df..8520626 100644
--- a/src/chrome/locale/sk-SK/network-settings.dtd
+++ b/src/chrome/locale/sk-SK/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Nastavenia Tor Network">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Pred tÃ½m, neÅ¾ sa pripojÃte k sieti Tor, je potrebnÃ© poskytnÃºÅ¥ informÃ¡cie o pripojenÃ tohto poÄÃtaÄa na Internet.">
diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd
index ff81a82..096cb08 100644
--- a/src/chrome/locale/sk/network-settings.dtd
+++ b/src/chrome/locale/sk/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "SieÅ¥ovÃ© Nastavenia Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "PredtÃ½m neÅ¾ sa pripojÃte k sieti Toru, potrebujete poskytnÃºÅ¥ informÃ¡cie o pripojenÃ tohto poÄÃtaÄa k Internetu.">
diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd
index b4c6070..e80491f 100644
--- a/src/chrome/locale/sl-SI/network-settings.dtd
+++ b/src/chrome/locale/sl-SI/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor mreÅ¾ne nastavitve">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Preden se poveÅ¾ete na Tor omreÅ¾je, si morate priskrbeti informacije o tej raÄunalniÅ¡ki internet povezavi.">
diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd
index 5435c0e..31e1cfc 100644
--- a/src/chrome/locale/sl/network-settings.dtd
+++ b/src/chrome/locale/sl/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/sn/network-settings.dtd
+++ b/src/chrome/locale/sn/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/so/network-settings.dtd
+++ b/src/chrome/locale/so/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/son/network-settings.dtd
+++ b/src/chrome/locale/son/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/sq-AL/torlauncher.properties b/src/chrome/locale/sq-AL/torlauncher.properties
index a2550db..02be756 100644
--- a/src/chrome/locale/sq-AL/torlauncher.properties
+++ b/src/chrome/locale/sq-AL/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,12 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
@@ -55,3 +58,4 @@ torlauncher.bootstrapWarning.identity=identity mismatch
 torlauncher.bootstrapWarning.timeout=connection timeout
 torlauncher.bootstrapWarning.noroute=no route to host
 torlauncher.bootstrapWarning.ioerror=read/write error
+torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd
index 6dce4eb..9a627e9 100644
--- a/src/chrome/locale/sq/network-settings.dtd
+++ b/src/chrome/locale/sq/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Konfigurimi i Rrjetit tÃ« Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "PÃ«rpara se tÃ« lidheni me rrjetin e Tor, ju nevojitet tÃ« ofroni informacion rreth lidhjes sÃ« Internetit tÃ« kÃ«tij kompjuteri.">
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index 7b0c4f2..0883ccf 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ° Ð¢Ð¾Ñ€ Ð¼Ñ€ÐµÐ¶Ðµ">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "ÐŸÑ€Ðµ Ð½ÐµÐ³Ð¾ ÑˆÑ‚Ð¾ ÑÐµ Ð¿Ð¾Ð²ÐµÐ¶ÐµÑ‚Ðµ Ð½Ð° Ð¢Ð¾Ñ€ Ð¼Ñ€ÐµÐ¶Ñƒ, Ñ‚Ñ€ÐµÐ±Ð°Ð»Ð¾ Ð±Ð¸ Ð´Ð° Ð¿Ñ€ÑƒÐ¶Ð¸Ñ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ˜Ðµ Ð¾ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ ÐºÐ¾Ð½ÐµÐºÑ†Ð¸Ñ˜Ð¸ Ð¾Ð²Ð¾Ð³ Ñ€Ð°Ñ‡ÑƒÐ½Ð°Ñ€Ð°.">
diff --git a/src/chrome/locale/sr at latin/network-settings.dtd b/src/chrome/locale/sr at latin/network-settings.dtd
index 905edc2..331278d 100644
--- a/src/chrome/locale/sr at latin/network-settings.dtd
+++ b/src/chrome/locale/sr at latin/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "PodeÅ¡avanja Tor mreÅ¾e">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Pre nego Å¡to se konektujete na Tor mreÅ¾u, potrebno je da pruÅ¾ite informacije o internet konekciji ovog kompjutera.">
diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/st/network-settings.dtd
+++ b/src/chrome/locale/st/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/su/network-settings.dtd
+++ b/src/chrome/locale/su/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index 4f1c21b..6ec3077 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "NÃ¤tverksinstÃ¤llningar fÃ¶r Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Innan du ansluter till Tor-nÃ¤tverket sÃ¥ behÃ¶ver du lÃ¤mna information om den hÃ¤r datorns internetanslutning.">
@@ -15,12 +19,12 @@
 <!ENTITY torSettings.connectPrompt3 "Detta fungerar i de flesta situationer.">
 <!ENTITY torSettings.connect "Anslut">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
+<!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfiguration">
 <!ENTITY torSettings.proxyQuestion "BehÃ¶ver den hÃ¤r datorn anvÃ¤nda en lokal proxy fÃ¶r att ansluta till Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Om du Ã¤r osÃ¤ker pÃ¥ svaret pÃ¥ frÃ¥gan, titta pÃ¥ InternetinstÃ¤llningarna i en annan webblÃ¤sare fÃ¶r att se om den Ã¤r konfigurerad att anvÃ¤nda en lokal proxy.">
 <!ENTITY torSettings.enterProxy "Ange proxyinstÃ¤llningarna.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
+<!ENTITY torSettings.bridgePageTitle "Konfiguration av Tor-bryggor">
 <!ENTITY torSettings.bridgeQuestion "Blockerar eller censurerar din internetleverantÃ¶r anslutningar till Tor-nÃ¤tverket?">
 <!ENTITY torSettings.bridgeHelp "Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ den hÃ¤r frÃ¥gan, vÃ¤lj Nej.  Om du vÃ¤ljer Ja kommer du ombes att konfigurera Tor-bryggor, vilka Ã¤r olistade relÃ¤er som gÃ¶r det svÃ¥rare att blockera anslutningar till Tor-nÃ¤tverket.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Du kan anvÃ¤nda de fÃ¶rkonfigurerade bryggorna, eller skaffa och ange bryggor sjÃ¤lv.">
diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/sw/network-settings.dtd
+++ b/src/chrome/locale/sw/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/szl/network-settings.dtd
+++ b/src/chrome/locale/szl/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index 7b0f9e1..5e1479c 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor à®¨à¯†à®Ÿà¯à®µà¯†à®¾à®°à¯à®•à¯ à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd
index 07d3d09..8943c47 100644
--- a/src/chrome/locale/te-IN/network-settings.dtd
+++ b/src/chrome/locale/te-IN/network-settings.dtd
@@ -1,11 +1,15 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
 <!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "No">
+<!ENTITY torSettings.no "à°•à°¾à°¦à± ">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/te/network-settings.dtd
+++ b/src/chrome/locale/te/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/tg/network-settings.dtd
+++ b/src/chrome/locale/tg/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd
index dce3b91..23ad049 100644
--- a/src/chrome/locale/th/network-settings.dtd
+++ b/src/chrome/locale/th/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¹€à¸„à¸£à¸·à¸à¸‚à¹ˆà¸²à¸¢ Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ti/network-settings.dtd
+++ b/src/chrome/locale/ti/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/tk/network-settings.dtd
+++ b/src/chrome/locale/tk/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index ad2501d..c37d65d 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -1,64 +1,68 @@
-<!ENTITY torsettings.dialog.title "Tor AÄŸ AyarlarÄ±">
+<!ENTITY torsettings.dialog.title "Tor AÄŸÄ± AyarlarÄ±">
+
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Dili">
+<!ENTITY torlauncher.localePicker.prompt "LÃ¼tfen bir dil seÃ§in.">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Tor aÄŸÄ±na baÄŸlanmadan Ã¶nce, bu bilgisayarÄ±n Ä°nternet baÄŸlantÄ±sÄ± hakkÄ±nda bilgi vermeniz gerekir.">
+<!ENTITY torsettings.prompt "Tor aÄŸÄ±na baÄŸlanmadan Ã¶nce, bu bilgisayarÄ±n Internet baÄŸlantÄ±sÄ± hakkÄ±nda bilgi vermeniz gerekiyor.">
 
 <!ENTITY torSettings.yes "Evet">
 <!ENTITY torSettings.no "HayÄ±r">
 
 <!ENTITY torSettings.firstQuestion "AÅŸaÄŸÄ±dakilerden hangisi durumunuzu en iyi aÃ§Ä±klÄ±yor?">
-<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarÄ±n Ä°nternet baÄŸlantÄ±sÄ± sansÃ¼rlÃ¼ ya da vekil sunucu arkasÄ±nda.">
+<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarÄ±n Internet baÄŸlantÄ±sÄ± sansÃ¼rlÃ¼ ya da vekil sunucu arkasÄ±nda.">
 <!ENTITY torSettings.configurePrompt2 "KÃ¶prÃ¼ ve yerel vekil sunucu ayarlarÄ±nÄ± yapmam gerekiyor.">
-<!ENTITY torSettings.configure "Ayarla">
+<!ENTITY torSettings.configure "YapÄ±landÄ±r">
 <!ENTITY torSettings.connectPrompt2 "DoÄŸrudan Tor aÄŸÄ±na baÄŸlanmak istiyorum.">
-<!ENTITY torSettings.connectPrompt3 "Ã‡oÄŸu durumda Ã§alÄ±ÅŸÄ±r.">
+<!ENTITY torSettings.connectPrompt3 "Bu Ã§oÄŸu durumda Ã§alÄ±ÅŸÄ±r.">
 <!ENTITY torSettings.connect "BaÄŸlan">
 
 <!ENTITY torSettings.proxyPageTitle "Yerel Vekil Sunucu AyarlarÄ±">
-<!ENTITY torSettings.proxyQuestion "Bu bilgisayarÄ±n Ä°nternet eriÅŸimi iÃ§in yerel bir vekil sunucu kullanmasÄ± gerekiyor mu?">
+<!ENTITY torSettings.proxyQuestion "Bu bilgisayarÄ±n Internet'e eriÅŸmesi iÃ§in bir yerel vekil sunucu kullanmasÄ± gerekiyor mu?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Bu soruyu nasÄ±l yanÄ±tlayacaÄŸÄ±nÄ±zÄ± bilmiyorsanÄ±z, baÅŸka bir tarayÄ±cÄ±da Ä°nternet ayarlarÄ±na bakarak yerel bir vekil sunucu kullanÄ±lÄ±p kullanÄ±lmadÄ±ÄŸÄ±nÄ± gÃ¶rÃ¼n.">
-<!ENTITY torSettings.enterProxy "Vekil sunucu ayarlarÄ±nÄ± yazÄ±n.">
+<!ENTITY torSettings.proxyHelp "Bu soruyu nasÄ±l yanÄ±tlayacaÄŸÄ±nÄ±zÄ± bilmiyorsanÄ±z, baÅŸka bir tarayÄ±cÄ±da Internet ayarlarÄ±na bakarak bir yerel vekil sunucu kullanÄ±lÄ±p kullanÄ±lmadÄ±ÄŸÄ±nÄ± gÃ¶rÃ¼n.">
+<!ENTITY torSettings.enterProxy "Vekil sunucu ayarlarÄ±nÄ± girin.">
 <!ENTITY torSettings.bridgePageTitle "Tor KÃ¶prÃ¼leri AyarlarÄ±">
-<!ENTITY torSettings.bridgeQuestion "Ä°nternet Servis SaÄŸlayÄ±cÄ±nÄ±z (ISS) Tor AÄŸÄ±na baÄŸlantÄ±larÄ± engelliyor ya da sansÃ¼rlÃ¼yor mu?">
-<!ENTITY torSettings.bridgeHelp "Bu soruyu nasÄ±l cevaplayacaÄŸÄ±nÄ±zdan emin deÄŸilseniz HayÄ±r seÃ§in.  Evet seÃ§erseniz, Tor AÄŸÄ± baÄŸlantÄ±larÄ±nÄ±n engellenmesini daha zor hale getiren, listelenmeyen aktarÄ±cÄ±lar olan Tor KÃ¶prÃ¼lerini ayarlamanÄ±z istenir.">
-<!ENTITY torSettings.bridgeSettingsPrompt "SaÄŸlanan kÃ¶prÃ¼ler kÃ¼mesini kullanabilir ya da Ã¶zel bir kÃ¶prÃ¼ kÃ¼mesi edinip yazabilirsiniz.">
+<!ENTITY torSettings.bridgeQuestion "Internet Servis SaÄŸlayÄ±cÄ±nÄ±z (ISS) Tor AÄŸÄ±na olan baÄŸlantÄ±larÄ± engelliyor ya da sansÃ¼rlÃ¼yor mu?">
+<!ENTITY torSettings.bridgeHelp "Bu soruyu nasÄ±l yanÄ±tlayacaÄŸÄ±nÄ±zÄ± bilmiyorsanÄ±z, HayÄ±r 'Ä± seÃ§in. Evet'i seÃ§erseniz, Tor AÄŸÄ± baÄŸlantÄ±larÄ±nÄ±n engellenmesini daha zor hale getiren, listelenmeyen aktarÄ±cÄ±lar olan Tor KÃ¶prÃ¼lerini ayarlamanÄ±z istenir.">
+<!ENTITY torSettings.bridgeSettingsPrompt "SaÄŸlanan kÃ¶prÃ¼leri kullanabilir ya da Ã¶zel kÃ¶prÃ¼ler edinip yazabilirsiniz.">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "Tor yazÄ±lÄ±mÄ±nÄ±n baÅŸlamasÄ± bekleniyor...">
-<!ENTITY torsettings.restartTor "Tor YazÄ±lÄ±mÄ±nÄ± Yeniden BaÅŸlat">
+<!ENTITY torsettings.startingTor "Tor'un baÅŸlamasÄ± bekleniyorâ€¦">
+<!ENTITY torsettings.restartTor "Tor'u Yeniden BaÅŸlat">
 
-<!ENTITY torsettings.optional "Ä°steÄŸe BaÄŸlÄ±">
+<!ENTITY torsettings.optional "Ä°steÄŸe baÄŸlÄ±">
 
-<!ENTITY torsettings.useProxy.checkbox "Bu bilgisayar Ä°nternet eriÅŸimi iÃ§in yerel bir vekil sunucu kullanÄ±yor.">
+<!ENTITY torsettings.useProxy.checkbox "Bu bilgisayarÄ±n Internet'e eriÅŸmesi iÃ§in bir yerel vekil sunucu kullanmasÄ± gerekiyor">
 <!ENTITY torsettings.useProxy.type "Vekil Sunucu Tipi:">
 <!ENTITY torsettings.useProxy.address "Adres:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adÄ±">
-<!ENTITY torsettings.useProxy.port "KapÄ±:">
+<!ENTITY torsettings.useProxy.port "BaÄŸlantÄ± noktasÄ±:">
 <!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 bilgisayar, yalnÄ±z belirli kapÄ±lara baÄŸlanma izin veren bir gÃ¼venlik duvarÄ± kullanÄ±yor ">
-<!ENTITY torsettings.firewall.allowedPorts "Ä°zin Verilen KapÄ±lar:">
-<!ENTITY torsettings.useBridges.checkbox "Ä°nternet Servis SaÄŸlayÄ±cÄ±m (Ä°SS) Tor AÄŸÄ± ile baÄŸlantÄ±larÄ±mÄ± engelliyor">
+<!ENTITY torsettings.firewall.checkbox "Bu bilgisayar yalnÄ±z belirli baÄŸlantÄ± noktalarÄ±na baÄŸlanmaya izin veren bir gÃ¼venlik duvarÄ± kullanÄ±yor">
+<!ENTITY torsettings.firewall.allowedPorts "Ä°zin Verilen BaÄŸlantÄ± NoktalarÄ±:">
+<!ENTITY torsettings.useBridges.checkbox "Internet Servis SaÄŸlayÄ±cÄ±m (ISS) Tor aÄŸÄ±na olan baÄŸlantÄ±larÄ± engelliyor">
 <!ENTITY torsettings.useBridges.default "SaÄŸlanan kÃ¶prÃ¼ler ile baÄŸlan">
 <!ENTITY torsettings.useBridges.type "AktarÄ±m tipi:">
 <!ENTITY torsettings.useBridges.custom "Ã–zel kÃ¶prÃ¼ler yazÄ±n">
-<!ENTITY torsettings.useBridges.label "Bir ya da bir kaÃ§ kÃ¶prÃ¼ aktarÄ±cÄ±sÄ± yazÄ±n (her satÄ±ra bir tane).">
-<!ENTITY torsettings.useBridges.placeholder "adres:kapÄ± ÅŸeklinde yazÄ±n">
+<!ENTITY torsettings.useBridges.label "Bir ya da birkaÃ§ kÃ¶prÃ¼ aktarÄ±cÄ±sÄ± yazÄ±n (her satÄ±ra bir tane).">
+<!ENTITY torsettings.useBridges.placeholder "adres:baÄŸlantÄ± noktasÄ± ÅŸeklinde yazÄ±n">
 
 <!ENTITY torsettings.copyLog "Tor GÃ¼nlÃ¼ÄŸÃ¼nÃ¼ Panoya Kopyala">
 <!ENTITY torsettings.bridgeHelpTitle "KÃ¶prÃ¼ AktarÄ±cÄ± YardÄ±mÄ±">
-<!ENTITY torsettings.bridgeHelp1 "Tor aÄŸÄ±na baÄŸlanamÄ±yorsanÄ±z, kullandÄ±ÄŸÄ±nÄ±z Ä°nternet Servis SaÄŸlayÄ±cÄ±sÄ± (ISS) veya baÅŸka bir kurum Tor yazÄ±lÄ±mÄ±nÄ± engelliyor olabilir.  Bu sorunu Ã§oÄŸunlukla, engellenmesi daha zor olan listelenmeyen aktarÄ±cÄ±lar, Tor KÃ¶prÃ¼lerini kullanarak Ã§Ã¶zebilirsiniz.">
-<!ENTITY torsettings.bridgeHelp1B "Ã–nceden ayarlanmÄ±ÅŸ ve sunulmuÅŸ kÃ¶prÃ¼ adresleri kÃ¼mesini kullanabilir ya da ÅŸu Ã¼Ã§ yÃ¶ntemden birini kullanarak Ã¶zel bir adres kÃ¼mesi edinebilirsiniz:">
+<!ENTITY torsettings.bridgeHelp1 "Tor aÄŸÄ±na baÄŸlanamÄ±yorsanÄ±z, kullandÄ±ÄŸÄ±nÄ±z Internet Servis SaÄŸlayÄ±cÄ±sÄ± (ISS) ya da baÅŸka bir kurum Tor 'u engelliyor olabilir. Bu sorunu Ã§oÄŸunlukla, engellenmesi daha zor olan listelenmeyen aktarÄ±cÄ±lar, Tor KÃ¶prÃ¼lerini kullanarak Ã§Ã¶zebilirsiniz.">
+<!ENTITY torsettings.bridgeHelp1B "Ã–nceden ayarlanmÄ±ÅŸ ve sunulmuÅŸ kÃ¶prÃ¼ adreslerini kullanabilir ya da ÅŸu Ã¼Ã§ yÃ¶ntemden birini kullanarak Ã¶zel adresler edinebilirsiniz:">
 <!ENTITY torsettings.bridgeHelp2Heading "Web yoluyla">
-<!ENTITY torsettings.bridgeHelp2 "Web tarayÄ±cÄ±nÄ±z ile https://bridges.torproject.org sitesine bakÄ±n">
+<!ENTITY torsettings.bridgeHelp2 "Bir web tarayÄ±cÄ±sÄ± kullanarak https://bridges.torproject.org adresini ziyaret edin">
 <!ENTITY torsettings.bridgeHelp3Heading "Otomatik e-posta yanÄ±tÄ± yoluyla">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "bridges at torproject.org adresine, ileti iÃ§eriÄŸine yalnÄ±z 'get bridges' yazarak bir e-posta gÃ¶nderin.  Bir saldÄ±rganÄ±n Ã§ok sayÄ±da kÃ¶prÃ¼ adresi Ã¶ÄŸrenmesini zorlaÅŸtÄ±rmak iÃ§in bu e-postayÄ± aÅŸaÄŸÄ±daki e-posta saÄŸlayÄ±cÄ±larÄ±nÄ±n birinden yollmalÄ±sÄ±nÄ±z (yeÄŸlenme sÄ±rasÄ±na gÃ¶re listelenmiÅŸtir):">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ya da https://mail.yahoo.com">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "bridges at torproject.org adresine, ileti iÃ§eriÄŸine yalnÄ±z 'get bridges' yazarak bir e-posta gÃ¶nderin.  Bir saldÄ±rganÄ±n Ã§ok sayÄ±da kÃ¶prÃ¼ adresi Ã¶ÄŸrenmesini zorlaÅŸtÄ±rmak iÃ§in bu e-postayÄ± aÅŸaÄŸÄ±daki e-posta saÄŸlayÄ±cÄ±larÄ±nÄ±n birinden gÃ¶ndermelisiniz (yeÄŸlenme sÄ±rasÄ±na gÃ¶re listelenmiÅŸtir):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ya da https://mail.yahoo.com">
 <!ENTITY torsettings.bridgeHelp4Heading "YardÄ±m masasÄ± yoluyla">
 <!ENTITY torsettings.bridgeHelp4 "Son yol olarak, kÃ¶prÃ¼ adreslerini help at rt.torproject.org adresine gÃ¶ndereceÄŸiniz nazik bir e-posta ile isteyebilirsiniz.  Her isteÄŸi bir kiÅŸinin yanÄ±tlayacaÄŸÄ±nÄ± unutmayÄ±n.">
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index 3b88714..38b0740 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=Tor BaÅŸlatÄ±cÄ±
 
 torlauncher.tor_exited=Tor, beklenmedik ÅŸekilde sonlandÄ±. Bu durum Tor iÃ§inde ya da sisteminizdeki baÅŸka bir yazÄ±lÄ±mda bulunan bir hatadan ya da sorunlu bir donanÄ±mdan kaynaklanmÄ±ÅŸ olabilir. Yeniden baÅŸlatÄ±lana kadar Tor Browser hiÃ§bir web sitesine eriÅŸemeyecek. Sorun devam ederse lÃ¼tfen Tor GÃ¼nlÃ¼ÄŸÃ¼nÃ¼n bir kopyasÄ±nÄ± destek takÄ±mÄ±na gÃ¶nderin.
-torlauncher.tor_exited2=Tor yeniden baÅŸlatÄ±ldÄ±ÄŸÄ±nda tarayÄ±cÄ± sekmelerinizi kapatÄ±lmayacak.
+torlauncher.tor_exited2=Tor yeniden baÅŸlatÄ±ldÄ±ÄŸÄ±nda tarayÄ±cÄ± sekmeleriniz kapatÄ±lmayacak.
 torlauncher.tor_controlconn_failed=Tor denetim kapÄ±sÄ±na baÄŸlanÄ±lamadÄ±.
 torlauncher.tor_failed_to_start=Tor baÅŸlatÄ±lamadÄ±.
 torlauncher.tor_control_failed=Tor denetimi alÄ±namadÄ±.
@@ -21,16 +21,16 @@ torlauncher.failed_to_get_settings=Tor ayarlarÄ± alÄ±namadÄ±.\n\n%S
 torlauncher.failed_to_save_settings=Tor ayarlarÄ± kaydedilemedi.\n\n%S
 torlauncher.ensure_tor_is_running=LÃ¼tfen Tor'un Ã§alÄ±ÅŸtÄ±ÄŸÄ±ndan emin olun.
 
-torlauncher.error_proxy_addr_missing=Ä°nternete bir vekil sunucu Ã¼zerinden baÄŸlanmak iÃ§in bir IP adresi ya da sunucu adÄ± ile kapÄ± numarasÄ±nÄ±n yazÄ±lmasÄ± gereklidir.
+torlauncher.error_proxy_addr_missing=Internet'e bir vekil sunucu Ã¼zerinden baÄŸlanmak iÃ§in bir IP adresi ya da sunucu adÄ± ile baÄŸlantÄ± noktasÄ± numarasÄ±nÄ±n yazÄ±lmasÄ± gereklidir.
 torlauncher.error_proxy_type_missing=Vekil sunucu tipini seÃ§melisiniz.
-torlauncher.error_bridges_missing=Bir ya da bir kaÃ§ kÃ¶prÃ¼ belirtmelisiniz.
+torlauncher.error_bridges_missing=Bir ya da birkaÃ§ kÃ¶prÃ¼ belirtmelisiniz.
 torlauncher.error_default_bridges_type_missing=SaÄŸlanan kÃ¶prÃ¼ler iÃ§in bir aktarÄ±m tipi seÃ§melisiniz.
 torlauncher.error_bridge_bad_default_type=SaÄŸlanan kÃ¶prÃ¼ler %S aktarÄ±m tipi iÃ§in kullanÄ±lamÄ±yor. LÃ¼tfen ayarlarÄ±nÄ±zÄ± deÄŸiÅŸtirin.
 
 torlauncher.recommended_bridge=(Ã¶nerilir)
 
 torlauncher.connect=BaÄŸlan
-torlauncher.restart_tor=Tor YazÄ±lÄ±mÄ±nÄ± Yeniden BaÅŸlat
+torlauncher.restart_tor=Tor'u Yeniden BaÅŸlat
 torlauncher.quit=Ã‡Ä±k
 torlauncher.quit_win=Ã‡Ä±kÄ±ÅŸ
 torlauncher.done=TamamlandÄ±
@@ -50,7 +50,7 @@ torlauncher.bootstrapStatus.conn_or=Tor aÄŸÄ±na baÄŸlanÄ±lÄ±yor
 torlauncher.bootstrapStatus.handshake_or=Bir Tor devresi kuruluyor
 torlauncher.bootstrapStatus.done=Tor aÄŸÄ±na baÄŸlanÄ±ldÄ±!
 
-torlauncher.bootstrapWarning.done=tamam
+torlauncher.bootstrapWarning.done=bitti
 torlauncher.bootstrapWarning.connectrefused=baÄŸlantÄ± geri Ã§evrildi
 torlauncher.bootstrapWarning.misc=Ã§eÅŸitli
 torlauncher.bootstrapWarning.resourcelimit=kaynaklar yetersiz
diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd
index 1886481..a3468a9 100644
--- a/src/chrome/locale/uk/network-settings.dtd
+++ b/src/chrome/locale/uk/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "ÐŸÐµÑ€ÐµÐ´ Ñ‚Ð¸Ð¼, ÑÐº Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor, Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¾ Ð½Ð°Ð´Ð°Ñ‚Ð¸ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–ÑŽ Ð¿Ñ€Ð¾ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ Ð’Ð°ÑˆÐ¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€Ð°.">
diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd
index f9935d9..c055623 100644
--- a/src/chrome/locale/ur-PK/network-settings.dtd
+++ b/src/chrome/locale/ur-PK/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Ù¹ÙˆØ± Ù†ÛŒÙ¹ ÙˆØ±Ú© Ø³ÛŒÙ¹Ù†Ú¯Ø²">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
@@ -30,13 +34,13 @@
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ€¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
 
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "Ø§Ø®ØªÛŒØ§Ø±ÛŒ">
 
 <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
 <!ENTITY torsettings.useProxy.type "Proxy Type:">
 <!ENTITY torsettings.useProxy.address "Address:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port:">
+<!ENTITY torsettings.useProxy.port "Ù¾ÙˆØ±Ù¹:">
 <!ENTITY torsettings.useProxy.username "Username:">
 <!ENTITY torsettings.useProxy.password "Password:">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
diff --git a/src/chrome/locale/ur-PK/progress.dtd b/src/chrome/locale/ur-PK/progress.dtd
index 79ed2b6..09d3567 100644
--- a/src/chrome/locale/ur-PK/progress.dtd
+++ b/src/chrome/locale/ur-PK/progress.dtd
@@ -1,4 +1,5 @@
-<!ENTITY torprogress.dialog.title "Ù¹ÙˆØ± Ø§Ø³Ù¹ÛŒÙ¹Ø³">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.dialog.title "Ù¹Ø§Ø± Ø§Ø³Ù¹ÛŒÙ¹Ø³">
+<!ENTITY torprogress.openSettings "ØªØ±ØªÛŒØ¨Ø§Øª Ú©Ú¾ÙˆÙ„ÛŒÚº">
+<!ENTITY torprogress.heading "Ù¹Ø§Ø± Ù†ÛŒÙ¹ ÙˆØ±Ú©Ø³ Ø³Û’ Ø±Ø§Ø¨Ø·Û Ø¨Ù†Ø§Ø¦ÛŒÚº">
+<!ENTITY torprogress.pleaseWait "Ø¨Ø±Ø§Ø¦Û’ Ù…ÛØ±Ø¨Ø§Ù†ÛŒ Ø§Ù†ØªØ¸Ø§Ø± ÙØ±Ù…Ø§Ø¦ÛŒÚº
+ÛÙ… Ø§Ù“Ù¾ Ú©Ø§ Ø±Ø§Ø¨Ø·Û Ù¹Ø§Ø± Ù†ÛŒÙ¹ ÙˆØ±Ú© Ú©Û’ Ø³Ø§ØªÚ¾ Ú©Ø± Ø±ÛÛŒÚº">
diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties
index 8ac7270..f5a81fc 100644
--- a/src/chrome/locale/ur-PK/torlauncher.properties
+++ b/src/chrome/locale/ur-PK/torlauncher.properties
@@ -46,7 +46,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status
 torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
 torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
 torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
+torlauncher.bootstrapStatus.conn_or=Ù¹Ø§Ø± Ù†ÛŒÙ¹ ÙˆØ±Ú©Ø³ Ø³Û’ Ø±Ø§Ø¨Ø·Û Ø¨Ù†Ø§Ø¦ÛŒÚº
 torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
 torlauncher.bootstrapStatus.done=Connected to the Tor network!
 
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd
index 05b4faa..e6db699 100644
--- a/src/chrome/locale/uz/network-settings.dtd
+++ b/src/chrome/locale/uz/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor tarmoq moslamalari">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/ve/network-settings.dtd
+++ b/src/chrome/locale/ve/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index 5af908c..64e6fcb 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "CÃ i Ä‘áº·t máº¡ng Tor">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "TrÆ°á»›c khi káº¿t ná»‘i Ä‘áº¿n máº¡ng lÆ°á»›i Tor, báº¡n cáº§n pháº£i cung cáº¥p thÃ´ng tin vá» káº¿t ná»‘i Internet cá»§a mÃ¡y tÃnh nÃ y.">
@@ -45,9 +49,9 @@
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
 <!ENTITY torsettings.firewall.allowedPorts "Nhá»¯ng Cá»•ng ÄÆ°á»£c phÃ©p:">
 <!ENTITY torsettings.useBridges.checkbox "NhÃ  cung cáº¥p dá»‹ch vá»¥ cá»§a tÃ´i (ISP) Ä‘Ã£ cháº·n káº¿t ná»‘i Ä‘áº¿n máº¡ng Tor">
-<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.type "Transport type:">
-<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
+<!ENTITY torsettings.useBridges.default "Káº¿t ná»‘i vá»›i nhá»¯ng cáº§u Ä‘Æ°á»£c cung cáº¥p">
+<!ENTITY torsettings.useBridges.type "Loáº¡i hÃ¬nh váºn chuyá»ƒn:">
+<!ENTITY torsettings.useBridges.custom "Nháºp nhá»¯ng cáº§u quen thuá»™c">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
 <!ENTITY torsettings.useBridges.placeholder "type address:port">
 
diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties
index 4ced031..e5d7acd 100644
--- a/src/chrome/locale/vi/torlauncher.properties
+++ b/src/chrome/locale/vi/torlauncher.properties
@@ -58,4 +58,4 @@ torlauncher.bootstrapWarning.identity=nháºn dáº¡ng khÃ´ng phÃ¹ há»£p
 torlauncher.bootstrapWarning.timeout=káº¿t ná»‘i timeout
 torlauncher.bootstrapWarning.noroute=khÃ´ng cÃ³ lá»™ trÃ¬nh Ä‘á»ƒ lÆ°u trá»¯
 torlauncher.bootstrapWarning.ioerror=lá»—i Ä‘á»c / ghi
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.pt_missing=pluggable transport bá»‹ máº¥t
diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/wa/network-settings.dtd
+++ b/src/chrome/locale/wa/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/wo/network-settings.dtd
+++ b/src/chrome/locale/wo/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index e0321b5..8afb952 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor ç½‘ç»œè®¾ç½®">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser è¯è¨€">
+<!ENTITY torlauncher.localePicker.prompt "è¯·é€‰æ‹©ä¸€ä¸ªè¯è¨€ã€‚">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "åœ¨è¿žæŽ¥ Tor ç½‘ç»œä¹‹å‰ï¼Œéœ€æä¾›ç›¸å…³çš„ç½‘ç»œè¿žæŽ¥ä¿¡æ¯ã€‚">
diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd
index cf33e0b..bcd5692 100644
--- a/src/chrome/locale/zh-HK/network-settings.dtd
+++ b/src/chrome/locale/zh-HK/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index 4cd2f87..d02b3f1 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor ç¶²è·¯è¨å®š">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "åœ¨æ‚¨é€£æŽ¥åˆ° Tor ç¶²è·¯å‰ï¼Œæ‚¨éœ€è¦æä¾›é€™å°é›»è…¦ç¶²è·¯é€£ç·šçš„ç›¸é—œè³‡è¨Š">
diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd
index 07d3d09..b193750 100644
--- a/src/chrome/locale/zu/network-settings.dtd
+++ b/src/chrome/locale/zu/network-settings.dtd
@@ -1,5 +1,9 @@
 <!ENTITY torsettings.dialog.title "Tor Network Settings">
 
+<!-- For locale picker: -->
+<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">

