[tor-commits] [tor-launcher/master] Update strings from transifex.

Sun Mar 16 02:37:32 UTC 2014

commit 51685778211bb0c9b51d2ac401fa4258efeac51b
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Sat Mar 15 19:36:28 2014 -0700

    Update strings from transifex.
---
 src/chrome/locale/ar/network-settings.dtd      |   31 +++++----
 src/chrome/locale/ar/progress.dtd              |    2 +-
 src/chrome/locale/ar/torlauncher.properties    |    9 ++-
 src/chrome/locale/de/network-settings.dtd      |   31 +++++----
 src/chrome/locale/de/progress.dtd              |    2 +-
 src/chrome/locale/de/torlauncher.properties    |   27 +++++---
 src/chrome/locale/es/network-settings.dtd      |   32 +++++----
 src/chrome/locale/es/progress.dtd              |    2 +-
 src/chrome/locale/es/torlauncher.properties    |   23 ++++---
 src/chrome/locale/eu/torlauncher.properties    |   33 +++++++++
 src/chrome/locale/fa/network-settings.dtd      |   44 ++++++------
 src/chrome/locale/fa/progress.dtd              |    2 +-
 src/chrome/locale/fa/torlauncher.properties    |   25 ++++---
 src/chrome/locale/fr/network-settings.dtd      |   33 +++++----
 src/chrome/locale/fr/progress.dtd              |    2 +-
 src/chrome/locale/fr/torlauncher.properties    |   19 ++++--
 src/chrome/locale/it/network-settings.dtd      |   31 +++++----
 src/chrome/locale/it/progress.dtd              |    2 +-
 src/chrome/locale/it/torlauncher.properties    |   11 ++-
 src/chrome/locale/ja/network-settings.dtd      |   35 +++++-----
 src/chrome/locale/ja/progress.dtd              |    2 +-
 src/chrome/locale/ja/torlauncher.properties    |   17 +++--
 src/chrome/locale/ko/network-settings.dtd      |   81 +++++++++++-----------
 src/chrome/locale/ko/progress.dtd              |    4 +-
 src/chrome/locale/ko/torlauncher.properties    |   45 +++++++------
 src/chrome/locale/nl/network-settings.dtd      |   31 +++++----
 src/chrome/locale/nl/progress.dtd              |    2 +-
 src/chrome/locale/nl/torlauncher.properties    |   11 ++-
 src/chrome/locale/pl/network-settings.dtd      |   31 +++++----
 src/chrome/locale/pl/progress.dtd              |    2 +-
 src/chrome/locale/pl/torlauncher.properties    |   11 ++-
 src/chrome/locale/pt/network-settings.dtd      |   31 +++++----
 src/chrome/locale/pt/progress.dtd              |    4 +-
 src/chrome/locale/pt/torlauncher.properties    |   59 ++++++++--------
 src/chrome/locale/ru/network-settings.dtd      |   31 +++++----
 src/chrome/locale/ru/progress.dtd              |    2 +-
 src/chrome/locale/ru/torlauncher.properties    |    9 ++-
 src/chrome/locale/sv/torlauncher.properties    |   59 ++++++++++++----
 src/chrome/locale/vi/network-settings.dtd      |   85 +++++++++++++-----------
 src/chrome/locale/vi/progress.dtd              |    6 +-
 src/chrome/locale/vi/torlauncher.properties    |   29 ++++----
 src/chrome/locale/zh-CN/network-settings.dtd   |   31 +++++----
 src/chrome/locale/zh-CN/progress.dtd           |    2 +-
 src/chrome/locale/zh-CN/torlauncher.properties |   29 ++++----
 44 files changed, 609 insertions(+), 401 deletions(-)

diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index fda8d64..b3f0dca 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Ù‚Ø¨Ù„ Ø§Ù† ØªØØ§ÙˆÙ„ ØØ²Ù…Ø© Ù…ØªØµÙØ ØªÙˆØ± Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±ØŒ ØªØØªØ§Ø¬ Ø¥Ù„Ù‰ ØªÙˆÙÙŠØ± Ø¨Ø¹Ø¶ Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø¹Ù† Ø§ØªØµØ§Ù„ Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡Ø°Ø§ Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ±.">
+<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
 <!ENTITY torSettings.yes "Ù†Ø¹Ù…">
 <!ENTITY torSettings.no "Ù„Ø§">
 
 <!ENTITY torSettings.firstQuestion "Ø£ÙŠ Ù…Ù…Ø§ ÙŠÙ„ÙŠ ÙŠØ¹ØªØ¨Ø± ÙˆØµÙ Ø§ÙØ¶Ù„ Ù„Ù…ÙˆÙ‚ÙÙƒØŸ">
 <!ENTITY torSettings.configurePrompt1 " Ø§ØªØµØ§Ù„ Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ù„Ù‡Ø°Ø§ Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± Ù…ÙØ±Ø§Ù‚Ø¨ØŒ Ø£Ùˆ Ù…ØµÙÙ‰ØŒ Ø£Ùˆ ÙŠØ¹Ù…Ù„ Ø¨Ø¨Ø±ÙˆÙƒØ³ÙŠ.">
-<!ENTITY torSettings.configurePrompt2 "Ø£ØØªØ§Ø¬ Ø¥Ù„ÙŠ ØªÙƒÙˆÙŠÙ† Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø´Ø¨ÙƒØ©.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
 <!ENTITY torSettings.configure "ØªÙƒÙˆÙŠÙ†">
 <!ENTITY torSettings.connectPrompt2 "Ø£ÙˆØ¯ Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¨Ø§Ø´Ø±Ø© Ø¥Ù„Ù‰ Ø´Ø¨ÙƒØ© ØªÙˆØ±.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Ø§ØªØµÙ„">
 
 <!ENTITY torSettings.proxyQuestion "Ù‡Ù„ ÙŠØØªØ§Ø¬ Ù‡Ø°Ø§ Ø§Ù„Ø¬Ù‡Ø§Ø² Ø¥Ù„ÙŠ Ø¨Ø±ÙˆÙƒØ³ÙŠ ØØªÙŠ ÙŠØµÙ„ Ø¥Ù„ÙŠ Ø´Ø¨ÙƒØ© Ø§Ù„Ø¥Ù†ØªØ±Ù†ØªØŸ">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "Ù‡Ù„ Ø§ØªØµØ§Ù„ Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ù„Ù‡Ø°Ø§ Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± ÙŠÙ…Ø± Ø¨Ø¬Ø¯Ø§Ø± ØÙ…Ø§ÙŠØ© ÙŠØ³Ù…Ø Ø¨Ø§Ù„Ø§ØªØµØ§Ù„ ÙÙ‚Ø· Ù…Ù† Ø®Ù„Ø§Ù„ Ù…Ù†Ø§ÙØ° Ù…Ø¹ÙŠÙ†Ø©ØŸ">
 <!ENTITY torSettings.firewallHelp "Ø¥Ø°Ø§ Ù„Ù… ØªÙƒÙ† Ù…ØªØ£ÙƒØ¯Ø§ Ù…Ù† ÙƒÙŠÙÙŠØ© Ø§Ù„Ø¥Ø¬Ø§Ø¨Ø© Ø¹Ù„Ù‰ Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¤Ø§Ù„ØŒ Ø§Ø®ØªØ§Ø± Ù„Ø§. Ø¥Ø°Ø§ ÙˆØ§Ø¬Ù‡ØªÙƒ Ù…Ø´Ø§ÙƒÙ„ ÙÙŠ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±, ØºÙŠÙŠØ± Ù‡Ø°Ø§ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯.">
 <!ENTITY torSettings.enterFirewall "Ø¥Ø¯Ø®Ù„ Ù‚Ø§Ø¦Ù…Ø© Ù…ÙØµÙˆÙ„Ø© Ø¨ÙÙˆØ§ØµÙ„ Ù…Ù† Ø§Ù„Ù…Ù†Ø§ÙØ° Ø§Ù„ØªÙŠ ÙŠØ³Ù…Ø Ø¨Ù‡Ø§ Ø¬Ø¯Ø§Ø± Ø§Ù„ØÙ…Ø§ÙŠØ©.">
-<!ENTITY torSettings.bridgeQuestion "Ø¥Ø°Ø§ ÙƒØ§Ù† Ø§ØªØµØ§Ù„ Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ù„Ù‡Ø°Ø§ Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± Ù…ÙØ±Ø§Ù‚Ø¨ØŒ Ø³ÙˆÙ ØªØØªØ§Ø¬ Ø¥Ù„Ù‰ Ø§Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ ÙˆØ§Ø³ØªØ®Ø¯Ø§Ù… Ø¬Ø³ÙˆØ±. Ø¥Ø°Ø§ Ù„Ù… ÙŠÙƒÙ† Ù…ÙØ±Ø§Ù‚Ø¨ØŒ Ø§Ø¶ØºØ· Ø§ØªØµÙ„.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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: -->
 
@@ -44,16 +46,19 @@
 <!ENTITY torsettings.firewall.checkbox "Ø§ØªØµØ§Ù„ Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ù„Ù‡Ø°Ø§ Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± ÙŠÙ…Ø± Ø¨Ø¬Ø¯Ø§Ø± ØÙ…Ø§ÙŠØ© ÙŠØ³Ù…Ø Ø¨Ø§Ù„Ø§ØªØµØ§Ù„ ÙÙ‚Ø· Ù…Ù† Ø®Ù„Ø§Ù„ Ù…Ù†Ø§ÙØ° Ù…Ø¹ÙŠÙ†Ø©">
 <!ENTITY torsettings.firewall.allowedPorts "Ø§Ù„Ù…Ù†Ø§ÙØ° Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§:">
 <!ENTITY torsettings.useBridges.checkbox "Ù…Ø²ÙˆØ¯ Ø®Ø¯Ù…Ø© Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ø§Ù„Ø®Ø§Øµ Ø¨ÙŠ (ISP) ÙŠÙ…Ù†Ø¹ Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±">
+<!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 "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
 
 <!ENTITY torsettings.copyLog "Ù†Ø³Ø® Ø³Ø¬Ù„ ØªÙˆØ± Ø¥Ù„ÙŠ Ø§Ù„ØØ§ÙØ¸Ø©">
 <!ENTITY torsettings.bridgeHelpTitle "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø© Ø§Ù„Ø®Ø§ØµØ© Ø¨Ø§Ù„Ø¬Ø³ÙˆØ± Ø§Ù„Ù…ÙØ±ØÙ„Ø©">
-<!ENTITY torsettings.bridgeHelp1 "Ù‚Ø¯ ÙŠÙƒÙˆÙ† Ø§Ù„Ø³Ø¨Ø¨ ÙÙŠ Ø¹Ø¯Ù… Ù‚Ø¯Ø±ØªÙƒ Ø¹Ù„ÙŠ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±Ù‡Ùˆ Ø§Ù† Ù…Ø²ÙˆØ¯ Ø®Ø¯Ù…Ø© Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ (ISP) Ø£Ùˆ Ù…Ù†Ø¸Ù…Ø© Ø§Ø®Ø±ÙŠ ÙŠÙ…Ù†Ø¹ Ù…ØØ§ÙˆÙ„Ø§Øª Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±.   ÙˆØºØ§Ù„Ø¨Ø§Ù‹ØŒ ØªØ³ØªØ·ÙŠØ¹ ØªØ®Ø·ÙŠ Ù‡Ø°Ø§ Ø§Ù„Ù…Ù†Ø¹ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø¬Ø³ÙˆØ± ØªÙˆØ± Ùˆ Ø§Ù„Ø¬Ø³ÙˆØ± Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù† Ù…ÙØ±ØÙ„Ø§Øª Ù…Ø®ÙÙŠØ© ØµØ¹Ø¨ Ù…Ù†Ø¹Ù‡Ø§.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„ÙŠ Ø¨Ø¹Ø¶ Ø§Ù„Ø¬Ø³ÙˆØ±ØŒ Ø²Ø± Ù‡Ø°Ù‡ Ø§Ù„ØµÙØØ© Ù…Ù† Ø®Ù„Ø§Ù„ Ø§Ù„Ù…ØªØµÙØ: https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "ÙˆÙ‡Ù†Ø§Ùƒ Ø·Ø±ÙŠÙ‚Ø© Ø£Ø®Ø±Ù‰ Ù„Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø¹Ù†Ø§ÙˆÙŠÙ† Ø§Ù„Ø¬Ø³ÙˆØ± Ø§Ù„Ø¹Ø§Ù…Ø© ÙˆÙ‡ÙŠ Ø¥Ø±Ø³Ø§Ù„ Ø¨Ø±ÙŠØ¯ Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ø¥Ù„Ù‰ bridges at torproject.org ÙŠØØªÙˆÙŠ Ø¹Ù„ÙŠ 'get bridges' ÙÙŠ Ù‚Ù„Ø¨ Ø§Ù„Ø¨Ø±ÙŠØ¯.  Ùˆ ØØªÙŠ ØªØ¶Ù…Ù† ÙˆØµÙˆÙ„ Ø°Ù„Ùƒ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ù„Ù†Ø§ Ø¨Ù†Ø¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù… Ø¥Ù…Ø§ gmail.com Ø£Ùˆ Ø¥Ù…Ø§ yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "ÙŠÙ…ÙƒÙ†Ùƒ Ø¥ÙŠØ¶Ø§Ù‹ Ø·Ù„Ø¨ Ø§Ù„Ø¬Ø³ÙˆØ± ÙŠØ¥Ø±Ø³Ø§Ù„ Ø¨Ø±ÙŠØ¯ Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ø¥Ù„ÙŠ help at rt.torproject.org.">
+<!ENTITY torsettings.bridgeHelp1 "Ù‚Ø¯ ÙŠÙƒÙˆÙ† Ø§Ù„Ø³Ø¨Ø¨ ÙÙŠ Ø¹Ø¯Ù… Ù‚Ø¯Ø±ØªÙƒ Ø¹Ù„ÙŠ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±Ù‡Ùˆ Ø§Ù† Ù…Ø²ÙˆØ¯ Ø®Ø¯Ù…Ø© Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ (ISP) Ø£Ùˆ Ù…Ù†Ø¸Ù…Ø© Ø§Ø®Ø±ÙŠ ÙŠÙ…Ù†Ø¹ Ù…ØØ§ÙˆÙ„Ø§Øª Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±. ÙˆØºØ§Ù„Ø¨Ø§Ù‹ØŒ ØªØ³ØªØ·ÙŠØ¹ ØªØ®Ø·ÙŠ Ù‡Ø°Ø§ Ø§Ù„Ù…Ù†Ø¹ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø¬Ø³ÙˆØ± ØªÙˆØ± Ùˆ Ø§Ù„Ø¬Ø³ÙˆØ± Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù† Ù…ÙØ±ØÙ„Ø§Øª Ù…Ø®ÙÙŠØ© ØµØ¹Ø¨ Ù…Ù†Ø¹Ù‡Ø§.">
+<!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 "Ø§Ø±Ø³Ù„ Ø¨Ø±ÙŠØ¯ Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ø¥Ù„Ù‰ bridges at torproject.org ÙŠØØªÙˆÙŠ Ø¹Ù„ÙŠ 'get bridges' ÙÙŠ Ù‚Ù„Ø¨ Ø§Ù„Ø¨Ø±ÙŠØ¯. Ùˆ ØØªÙŠ ØªØ¶Ù…Ù† ÙˆØµÙˆÙ„ Ø°Ù„Ùƒ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ù„Ù†Ø§ Ø¨Ù†Ø¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù… Ø¥Ù…Ø§ gmail.com Ø£Ùˆ 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.&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd
index 78ba7f0..e12a12f 100644
--- a/src/chrome/locale/ar/progress.dtd
+++ b/src/chrome/locale/ar/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "ØØ§Ù„Ø© ØªÙˆØ±">
 <!ENTITY torprogress.openSettings "Ø§ÙØªØ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª">
 <!ENTITY torprogress.heading "Ø¬Ø§Ø±ÙŠ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±">
-<!ENTITY torprogress.pleaseWait "Ø³ÙŠØªÙ… ÙØªØ Ù…ØªØµÙØ ØªÙˆØ± Ø¨Ø¹Ø¯ Ø¥Ù†Ø´Ø§Ø¡ Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties
index 5a94b58..06171de 100644
--- a/src/chrome/locale/ar/torlauncher.properties
+++ b/src/chrome/locale/ar/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=ØªÙˆÙ‚Ù ØªÙˆØ± Ø¹Ù† Ø§Ù„Ø¹Ù…Ù„ Ø¨Ø´ÙƒÙ„ ØºÙŠØ± Ù…ØªÙˆÙ‚
 torlauncher.please_restart_app=ÙŠØ±Ø¬ÙŠ Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ Ù‡Ø°Ø§ Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬.
 torlauncher.tor_controlconn_failed=ØªØ¹Ø°Ø± Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ù…Ù†ÙØ° Ø§Ù„ØªØÙƒÙ… Ø§Ù„Ø®Ø§Øµ Ø¨ØªÙˆØ±.
 torlauncher.tor_failed_to_start=ØªÙˆØ± ÙØ´Ù„ ÙÙŠ Ø¨Ø¯Ø¡ Ø§Ù„ØªØ´ØºÙŠÙ„.
+torlauncher.tor_control_failed=ØªØ¹Ø°Ø± Ø§Ù„ØªØÙƒÙ… ÙÙŠ ØªÙˆØ±.
 torlauncher.tor_bootstrap_failed=ÙØ´Ù„ ØªÙˆØ± ÙÙŠ Ø¥Ù†Ø´Ø§Ø¡ Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±.
-torlauncher.tor_bootstrap_failed_details=%1$S ÙØ´Ù„ (%2$S).
+torlauncher.tor_bootstrap_failed_details=%1$S  ÙØ´Ù„(%2$S).
 
 torlauncher.unable_to_start_tor=ØºÙŠØ± Ù‚Ø§Ø¯Ø± Ø¹Ù„ÙŠ Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„ ØªÙˆØ±.\n\n%S
 torlauncher.tor_missing=Ø§Ù„Ù…Ù„Ù Ø§Ù„ØªÙ†ÙÙŠØ°ÙŠ Ù„ØªÙˆØ± Ù…ÙÙ‚ÙˆØ¯.
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„ØªØ£ÙƒØ¯ Ø£Ù† ØªÙˆØ± ÙŠØ¹Ù…Ù„
 torlauncher.error_proxy_addr_missing=Ù…Ù† Ø§Ù„Ø¶Ø±ÙˆØ±ÙŠ ØªØØ¯ÙŠØ¯ ÙƒÙ„ Ù…Ù† Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø§Ù†ØªØ±Ù†Øª IP Ø£Ùˆ Ø¹Ù†ÙˆØ§Ù† Ù…Ø³ØªØ¶ÙŠÙ ÙˆØ§ØØ¯ Ùˆ Ù…Ù†ÙØ° ÙˆØ°Ù„Ùƒ Ù„ØªÙ‡ÙŠØ¦Ø© ØªÙˆØ± Ù„Ø£Ø³ØªØ®Ø¯Ø§Ù… Ø¨Ø±ÙˆÙƒØ³ÙŠ ØØªÙŠ ÙŠØ³ØªØ·ÙŠØ¹ Ø§Ù„ÙˆØµÙˆÙ„ Ø¥Ù„ÙŠ Ø´Ø¨ÙƒØ© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. 
 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.recommended_bridge=(Ù…ÙˆØµÙ‰ Ø¨Ù‡)
 
 torlauncher.connect=Ø§ØªØµÙ„
 torlauncher.quit=Ø¥Ù†Ù‡Ø§Ø¡
@@ -38,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=ÙŠØÙ…Ù„ ØØ§Ù„Ø© Ø§Ù„Ø´Ø¨ÙƒØ©
 torlauncher.bootstrapStatus.loading_keys=ÙŠØÙ…Ù„ Ø´Ù‡Ø§Ø¯Ø§Øª Ø§Ù„Ø³Ù„Ø·Ø©
 torlauncher.bootstrapStatus.requesting_descriptors=ÙŠØ·Ù„Ø¨ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„ØªØÙˆÙŠÙ„Ø©
 torlauncher.bootstrapStatus.loading_descriptors=ÙŠØÙ…Ù„ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„ØªØÙˆÙŠÙ„Ø©
-torlauncher.bootstrapStatus.conn_or=ÙŠØªØµÙ„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±
+torlauncher.bootstrapStatus.conn_or=Ø¬Ø§Ø±ÙŠ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±
 torlauncher.bootstrapStatus.handshake_or=ÙŠÙ†Ø´Ø¦ Ø¯Ø§Ø¦Ø±Ø© ØªÙˆØ±
 torlauncher.bootstrapStatus.done=ØªÙ… Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±
 
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index 5621a3a..3275ec5 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Bevor das Tor-Browser-Paket versucht eine Verbindung zum Tor-Netzwerk herzustellen, mÃ¼ssen Sie Informationen Ã¼ber ihren Internetanschluss bereitstellen.">
+<!ENTITY torsettings.prompt "Bevor Sie sich zum Tor-Netzwerk verbinden kÃ¶nnen, mÃ¼ssen Sie Informationen Ã¼ber den Internetanschluss Ihres Rechners bereitstellen.">
 
 <!ENTITY torSettings.yes "Ja">
 <!ENTITY torSettings.no "Nein">
 
 <!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?">
 <!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert, gefiltert oder vermittelt.">
-<!ENTITY torSettings.configurePrompt2 "Ich muss die Netzwerkeinstellungen konfigurieren.">
+<!ENTITY torSettings.configurePrompt2 "Ich muss die Einstellungen der BrÃ¼cke, der Firewall oder des Vermittlungsservers einstellen.">
 <!ENTITY torSettings.configure "Konfigurieren">
 <!ENTITY torSettings.connectPrompt2 "Ich wÃ¼rde gerne direkt eine Verbindung zum Tor-Netzwerk herstellen.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "Das wird in den meisten Situationen funktionieren.">
 <!ENTITY torSettings.connect "Verbinden">
 
 <!ENTITY torSettings.proxyQuestion "BenÃ¶tigt dieser Rechner einen Vermittlungsserver um eine Verbindung zum Internet herzustellen?">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "Benutzt die Internetverbindung dieses Rechners eine Firewall, die nur Verbindungen zu bestimmten AnschlÃ¼ssen zulÃ¤sst?">
 <!ENTITY torSettings.firewallHelp "Wenn Sie sich nicht sicher sind, wÃ¤hlen Sie Nein. Wenn Sie dann Probleme haben eine Verbindung zum Tor-Netzwerk herzustellen, Ã¤ndern Sie diese Einstellung.">
 <!ENTITY torSettings.enterFirewall "Geben Sie hier die AnschlÃ¼sse ein, die von der Firewall erlaubt werden. Trennen Sie die AnschlÃ¼sse jeweils mit einem Komma.">
-<!ENTITY torSettings.bridgeQuestion "Sollte die Internetverbindung dieses Rechners zensiert werden, dann mÃ¼ssen Sie BrÃ¼ckenrelais benutzen.&#160; Falls nicht, klicken Sie einfach auf Verbinden.">
+<!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?">
+<!ENTITY torSettings.bridgeHelp "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, wÃ¤hlen Sie Nr.&#160; Wenn Sie Ja wÃ¤hlen, werden Sie aufgefordert, die TorbrÃ¼cken zu konfigurieren. Die nicht aufgefÃ¼hrte Relais sind, was es schwieriger macht, Verbindungen zum Tor-Netzwerk zu blockieren.">
+<!ENTITY torSettings.bridgeSettingsPrompt "Sie kÃ¶nne den bereitgestellten Satz an BrÃ¼cken verwenden oder Sie kÃ¶nnen welche erhalten, und geben einen benutzerdefinierten Satz an BrÃ¼cken ein.">
 
 <!-- Other: -->
 
@@ -44,16 +46,19 @@
 <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Rechner geht durch eine Firewall, die nur bestimmte AnschlÃ¼sse zulÃ¤sst">
 <!ENTITY torsettings.firewall.allowedPorts "Erlaubte AnschlÃ¼sse:">
 <!ENTITY torsettings.useBridges.checkbox "Mein Internetdienstanbieter (ISP) blockiert Verbindungen zum Tor-Netzwerk">
+<!ENTITY torsettings.useBridges.default "Mit bereitgestellten BrÃ¼cken verbinden ">
+<!ENTITY torsettings.useBridges.type "Transporttyp:">
+<!ENTITY torsettings.useBridges.custom "Benutzerdefinierte BrÃ¼cken eingeben">
 <!ENTITY torsettings.useBridges.label "Ein oder mehrere BrÃ¼ckenrelais eingeben (eins pro Zeile).">
-<!ENTITY torsettings.useBridges.placeholder "Adresse:Anschluss ODER Transportadresse:Anschluss">
+<!ENTITY torsettings.useBridges.placeholder "Typ Adresse:Anschluss">
 
 <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren">
 <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum BrÃ¼ckenrelais">
-<!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden kÃ¶nnen, ist es mÃ¶glich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.&#160; Dieses Problem kann meist mit der Benutzung von TorbrÃ¼cke umgangen werden, dieses sind versteckte Relais und damit schwerer zu blocken.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Um einige BrÃ¼ckenrelais zu erhalten, besuchen Sie mit einem Web-Browser folgende Seite: https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "Eine andere MÃ¶glichkeit Ã¶ffentliche BrÃ¼cken zu finden ist, eine E-Mail mit dem Inhalt Â»get bridgesÂ« an bridges at torproject.org zu schicken.&#160; Allerdings muss diese E-Mail, um es potentiellen Angreifern schwerer zu machen, von einer der folgenden Domains aus geschickt werden: gmail.com oder yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "BrÃ¼ckenrelais kÃ¶nnen auch mit Hilfe einer E-Mail an help at rt.torproject.org angefordert werden.">
+<!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden kÃ¶nnen, ist es mÃ¶glich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.&#160; Dieses Problem kann meist mit der Benutzung von TorbrÃ¼cken umgangen werden, das sind versteckte Relais und damit schwerer zu blocken.">
+<!ENTITY torsettings.bridgeHelp1B "Sie kÃ¶nnen den vorkonfigurierten und bereitgestellten Satz an BrÃ¼ckenadressen verwenden, oder Sie kÃ¶nnen einen benutzerdefinierten Satz von Adressen, mit einer dieser drei Methoden erhalten:">
+<!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet">
+<!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort">
+<!ENTITY torsettings.bridgeHelp3 "Schreiben Sie eine E-Mail an bridges at torproject.org mit dem Nachrichteninhalt Â»get bridgesÂ«.&#160; Doch um es schwieriger fÃ¼r einen Angreifer zu machen, eine Menge von BrÃ¼ckenadressen zu erfahren, mÃ¼ssen Sie diese Anfrage von einer gmail.com oder yahoo.com E-Mail-Adresse schicken.">
+<!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle">
+<!ENTITY torsettings.bridgeHelp4 "BrÃ¼ckenadressen kÃ¶nnen auch mit Hilfe einer hÃ¶flichen E-Mail an help at rt.torproject.org angefordert werden.&#160; Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss.">
diff --git a/src/chrome/locale/de/progress.dtd b/src/chrome/locale/de/progress.dtd
index 2f7e4b7..45bd6d6 100644
--- a/src/chrome/locale/de/progress.dtd
+++ b/src/chrome/locale/de/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor-Status">
 <!ENTITY torprogress.openSettings "Einstellungen Ã¶ffnen">
 <!ENTITY torprogress.heading "Mit dem Tor-Netzwerk verbinden">
-<!ENTITY torprogress.pleaseWait "Der Tor-Browser wird sich Ã¶ffnen, sobald eine Verbindung zum Tor-Netzwerk hergestellt ist.">
+<!ENTITY torprogress.pleaseWait "Bitte warten Sie wÃ¤hrend die Verbindung zum Tor-Netzwerk hergestellt wird.">
diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties
index e976c8e..bcbb64e 100644
--- a/src/chrome/locale/de/torlauncher.properties
+++ b/src/chrome/locale/de/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor wurde unerwartet geschlossen.
 torlauncher.please_restart_app=Bitte starten Sie die Anwendung neu.
 torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden.
 torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen.
+torlauncher.tor_control_failed=Fehler, die Kontrolle Ã¼ber Tor zu Ã¼bernehmen.
 torlauncher.tor_bootstrap_failed=Tor konnte keine Verbindung zum Tor-Netzwerk herstellen.
-torlauncher.tor_bootstrap_failed_details=%1$S fehlgeschlagen (%2$S).
+torlauncher.tor_bootstrap_failed_details=%1$S gescheitert (%2$S).
 
 torlauncher.unable_to_start_tor=Tor kann nicht gestartet werden.\n\n%S
 torlauncher.tor_missing=Die Tor-Programmdatei ist nicht vorhanden.
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Bitte stellen Sie sicher, dass Tor lÃ¤uft.
 torlauncher.error_proxy_addr_missing=Damit Tor einen Vermittlungsserver benutzt, um auf das Internet zuzugreifen, muss eine IP-Adresse oder ein Rechnername und eine Anschlussnummer angegeben werden.
 torlauncher.error_proxy_type_missing=Sie mÃ¼ssen eine Vermittlungstyp auswÃ¤hlen.
 torlauncher.error_bridges_missing=Sie mÃ¼ssen eine oder mehrere BrÃ¼cken eingeben.
+torlauncher.error_default_bridges_type_missing=Sie mÃ¼ssen eine Transporttyp fÃ¼r die bereitgestellten BrÃ¼cken auswÃ¤hlen.
+torlauncher.error_bridge_bad_default_type=Es sind keine bereitgestellten BrÃ¼cken verfÃ¼gbar, die den Transporttyp %S haben. Bitte passen Sie Ihre Einstellungen an.
+
+torlauncher.recommended_bridge=(empfohlen)
 
 torlauncher.connect=Verbinden
 torlauncher.quit=SchlieÃŸen
@@ -31,16 +36,16 @@ torlauncher.done=Fertig
 
 torlauncher.forAssistance=Falls Sie Hilfe benÃ¶tigen, kontaktieren Sie %S
 
-torlauncher.bootstrapStatus.conn_dir=Verbinde zu einem Verzeichnis
-torlauncher.bootstrapStatus.handshake_dir=Stelle eine verschlÃ¼sselte Verbindung zu einem Verzeichnis her
-torlauncher.bootstrapStatus.requesting_status=Erfrage Netzwerkstatusdatei
-torlauncher.bootstrapStatus.loading_status=Lade Netzwerkstatusdatei
-torlauncher.bootstrapStatus.loading_keys=Lade Zertifikate der zentralen Verzeichnisse
-torlauncher.bootstrapStatus.requesting_descriptors=Fordere Verteiler-Informationen an
-torlauncher.bootstrapStatus.loading_descriptors=Lade Verteiler-Informationen
-torlauncher.bootstrapStatus.conn_or=Verbinde zum Tor-Netzwerk
-torlauncher.bootstrapStatus.handshake_or=Erstelle einen Tor-Circuit
-torlauncher.bootstrapStatus.done=Verbindung zum Tor-Netzwerk hergestellt!
+torlauncher.bootstrapStatus.conn_dir=Zu einem Relaisverzeichnis wird verbunden
+torlauncher.bootstrapStatus.handshake_dir=Es wird eine verschlÃ¼sselte Verbindung zu einem Verzeichnis hergestellt
+torlauncher.bootstrapStatus.requesting_status=Netzwerkstatus wird abgerufen
+torlauncher.bootstrapStatus.loading_status=Netzwerkstatus wird geladen
+torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden geladen
+torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert
+torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen
+torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbinden
+torlauncher.bootstrapStatus.handshake_or=Tor-Verbindung wird hergestellt
+torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wird verbunden!
 
 torlauncher.bootstrapWarning.done=abgeschlossen
 torlauncher.bootstrapWarning.connectrefused=Verbindung verweigert
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index 28b0c9e..7b1a881 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Antes de que el Paquete de Navegador Tor intente conentar con la red Tor, necesitarÃ¡ proporcionar informaciÃ³n sobre la conexiÃ³n a Internet de su computadora.">
+<!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.">
 
 <!ENTITY torSettings.yes "SÃ">
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Â¿CuÃ¡l de las siguientes describe mejor su situaciÃ³n?">
 <!ENTITY torSettings.configurePrompt1 "La conexiÃ³n a Internet de esta computadora estÃ¡ censurada, filtrada o proxificada.">
-<!ENTITY torSettings.configurePrompt2 "Necesito configurar la opciones de red.">
+<!ENTITY torSettings.configurePrompt2 "Necesito configurar las preferencias de repetidor puente ('bridge'), cortafuegos ('firewall'), o proxy.">
 <!ENTITY torSettings.configure "Configurar">
 <!ENTITY torSettings.connectPrompt2 "Me gustarÃa conectar directamente a la red Tor.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "Esto funcionarÃ¡ en la mayorÃa de las situaciones.">
 <!ENTITY torSettings.connect "Conectar">
 
 <!ENTITY torSettings.proxyQuestion "Â¿Necesita usar un proxy de acceso a Internet esta computadora ?">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "Â¿Va la conexiÃ³n a Internet de esta computadora a travÃ©s de un cortafuegos ('firewall') que sÃ³lo permite conexiones a ciertos puertos?">
 <!ENTITY torSettings.firewallHelp "Si no estÃ¡ seguro de cÃ³mo responder a esta pregunta, elija No. Si encuentra problemas conectando a la red Tor, cambie esta configuraciÃ³n.">
 <!ENTITY torSettings.enterFirewall "Introduzca una lista de puertos separada por comas que estÃ© permitida por el cortafuegos ('firewall').">
-<!ENTITY torSettings.bridgeQuestion "Si la conexiÃ³n a Internet de esta computadora estÃ¡ censurada, necesitarÃ¡ obtener y usar repetidores puente ('bridge relays').&#160; Si no, simplemente haga clic en Conectar.">
+<!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?">
+<!ENTITY torSettings.bridgeHelp "Si no estÃ¡ seguro como responder a esta pregunta, elija No.&#160; Si usted elige SÃ, se le pedirÃ¡ configurar puentes Tor, los cuales son repetidores no listados que hacen mÃ¡s difÃcil el bloqueo de conexiones hacia la red Tor.">
+<!ENTITY torSettings.bridgeSettingsPrompt "Puede usar el juego de repetidores puente ('bridge') proporcionado, o puede obtener e introducir un juego de puentes personalizado.">
 
 <!-- Other: -->
 
@@ -44,16 +46,20 @@
 <!ENTITY torsettings.firewall.checkbox "Esta computadora va a travÃ©s de un cortafuegos ('firewall') que sÃ³lo permite conexiones a ciertos puertos">
 <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:">
 <!ENTITY torsettings.useBridges.checkbox "Mi Proveedor de Servicios de Internet (ISP) bloquea las conexiones a la red Tor">
+<!ENTITY torsettings.useBridges.default "Conectar con los puentes proporcionados">
+<!ENTITY torsettings.useBridges.type "Tipo de transporte:">
+<!ENTITY torsettings.useBridges.custom "Introducir puentes personalizados">
 <!ENTITY torsettings.useBridges.label "Introduzca uno o mÃ¡s repetidores puente ('bridge', uno por lÃnea).">
-<!ENTITY torsettings.useBridges.placeholder "direcciÃ³n:puerto O direcciÃ³n:puerto de transporte">
+<!ENTITY torsettings.useBridges.placeholder "ingrese direcciÃ³n:puerto">
 
 <!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles">
 <!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')">
-<!ENTITY torsettings.bridgeHelp1 "Si no es capaz de conectar con la red Tor, podrÃa ser que su Proveedor de Servicios de Internet (ISP), u otra agencia, estÃ© bloqueando Tor.&#160; A menudo puede evitar este problema usando puentes Tor ('bridges'), que son repetidores 'ocultos' mÃ¡s difÃciles de bloquear">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Para obtener algunas direcciones de puentes, utilice un navegador web para visitar la siguiente pÃ¡gina: ">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "Otra manera de encontrar direcciones de puentes ('bridges') pÃºblicas es mandar un correo a bridges at torproject.org con la lÃnea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para ponerle mÃ¡s difÃcil a un atacante conocer muchas direcciones de puentes, debe envÃar esta solicitud desde una direcciÃ³n de correo electrÃ³nico de uno de los siguientes dominios (con soporte DKIM): gmail.com o yahoo.com ">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "TambiÃ©n puede solicitar repetidores puente ('bridge relays') mandando un correo a help at rt.torproject.org">
+<!ENTITY torsettings.bridgeHelp1 "Si no puede conectar a la red Tor, podrÃa ser que su proveedor de servicios de Internet (ISP) u otra agencia, estÃ© bloqueando Tor.&#160; A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son publicitados, y es mÃ¡s difÃcil que sean bloqueados.">
+<!ENTITY torsettings.bridgeHelp1B "Puede usar el juego de direcciones de repetidores puente ('bridge') preconfigurado proporcionado, o puede obtener un juego de direcciones personalizado usando uno de estos tres mÃ©todos:">
+<!ENTITY torsettings.bridgeHelp2Heading "Mediante la web">
+<!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrÃ³nico automÃ¡tico">
+<!ENTITY torsettings.bridgeHelp3 "EnvÃe un correo a bridges at torproject.org con la lÃnea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para hacer mÃ¡s difÃcil a un atacante aprender muchas direcciones de puentes, ha de enviar esta solicitud desde una direcciÃ³n de correo de gmail.com o yahoo.com .">
+<!ENTITY torsettings.bridgeHelp4Heading "Mediante el gabinete de ayuda">
+<!ENTITY torsettings.bridgeHelp4 "Como Ãºltimo recurso, puede pedir direcciones de repetidores puente enviando un cortÃ©s mensaje de correo a help at rt.torproject.org .&#160;
+Por favor observe que es una persona la que tendrÃ¡ que responder a cada peticiÃ³n.">
diff --git a/src/chrome/locale/es/progress.dtd b/src/chrome/locale/es/progress.dtd
index 81d5fb0..c07d8fb 100644
--- a/src/chrome/locale/es/progress.dtd
+++ b/src/chrome/locale/es/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado de Tor">
 <!ENTITY torprogress.openSettings "Abrir Preferencias">
 <!ENTITY torprogress.heading "Conectando a la red Tor">
-<!ENTITY torprogress.pleaseWait "El Navegador Tor se abrirÃ¡ despuÃ©s de que sea establecida una conexiÃ³n con la red Tor.">
+<!ENTITY torprogress.pleaseWait "Por favor, espere mientras se establece una conexiÃ³n con la red Tor.">
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties
index c58c94f..9739b50 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor se cerrÃ³ inesperadamente.
 torlauncher.please_restart_app=Por favor reinicie esta aplicaciÃ³n.
 torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor
 torlauncher.tor_failed_to_start=Tor no pudo iniciarse.
-torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexiÃ³n de red Tor.
+torlauncher.tor_control_failed=Fallo al tomar control de Tor.
+torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexiÃ³n a la red Tor.
 torlauncher.tor_bootstrap_failed_details=%1$S fallÃ³ (%2$S).
 
 torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor, asegÃºrese de que Tor se estÃ¡ ejec
 torlauncher.error_proxy_addr_missing=Debe especificar tanto una direcciÃ³n IP o nombre de mÃ¡quina ('hostname') como un nÃºmero de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet.
 torlauncher.error_proxy_type_missing=Debe seleccionar el tipo de 'proxy'.
 torlauncher.error_bridges_missing=Debe especificar uno o mÃ¡s puentes ('bridges').
+torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados.
+torlauncher.error_bridge_bad_default_type=No hay disponible ningÃºn repetidor puente proporcionado que tenga el tipo de transporte %S. Por favor ajuste sus preferencias.
+
+torlauncher.recommended_bridge=(recomendado)
 
 torlauncher.connect=Conectar
 torlauncher.quit=Salir
@@ -31,22 +36,22 @@ torlauncher.done=Listo
 
 torlauncher.forAssistance=Para obtener ayuda, contacte con %S
 
-torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio repetidor
-torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexiÃ³n encriptada con el directorio
-torlauncher.bootstrapStatus.requesting_status=Recuperando el estado de la red
+torlauncher.bootstrapStatus.conn_dir=Conectando a un repositorio ('Directory') de repetidores ('relays')
+torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexiÃ³n cifrada con el repositorio de repetidores
+torlauncher.bootstrapStatus.requesting_status=Recopilando el estado de la red
 torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red
 torlauncher.bootstrapStatus.loading_keys=Cargando los certificados de autoridades
 torlauncher.bootstrapStatus.requesting_descriptors=Solicitando informaciÃ³n del repetidor
-torlauncher.bootstrapStatus.loading_descriptors=Cargando informaciÃ³n del repetidor
+torlauncher.bootstrapStatus.loading_descriptors=Cargando la informaciÃ³n del repetidor
 torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor
-torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor
+torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito a travÃ©s de Tor
 torlauncher.bootstrapStatus.done=Â¡Conectado a la red Tor!
 
 torlauncher.bootstrapWarning.done=terminado
 torlauncher.bootstrapWarning.connectrefused=conexiÃ³n rechazada
 torlauncher.bootstrapWarning.misc=miscelÃ¡nea
 torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes
-torlauncher.bootstrapWarning.identity=no hay coincidencia de identidad
+torlauncher.bootstrapWarning.identity=las identidades no coinciden
 torlauncher.bootstrapWarning.timeout=tiempo de espera de conexiÃ³n agotado
-torlauncher.bootstrapWarning.noroute=no hay ruta hacia el host
-torlauncher.bootstrapWarning.ioerror=error de escritura/lectura
+torlauncher.bootstrapWarning.noroute=no hay ruta hacia el servidor ('host')
+torlauncher.bootstrapWarning.ioerror=error de lectura/escritura
diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties
index 0f9d081..a104c27 100644
--- a/src/chrome/locale/eu/torlauncher.properties
+++ b/src/chrome/locale/eu/torlauncher.properties
@@ -1,8 +1,41 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.error_title=Tor abiarazlea
+
+torlauncher.tor_exited=Tor ustekabean irten da.
+torlauncher.please_restart_app=Mesedez aplikazio hau berrabiarazi ezazu.
+torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu.
+torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
+torlauncher.tor_bootstrap_failed=Torek huts egin du Tor sare konexio bat ezartzerakoan.
 torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S).
 
+torlauncher.unable_to_start_tor=Ezin izan da Tor hasi.\n\n%S
+torlauncher.tor_missing=Tor exekutagarria falta da.
+torlauncher.torrc_missing=torrc fitxategia falta da.
+torlauncher.datadir_missing=Tor datu direktorioa ez da existitzen.
+torlauncher.password_hash_missing=Huts egin du hash-eatutako pasahitza eskuratzen.
+
+torlauncher.failed_to_get_settings=Ezin izan dira Tor ezarpenak berreskuratu.\n\n%S
+torlauncher.failed_to_save_settings=Ezin izan dira Tor ezarpenak gorde.\n\n%S
+torlauncher.ensure_tor_is_running=Mesedez egiaztatu Tor exekutatzen ari dela.
+
+torlauncher.error_proxy_addr_missing=Torek proxy bat erabiliz Interneten sartzeko konfiguratu nahi baduzu edo IP helbidea edo ostalari-izena edo portu zenbakia zehaztu behar duzu.
+torlauncher.error_proxy_type_missing=Proxy mota hautatu behar duzu.
+torlauncher.error_bridges_missing=Zubi bat edo gehiago zehaztu behar duzu.
+# 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.recommended_bridge=(recommended)
+
+torlauncher.connect=Konektatu
+torlauncher.quit=Irten
+torlauncher.quit_win=Irten
+torlauncher.done=Eginda
+
+torlauncher.forAssistance=Laguntza lortzeko, %S(r)ekin harremanetan jarri
+
 torlauncher.bootstrapStatus.conn_dir=Errele direktorio batera konektatzen
 torlauncher.bootstrapStatus.handshake_dir=Enkriptatutako direktorio batera konexioa ezartzen
 torlauncher.bootstrapStatus.requesting_status=Sarearen egoera eskuratzen
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index d837426..8d1c25b 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -2,27 +2,29 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Ù¾ÛŒØ´ Ø§Ø² Ø¢ØºØ§Ø² Ø§ØªØµØ§Ù„ Ø¨Ø³ØªÙ‡ ØªÙˆØ± Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ±ØŒ Ù†ÛŒØ§Ø² Ø§Ø³Øª Ø´Ù…Ø§ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ Ø¯Ø±Ø¨Ø§Ø±Ù‡ Ø§ØªØµØ§Ù„ Ø§ÛŒÙ†ØªØ±Ù†Øª Ø§ÛŒÙ† Ø±Ø§ÛŒØ§Ù†Ù‡ Ø§Ø±Ø§Ø¦Ù‡ Ú©Ù†ÛŒØ¯">
+<!ENTITY torsettings.prompt "Ù‚Ø¨Ù„ Ø§Ø² Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ±ØŒ Ø¨Ø§ÛŒØ¯ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ Ø§Ø² Ù†ØÙˆÙ‡ Ø§ØªØµØ§Ù„ Ø§ÛŒÙ† Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø¨Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª ÙØ±Ø§Ù‡Ù… Ú©Ù†ÛŒØ¯.">
 
 <!ENTITY torSettings.yes "Ø¨Ù„Ù‡">
 <!ENTITY torSettings.no "Ù†Ù‡">
 
 <!ENTITY torSettings.firstQuestion "Ú©Ø¯Ø§Ù… ÛŒÚ© Ø§Ø² Ù…ÙˆØ§Ø±Ø¯ Ø²ÛŒØ± ÙˆØ¶Ø¹ÛŒØª Ø´Ù…Ø§ Ø±Ø§ Ø¨Ù‡ØªØ± Ø¨ÛŒØ§Ù† Ù…ÛŒâ€ŒÚ©Ù†Ø¯ØŸ">
 <!ENTITY torSettings.configurePrompt1 "Ø§ÛŒÙ†ØªØ±Ù†Øª Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ø¯Ø± Ø§ÛŒÙ† Ø±Ø§ÛŒØ§Ù†Ù‡ Ù‡Ø§ Ø³Ø§Ù†Ø³ÙˆØ± Ø´Ø¯Ù‡Ù«ÙÛŒÙ„ØªØ± Ø´Ø¯Ù‡ Ùˆ ÛŒØ§ Ø¹Ø¨ÙˆØ± Ú©Ø±Ø¯Ù‡ Ø§Ø² Ø±ÙˆÛŒ Ù¾Ø±Ø§Ú©Ø³ÛŒ Ù…ÛŒ Ø¨Ø§Ø´Ù†Ø¯.">
-<!ENTITY torSettings.configurePrompt2 "Ù…Ù† Ù†ÛŒØ§Ø² Ø¨Ù‡ ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø´Ø¨Ú©Ù‡ Ø¯Ø§Ø±Ù….">
+<!ENTITY torSettings.configurePrompt2 "Ù…Ù† Ù†ÛŒØ§Ø² Ø¯Ø§Ø±Ù… Ú©Ù‡ Â«Ù¾Ù„ Ù‡Ø§Â»ØŒ Â«Ù¾Ø±ÙˆÚ©Ø³ÛŒÂ» Ùˆ ÛŒØ§ Â«ÙØ§ÛŒØ±ÙˆØ§Ù„Â» Ø±Ø§ ØªÙ†Ø¸ÛŒÙ… Ú©Ù†Ù….">
 <!ENTITY torSettings.configure "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ">
 <!ENTITY torSettings.connectPrompt2 "ØªÙ…Ø§ÛŒÙ„ Ø¯Ø§Ø±Ù… Ù…Ø³ØªÙ‚ÛŒÙ…Ø§ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡â€ŒÛŒ ØªÙˆØ± Ù…ØªØµÙ„ Ø´ÙˆÙ….">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "Ø§ÛŒÙ† Ø¯Ø± Ø¨ÛŒØ´ØªØ± Ù…ÙˆØ§Ù‚Ø¹ Ú©Ø§Ø± Ø®ÙˆØ§Ù‡Ø¯ Ú©Ø±Ø¯.">
 <!ENTITY torSettings.connect "Ø§ØªØµØ§Ù„">
 
 <!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 proxy.">
+<!ENTITY torSettings.proxyHelp "Ø§Ú¯Ø± Ù…Ø·Ù…Ø¦Ù† Ù†ÛŒØ³ØªÛŒØ¯ Ú†Ø·ÙˆØ± Ø¨Ù‡ Ø§Ø³Ù† Ø³ÙˆØ§Ù„ Ù¾Ø§Ø³Ø® Ø¯Ù‡ÛŒØ¯ØŒ Ø¨Ù‡ ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø³Ø§ÛŒØ± Ù…Ø±ÙˆØ±Ú¯Ø±Ù‡Ø§ÛŒ Ø®ÙˆØ¯ Ù†Ú¯Ø§Ù‡ÛŒ Ø¨ÛŒØ§Ù†Ø¯Ø§Ø²ÛŒØ¯ ØªØ§ Ù…ØªÙˆØ¬Ù‡ Ø´ÙˆÛŒØ¯ Ú©Ù‡ Ø¢ÛŒØ§ Ø¨Ø§ÛŒØ¯ ÛŒÚ© Ù¾Ø±ÙˆÚ©Ø³ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø´ÙˆØ¯ ÛŒØ§ Ø®ÛŒØ±.">
 <!ENTITY torSettings.enterProxy "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ù¾Ø±Ø§Ú©Ø³ÛŒ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.firewallQuestion "Ø¢ÛŒØ§ Ø¯Ø± Ù…Ø³ÛŒØ± Ø§Ø±ØªØ¨Ø§Ø· Ø´Ù…Ø§ Ø¨Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª ÛŒÚ© ÙØ§ÛŒØ±ÙˆØ§Ù„ ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯ØŸ Ùˆ ÙÙ‚Ø· Ø§Ø¬Ø§Ø²Ù‡ Ø§ØªØµØ§Ù„ Ø§Ø² ÛŒÚ© Ø¯Ø±Ú¯Ø§Ù‡ Ø®Ø§Øµ Ø±Ø§ Ù…ÛŒ Ø¯Ù‡Ø¯ØŸ">
+<!ENTITY torSettings.firewallHelp "Ø§Ú¯Ø± Ù…Ø·Ù…Ø¦Ù† Ù†ÛŒØ³ØªÛŒØ¯ Ú†Ù‡ Ø¬ÙˆØ§Ø¨ÛŒ Ø¨Ù‡ Ø§ÛŒÙ† Ø³ÙˆØ§Ù„ Ø¯Ù‡ÛŒØ¯ØŒ Â«Ù†Ù‡Â» Ùˆ ÛŒØ§ Â«Ø®ÛŒØ±Â» Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. Ø³Ù¾Ø³ Ø§Ú¯Ø± Ù…Ø´Ú©Ù„ÛŒ Ø¯Ø± Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ø¯Ø§Ø´ØªÛŒØ¯ØŒ Ø§ÛŒÙ† Ù…ÙˆØ±Ø¯ Ø±Ø§ ØªØºÛŒÛŒØ± Ø¯Ù‡ÛŒØ¯.">
+<!ENTITY torSettings.enterFirewall "ÛŒÚ© Ù„ÛŒØ³Øª Ø¬Ø¯Ø§Ø´Ø¯Ù‡ Ø¨Ø§ ÙˆÛŒØ±Ú¯ÙˆÙ„ Ø§Ø² Ù¾ÙˆØ±Øªâ€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ ØªÙˆØ³Ø· ÙØ§ÛŒØ±ÙˆØ§Ù„ Ù…Ø¬Ø§Ø² Ù‡Ø³ØªÙ†Ø¯.">
+<!ENTITY torSettings.bridgeQuestion "Ø¢ÛŒØ§ Ø´Ø±Ú©ØªÛŒ Ú©Ù‡ Ø§Ø² Ø¢Ù† Ø§ÛŒÙ†ØªØ±Ù†Øª Ú¯Ø±ÙØªÙ‡ Ø§ÛŒØ¯ (ISP)ØŒ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ø±Ø§ ÙÛŒÙ„ØªØ±ØŒ Ø³Ø§Ù†Ø³ÙˆØ± Ùˆ ÛŒØ§ Ù…Ø³Ø¯ÙˆØ¯ Ù…ÛŒ Ú©Ù†Ø¯ØŸ">
+<!ENTITY torSettings.bridgeHelp "Ø§Ú¯Ø± Ù…Ø·Ù…Ø¦Ù† Ù†ÛŒØ³ØªÛŒØ¯ Ú†Ø·ÙˆØ± Ø¨Ù‡ Ø§ÛŒÙ† Ø³ÙˆØ§Ù„ Ù¾Ø§Ø³Ø® Ø¯Ù‡ÛŒØ¯ØŒ Â«Ù†Ù‡Â» ÛŒØ§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯.&#160; Ø§Ú¯Ø± Â«Ø¨Ù„Ù‡Â» Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯ØŒ Ù…ÛŒ Ø¨Ø§ÛŒØ³Øª ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Â«Ù¾Ù„ Ù‡Ø§ÛŒÂ» ØªÙˆØ± Ø±Ø§ Ø§Ù†Ø¬Ø§Ù… Ø¯Ù‡ÛŒØ¯. Ù¾Ù„ Ù‡Ø§ Ù…Ø³ÛŒØ±Ù‡Ø§ÛŒ Ø¯ÙˆØ± Ø²Ø¯Ù† ÙÛŒÙ„ØªØ± Ù‡Ø³ØªÙ†Ø¯ Ú©Ù‡ Ù„ÛŒØ³Øª Ù…Ø´Ø®ØµÛŒ Ø§Ø² Ø¢Ù† Ù‡Ø§ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯ Ùˆ ÙÛŒÙ„ØªØ± Ú©Ø±Ø¯Ù† Ø¢Ù† Ù‡Ø§ Ø¨Ø³ÛŒØ§Ø± Ù…Ø´Ú©Ù„ Ø§Ø³Øª.">
+<!ENTITY torSettings.bridgeSettingsPrompt "Ø´Ù…Ø§ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø§Ø² Ù…Ø¬Ù…ÙˆØ¹Ù‡â€ŒØ§ÛŒ Ø§Ø² Ù¾Ù„â€ŒÙ‡Ø§ÛŒ Ø¢Ù…Ø§Ø¯Ù‡ Ùˆ ÛŒØ§ Ù¾Ù„â€ŒÙ‡Ø§ÛŒ Ø´Ø®ØµÛŒ Ø®ÙˆØ¯ØªØ§Ù† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯.">
 
 <!-- Other: -->
 
@@ -34,26 +36,30 @@
 <!ENTITY torsettings.useProxy.checkbox "Ø§ÛŒÙ† Ø±Ø§ÛŒØ§Ù†Ù‡ Ø¨Ø±Ø§ÛŒ Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª Ù†ÛŒØ§Ø² Ø¨Ù‡ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù¾Ø±Ø§Ú©Ø³ÛŒ Ø¯Ø§Ø±Ø¯.">
 <!ENTITY torsettings.useProxy.type "Ù†ÙˆØ¹ Ù¾Ø±Ø§Ú©Ø³ÛŒ:">
 <!ENTITY torsettings.useProxy.address "Ø¢Ø¯Ø±Ø³:">
-<!ENTITY torsettings.useProxy.address.placeholder "Ø¢Ø¯Ø±Ø³ Ø¢ÛŒ Ù¾ÛŒ ÛŒØ§ Ù†Ø§Ù… Ù…ÛŒØ²Ø¨Ø§Ù†">
+<!ENTITY torsettings.useProxy.address.placeholder "Ø¢Ø¯Ø±Ø³ Ø¢ÛŒâ€ŒÙ¾ÛŒ ÛŒØ§ Ù†Ø§Ù… Ù…ÛŒØ²Ø¨Ø§Ù†">
 <!ENTITY torsettings.useProxy.port "Ù¾ÙˆØ±Øª:">
 <!ENTITY torsettings.useProxy.username "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ:">
 <!ENTITY torsettings.useProxy.password "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±">
 <!ENTITY torsettings.useProxy.type.socks4 "Ø³Ø§Ú©Ø³ Û´">
 <!ENTITY torsettings.useProxy.type.socks5 "Ø³Ø§Ú©Ø³ Ûµ">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
+<!ENTITY torsettings.firewall.checkbox "Ø¨Ù‡ Ù†Ø¸Ø± Ù…ÛŒ Ø±Ø³Ø¯ Ø´Ø¨Ú©Ù‡ Ø§Ø±ØªØ¨Ø§Ø·ÛŒ Ø´Ù…Ø§ Ø¨Ù‡ Ø§ÛŒÙ†ØªØ±Ù†ØªØŒ Ø§Ø² ÛŒÚ© ÙØ§ÛŒØ±ÙˆØ§Ù„ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù…ÛŒ Ú©Ù†Ø¯. ÛŒØ¹Ù†ÛŒ ÙÙ‚Ø· Ø§Ø¬Ø§Ø²Ù‡ Ø§ØªØµØ§Ù„ Ø§Ø² ÛŒÚ© Ø³Ø±ÛŒ Ø¯Ø±Ú¯Ø§Ù‡ Ù‡Ø§ÛŒ Ø¨Ù‡ Ø®ØµÙˆØµ Ø±Ø§ Ù…ÛŒ Ø¯Ù‡Ø¯.">
 <!ENTITY torsettings.firewall.allowedPorts "Ù¾ÙˆØ±Øª Ù‡Ø§ÛŒ Ù…Ø¬Ø§Ø²:">
 <!ENTITY torsettings.useBridges.checkbox "â€«Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª (ISP) Ù…Ù† Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ø±Ø§ Ù…Ø³Ø¯ÙˆØ¯ Ù…ÛŒâ€ŒÚ©Ù†Ø¯.">
+<!ENTITY torsettings.useBridges.default "Ø§ØªØµØ§Ù„ Ø§Ø² Ø·Ø±ÛŒÙ‚ Ù¾Ù„â€ŒÙ‡Ø§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡">
+<!ENTITY torsettings.useBridges.type "Ù†ÙˆØ¹ Ø§Ù†ØªÙ‚Ø§Ù„:">
+<!ENTITY torsettings.useBridges.custom "Ù¾Ù„â€ŒÙ‡Ø§ÛŒ Ø´Ø®ØµÛŒ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯">
 <!ENTITY torsettings.useBridges.label "ÛŒÚ© ÛŒØ§ Ú†Ù†Ø¯ Ù¾Ù„ Ø§Ø±ØªØ¨Ø§Ø·ÛŒ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ù†Ù…Ø§ÛŒÛŒØ¯. (Ø¯Ø± Ù‡Ø± Ø®Ø· ÛŒÚ©ÛŒ)">
-<!ENTITY torsettings.useBridges.placeholder "address:port ÛŒØ§ transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "Ø¢Ø¯Ø±Ø³ Ø¢ÛŒâ€ŒÙ¾ÛŒ:Ù¾ÙˆØ±Øª Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯">
 
 <!ENTITY torsettings.copyLog "Ú©Ù¾ÛŒ Ú¯Ø²Ø§Ø±Ø´ ÙˆÙ‚Ø§ÛŒØ¹ ØªÙˆØ±">
 <!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.&#160; Often, you can work around this problem by using Tor Bridges which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Ø¨Ø±Ø§ÛŒ Ø¨Ø¯Ø³Øª Ø¢ÙˆØ±Ø¯Ù† Ù¾Ù„ Ø§Ø±ØªØ¨Ø§Ø·ÛŒÙ«Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù…Ø±ÙˆØ±Ú¯Ø± ÙˆØ¨ Ø¨Ù‡ Ø¢Ø¯Ø±Ø³ https://bridges.torproject.org Ù…Ø±Ø§Ø¬Ø¹Ù‡ ÙØ±Ù…Ø§ÛŒÛŒØ¯.">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges at torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "Ø´Ù…Ø§ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ø§ Ø§Ø±Ø³Ø§Ù„ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ù‡ help at rt.torproject.org Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù¾Ù„ Ø§Ø±ØªØ¨Ø§Ø·ÛŒ Ù†Ù…Ø§ÛŒÛŒØ¯.">
+<!ENTITY torsettings.bridgeHelp1 "Ø§Ú¯Ø± Ù†Ù…ÛŒ ØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ù…ØªØµÙ„ Ø´ÙˆÛŒØ¯ØŒ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ø¨Ù‡ Ø§ÛŒÙ† Ø¯Ù„ÛŒÙ„ Ø¨Ø§Ø´Ø¯ Ú©Ù‡ Ø´Ø±Ú©Øª Ø§Ø±Ø§ÛŒÙ‡ Ú©Ù†Ù†Ø¯Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª Ø´Ù…Ø§(ISP) Ùˆ ÛŒØ§ Ø³Ø§Ø²Ù…Ø§Ù† Ù‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø± Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ø±Ø§ Ø¨Ø³ØªÙ‡ Ø§Ù†Ø¯.&#160;
+ØºØ§Ù„Ø¨Ø§Ù‹ Ù…ÛŒ ØªÙˆØ§Ù†ÛŒØ¯ Ø§ÛŒÙ† Ù…ØØ¯ÙˆØ¯ÛŒØª Ø±Ø§ Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Â«Ù¾Ù„Â» Ù‡Ø§ÛŒ ØªÙˆØ± Ø¯ÙˆØ± Ø¨Ø²Ù†ÛŒØ¯. Ù¾Ù„ Ù‡Ø§ Ù…Ø³ÛŒØ±Ù‡Ø§ÛŒ Ø§Ø¶Ø§ÙÛŒ Ø¯ÙˆØ± Ø²Ø¯Ù† ÙÛŒÙ„ØªØ± Ù‡Ø³ØªÙ†Ø¯ Ú©Ù‡ Ù„ÛŒØ³Øª Ø¢Ù† Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª Ùˆ ÙÛŒÙ„ØªØ± Ú©Ø±Ø¯Ù† Ø¢Ù† Ù‡Ø§ Ø¨Ø³ÛŒØ§Ø± Ù…Ø´Ú©Ù„ Ø§Ø³Øª.">
+<!ENTITY torsettings.bridgeHelp1B "Ø´Ù…Ø§ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø§Ø² Ù¾Ù„â€ŒÙ‡Ø§ÛŒ Ù…ÙˆØ¬ÙˆØ¯ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯ Ùˆ ÛŒØ§ Ø¨Ø±Ø§ÛŒ Ø¨Ù‡â€ŒØ¯Ø³Øª Ø¢ÙˆØ±Ø¯Ù† Ù…Ø¬Ù…ÙˆØ¹Ù‡â€ŒØ§ÛŒ Ø§Ø² Ù¾Ù„â€ŒÙ‡Ø§ÛŒ Ø´Ø®ØµÛŒ Ø§Ø² ÛŒÚ©ÛŒ Ø§Ø² Ø³Ù‡ Ø±ÙˆØ´ Ø²ÛŒØ± Ø¨Ù‡Ø±Ù‡ Ø¨Ú¯ÛŒØ±ÛŒØ¯:">
+<!ENTITY torsettings.bridgeHelp2Heading "Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ†ØªØ±Ù†Øª">
+<!ENTITY torsettings.bridgeHelp2 "Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ÛŒÚ© Ù…Ø±ÙˆØ±Ú¯Ø± Ø¨Ù‡ Ø¢Ø¯Ø±Ø³ https://bridges.torproject.org Ø¨Ø±ÙˆÛŒØ¯.">
+<!ENTITY torsettings.bridgeHelp3Heading "Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø¢Ø¯Ø±Ø³ Ø§ÛŒÙ…ÛŒÙ„ Ù¾Ø§Ø³Ø®Ú¯ÙˆÛŒ Ø®ÙˆØ¯Ú©Ø§Ø±">
+<!ENTITY torsettings.bridgeHelp3 "ÛŒÚ© Ø§ÛŒÙ…ÛŒÙ„ ØØ§ÙˆÛŒ Ø¹Ø¨Ø§Ø±Øª  'get bridges' Ø¨Ù‡ Ø¢Ø¯Ø±Ø³ bridges at torproject.org  Ø§Ø±Ø³Ø§Ù„ Ú©Ù†ÛŒØ¯.&#160; Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ†Ú©Ù‡ Ø¨ØªÙˆØ§Ù†ÛŒÙ… Ø¬Ù„ÙˆÛŒ ÙÛŒÙ„ØªØ± Ø´Ø¯Ù† Ù¾Ù„ Ù‡Ø§ Ø±Ø§ Ø¨Ú¯ÛŒØ±ÛŒÙ…ØŒ Ù…Ø¬Ø¨ÙˆØ±ÛŒÙ… Ø´Ù…Ø§ Ø±Ø§ Ù…ØØ¯ÙˆØ¯ Ú©Ù†ÛŒÙ… ØªØ§ ÙÙ‚Ø· Ø§Ø² ÛŒÚ© Ø¢Ø¯Ø±Ø³ Ø§ÛŒÙ…ÛŒÙ„ yahoo.com Ùˆ ÛŒØ§ gmail.com Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø®ÙˆØ¯ Ø±Ø§ Ø§Ø±Ø³Ø§Ù„ Ú©Ù†ÛŒØ¯. Ù„Ø·ÙØ§Ù‹ ØµØ¨ÙˆØ± Ø¨Ø§Ø´ÛŒØ¯. Ø§Ø² Ú†Ù†Ø¯ Ø¯Ù‚ÛŒÙ‚Ù‡ ØªØ§ Ú†Ù†Ø¯ Ø³Ø§Ø¹Øª Ø·ÙˆÙ„ Ø®ÙˆØ§Ù‡Ø¯ Ú©Ø´ÛŒØ¯ ØªØ§ Ø¨Ù‡ Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ù¾Ù„ Ù‡Ø§ Ø¨Ø±Ø§ÛŒ Ø´Ù…Ø§ Ø§Ø±Ø³Ø§Ù„ Ø´ÙˆÙ†Ø¯.">
+<!ENTITY torsettings.bridgeHelp4Heading "Ø§Ø² Ø·Ø±ÛŒÙ‚ ÙˆØ§ØØ¯ Ú©Ù…Ú© Ø±Ø³Ø§Ù†ÛŒ">
+<!ENTITY torsettings.bridgeHelp4 "Ø§Ú¯Ø± Ø§Ø² Ø·Ø±ÛŒÙ‚ Ù‡ÛŒÚ† Ú©Ø¯Ø§Ù… Ø§Ø² Ø±Ø§Ù‡ ØÙ„ Ù‡Ø§ÛŒ ÙÙˆÙ‚ Ø¨Ù‡ Ù†ØªÛŒØ¬Ù‡ Ù†Ø±Ø³ÛŒØ¯ÛŒØ¯ØŒ ÛŒÚ© Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù…ÙˆØ¯Ø¨Ø§Ù†Ù‡ Ø¨Ù‡ Ø¢Ø¯Ø±Ø³ help at rt.torproject.org Ø§Ø±Ø³Ø§Ù„ Ú©Ù†ÛŒØ¯.&#160; Ø¯Ø± Ù†Ø¸Ø± Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯ Ú©Ù‡ ÛŒÚ© Ù†ÙØ± Ø¨Ø§ÛŒØ¯ Ø§ÛŒÙ…ÛŒÙ„ Ø´Ù…Ø§ Ø±Ø§ Ø¨Ø®ÙˆØ§Ù†Ø¯ Ùˆ Ø¨Ù‡ Ø¢Ù† Ù¾Ø§Ø³Ø® Ø¯Ù‡Ø¯. Ù¾Ø³ ØµØ¨ÙˆØ± Ø¨Ø§Ø´ÛŒØ¯.">
diff --git a/src/chrome/locale/fa/progress.dtd b/src/chrome/locale/fa/progress.dtd
index cd7ca8d..5f8eee1 100644
--- a/src/chrome/locale/fa/progress.dtd
+++ b/src/chrome/locale/fa/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "ÙˆØ¶Ø¹ÛŒØª ØªÙˆØ±">
 <!ENTITY torprogress.openSettings "ØªÙ†Ø¸ÛŒÙ…Ø§Øªâ€ŒØ±Ø§ Ø¨Ø§Ø² Ú©Ù†ÛŒØ¯">
 <!ENTITY torprogress.heading "Ø¯Ø±ØØ§Ù„ Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙØ±">
-<!ENTITY torprogress.pleaseWait "Ù…Ø±ÙˆØ±Ú¯Ø± ØªÙˆØ± Ø¨Ø§Ø² Ù…ÛŒâ€ŒØ´ÙˆØ¯ Ø¨Ø¹Ø¯ Ø§Ø² Ø§ÛŒÙ† Ú©Ù‡ Ø§Ø±ØªØ¨Ø§Ø·ÛŒ Ø¨Ø§ Ø´Ø¨Ú©Ù‡Ù” ØªÙˆØ± Ø¨Ø±Ù‚Ø±Ø§Ø± Ø´Ø¯Ù‡â€ŒØ¨Ø§Ø´Ø¯.">
+<!ENTITY torprogress.pleaseWait "Ù„Ø·ÙØ§ Ø¨Ø±Ø§ÛŒ Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ù…Ù†ØªØ¸Ø± Ø¨Ù…Ø§Ù†ÛŒØ¯.">
diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties
index ebee697..0571889 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=ØªÙˆØ± Ø¨Ø¯Ù„ÛŒÙ„ÛŒ Ù†Ø§Ù…Ø´Ø®Øµ Ø®Ø§Ø±Ø¬ Ø´Ø¯.
 torlauncher.please_restart_app=Ù„Ø·ÙØ§ Ù†Ø±Ù… Ø§ÙØ²Ø§Ø± Ø±Ø§ Ù…Ø¬Ø¯Ø¯Ø§ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ù†Ù…Ø§ÛŒÛŒØ¯.
 torlauncher.tor_controlconn_failed=Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ù¾ÙˆØ±Øª Ú©Ù†ØªØ±Ù„ ØªÙˆØ± Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯.
 torlauncher.tor_failed_to_start=Ø®Ø·Ø§ Ø¯Ø± Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ.
-torlauncher.tor_bootstrap_failed=ØªÙˆØ± Ø¨Ø±Ø§ÛŒ Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ± Ù†Ø§Ù…ÙˆÙÙ‚ Ù…ÛŒ Ø¨Ø§Ø´Ø¯.
-torlauncher.tor_bootstrap_failed_details=%1$S Ù†Ø§Ù…ÙˆÙÙ‚ (%2$S).
+torlauncher.tor_control_failed=Ø¨Ù‡â€ŒØ¯Ø³Øª Ú¯Ø±ÙØªÙ† Ú©Ù†ØªØ±Ù„ ØªÙˆØ± Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯.
+torlauncher.tor_bootstrap_failed=ØªÙˆØ± Ø¯Ø± Ø¨Ø±Ù‚Ø±Ø§Ø±ÛŒ ÛŒÚ© Ø§Ø±ØªØ¨Ø§Ø· Ø´Ø¨Ú©Ù‡â€ŒØ§ÛŒ ØªÙˆØ±ÛŒ Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯.
+torlauncher.tor_bootstrap_failed_details=%1$S Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯ (%2$S).
 
 torlauncher.unable_to_start_tor=Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ ØªÙˆØ± Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯.\n\n%S
 torlauncher.tor_missing=ØªÙˆØ± Ø§Ø¬Ø±Ø§ Ø´ÙˆÙ†Ø¯Ù‡ ÛŒØ§ÙØª Ù†Ø´Ø¯.
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Ù„Ø·ÙØ§ Ø§Ø² ÙØ¹Ø§Ù„ Ø¨ÙˆØ¯Ù† ØªÙˆØ± Ø§Ø·Ù…
 torlauncher.error_proxy_addr_missing=Ø´Ù…Ø§ Ù…ÛŒØ¨Ø§ÛŒØ³Øª ÛŒÚ© Ø¢Ø¯Ø±Ø³ Ø¢ÛŒ Ù¾ÛŒ ÛŒØ§ ÛŒÚ© Ù†Ø§Ù… Ù…ÛŒØ²Ø¨Ø§Ù† Ùˆ ÛŒÚ© Ø´Ù…Ø§Ø±Ù‡ Ø¯Ø±Ú¯Ø§Ù‡ Ø¨Ø±Ø§ÛŒ Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ ØªÙØ± Ù…Ø´Ø®Øµ Ú©Ù†ÛŒØ¯ Ø¬Ù‡Øª Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø± ÛŒÚ© Ù¾ÛŒØ´Ú©Ø§Ø± Ø¨Ø±Ø§ÛŒ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª.
 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.quit=Ø®Ø±ÙˆØ¬
@@ -33,16 +38,16 @@ torlauncher.forAssistance=Ø¨Ø±Ø§ÛŒ Ø¯Ø±ÛŒØ§ÙØª Ú©Ù…Ú©Ù« Ø¨Ø§ %S ØªÙ…Ø§Ø³ Ø¨Ú¯ÛŒ
 
 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.requesting_status=Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙˆØ¶ÛŒØ¹Øª Ø´Ø¨Ú©Ù‡
+torlauncher.bootstrapStatus.loading_status=Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ÙˆØ¶ÛŒØ¹Øª Ø´Ø¨Ú©Ù‡
+torlauncher.bootstrapStatus.loading_keys=Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬ÙˆØ² Ù‡Ø§
+torlauncher.bootstrapStatus.requesting_descriptors=Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨Ø§Ø² Ù¾Ø®Ø´
 torlauncher.bootstrapStatus.loading_descriptors=Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨Ø§Ø²Ù¾Ø®Ø´
-torlauncher.bootstrapStatus.conn_or=Ø¯Ø± ØØ§Ù„ Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ±
-torlauncher.bootstrapStatus.handshake_or=Ø¨Ø±Ù¾Ø§ÛŒÛŒ ÛŒÚ© Ø¬Ø±ÛŒØ§Ù† ØªÙˆØ±
-torlauncher.bootstrapStatus.done=ÙˆØµÙ„ Ø´Ø¯Ù‡ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙˆØ±
+torlauncher.bootstrapStatus.conn_or=Ø¯Ø±ØØ§Ù„ Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙØ±
+torlauncher.bootstrapStatus.handshake_or=Ø¨Ø±Ù¾Ø§ÛŒÛŒ ÛŒÚ© Ø¬Ø±ÛŒØ§Ù† ØªÙØ±
+torlauncher.bootstrapStatus.done=Ù…ØªØµÙ„ Ø´Ø¯Ù‡ Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ ØªÙØ±
 
-torlauncher.bootstrapWarning.done=Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯Ù‡
+torlauncher.bootstrapWarning.done=Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯
 torlauncher.bootstrapWarning.connectrefused=Ø§ØªØµØ§Ù„ Ø±Ø¯Ø´Ø¯
 torlauncher.bootstrapWarning.misc=Ú¯ÙˆÙ†Ø§Ú¯ÙˆÙ†
 torlauncher.bootstrapWarning.resourcelimit=Ù…Ù†Ø§Ø¨Ø¹ Ù†Ø§Ú©Ø§ÙÛŒ
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index edbe29e..5e6ed8c 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -2,27 +2,29 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Avant que le navigateur Tor ne tente de se connecter au rÃ©seau Tor, vous devez fournir quelques informations concernant votre connexion Internet.">
+<!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.yes "Oui">
 <!ENTITY torSettings.no "Non">
 
 <!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes dÃ©crit le mieux votre situationÂ ?">
 <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurÃ©e, filtrÃ©e ou nÃ©cessite un proxy.">
-<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configurer les paramÃ¨tres rÃ©seau. ">
+<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configurer une passerelle, le pare-feu, ou les paramÃ¨tres du proxy.">
 <!ENTITY torSettings.configure "Configurer">
 <!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au rÃ©seau Tor.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations.">
 <!ENTITY torSettings.connect "Se connecter">
 
-<!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur Ã  besoin d'un proxy pour accÃ©der Ã  internet ?">
+<!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur a besoin d'un proxy pour accÃ©der Ã  internet ?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, vous pouvez regarder les paramÃ¨tres de connexion d'un autre navigateur afin de voir s'il est configurÃ© pour utiliser un proxy.">
 <!ENTITY torSettings.enterProxy "Entrez les paramÃ¨tres de votre proxy.">
 <!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet est filtrÃ© par un pare-feu qui n'autorise les connexions que vers certains ports ?">
 <!ENTITY torSettings.firewallHelp "Si vous ne savez par comment rÃ©pondre Ã  cette question, choisissez Non. Vous pourrez changer ce paramÃ¨tre plus tard en cas de problÃ¨mes de connexion au rÃ©seau Tor.">
 <!ENTITY torSettings.enterFirewall "Entrez la liste de ports, sÃ©parÃ©s par des virgules, qui sont autorisÃ©s par le pare-feu.">
-<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurÃ©e, il est nÃ©cessaire d'obtenir des adresses de bridges. Si ce n'est pas le cas, cliquez simplement sur Â«Â Se connecterÂ Â».">
+<!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 le numÃ©ro &#160; 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.">
 
 <!-- Other: -->
 
@@ -44,16 +46,19 @@
 <!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.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 "adresse:port OU adresse de transport:port">
+<!ENTITY torsettings.useBridges.placeholder "type 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.bridgeHelp1 "S'il est impossible de se connecter au rÃ©seau Tor, cela peut Ãªtre le signe que votre Fournisseur d'AccÃ¨s Ã  Internet (FAI) ou une autre entitÃ© bloque Tor. La plupart du temps, vous pouvez contourner ce problÃ¨me en utilisant les Â«Â bridgesÂ Â» Tor. Ce sont des relais cachÃ©s qui sont plus difficiles Ã  bloquer.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Pour obtenir des adresses de bridges, utilisez un navigateur web pour aller sur la pageÂ : https://bridges.torproject.org/">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "Une autre maniÃ¨re de trouver des adresses de bridges publics est d'envoyer un mail Ã  bridges at torproject.org avec la ligne "get bridges" dans le corps de l'email. Toutefois, pour que cela soit plus difficile pour un attaquant de dÃ©couvrir beaucoup d'adresses, les demandes doivent provenir d'une adresse email appartenant Ã  l'un des domaines suivantsÂ : gmail.com ou yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "Vous pouvez Ã©galement demander des adresses de bridges en Ã©crivant Ã  help-fr at rt.torproject.org.">
+<!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.&#160; 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.bridgeHelp2Heading "Par le Web">
+<!ENTITY torsettings.bridgeHelp2 "Utilisez un navigateur web pour visiter https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "Par l'auto-rÃ©pondeur de courrier Ã©lectronique">
+<!ENTITY torsettings.bridgeHelp3 "Envoyer un email Ã  bridges at torproject.org avec la ligne 'get bridges' en elle-mÃªme obtiennent dans le corps du message.&#160; Cependant, pour rendre plus difficile Ã  un attaquant d'apprendre beaucoup d'adresses de pont, vous devez envoyer cette demande depuis une adresse Ã©lectronique gmail.com ou yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "Par le bureau d'aide">
+<!ENTITY torsettings.bridgeHelp4 "En dernier ressort, vous pouvez demander des adresses de pont en envoyant un message Ã©lectronique poli Ã  help at rt.torproject.org.&#160; Veuillez noter qu'une personne devra rÃ©pondre Ã  chaque demande.">
diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd
index 1c59e1e..936d220 100644
--- a/src/chrome/locale/fr/progress.dtd
+++ b/src/chrome/locale/fr/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ã‰tat de Tor">
 <!ENTITY torprogress.openSettings "Ouvrir les paramÃ¨tres">
 <!ENTITY torprogress.heading "Connexion au rÃ©seau Tor">
-<!ENTITY torprogress.pleaseWait "Le Navigateur Tor s'ouvrira aprÃ¨s que la connexion au rÃ©seau Tor soit Ã©tablie.">
+<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au rÃ©seau Tor est Ã©tablie.">
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index 86ba52e..807e901 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=Le programme Tor s'est terminÃ© de maniÃ¨re inatendue.
 torlauncher.please_restart_app=Veuillez redÃ©marrer l'application.
 torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrÃ´le de Tor.
 torlauncher.tor_failed_to_start=Tor n'a pas pu dÃ©marrer.
+torlauncher.tor_control_failed=Ã‰chec lors de la prise de contrÃ´le de Tor.
 torlauncher.tor_bootstrap_failed=Tor n'a pas rÃ©ussi Ã  Ã©tablir une connexion au rÃ©seau Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S Ã©chec (%2$S).
+torlauncher.tor_bootstrap_failed_details=%1$S Ã©chouÃ© (%2$S).
 
 torlauncher.unable_to_start_tor=Impossible de dÃ©marrer Tor.\n\n%S
 torlauncher.tor_missing=L'exÃ©cutable Tor est introuvable.
@@ -23,6 +24,10 @@ 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.recommended_bridge=(recommandÃ©)
 
 torlauncher.connect=Se connecter
 torlauncher.quit=Quitter
@@ -32,17 +37,17 @@ torlauncher.done=TerminÃ©
 torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S
 
 torlauncher.bootstrapStatus.conn_dir=Connexion Ã  un annuaire de relais
-torlauncher.bootstrapStatus.handshake_dir=Etablissement d'une connexion annuaire cryptÃ©e
-torlauncher.bootstrapStatus.requesting_status=Recherche de l'Ã©tat du rÃ©seau
+torlauncher.bootstrapStatus.handshake_dir=Ã‰tablissement d'une connexion annuaire chiffrÃ©e
+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 des authoritÃ©s
-torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais
+torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autoritÃ©
+torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relai
 torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais
 torlauncher.bootstrapStatus.conn_or=Connexion au rÃ©seau Tor
-torlauncher.bootstrapStatus.handshake_or=Etablissement d'un circuit Tor
+torlauncher.bootstrapStatus.handshake_or=RÃ©alisation d'un circuit Tor
 torlauncher.bootstrapStatus.done=ConnectÃ© au rÃ©seau Tor !
 
-torlauncher.bootstrapWarning.done=fait
+torlauncher.bootstrapWarning.done=effectuÃ©
 torlauncher.bootstrapWarning.connectrefused=connexion refusÃ©e
 torlauncher.bootstrapWarning.misc=divers
 torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index bed89b3..54d07c3 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Prima che il pacchetto Tor Browser provi a connettersi alla rete Tor, Ã¨ necessario inserire informazioni riguardo la connessione ad Internet di questo computer.">
+<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
 <!ENTITY torSettings.yes "SÃ¬">
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Quale delle seguenti descrizioni raffigura meglio la tua situazione?">
 <!ENTITY torSettings.configurePrompt1 "La connessione ad Internet di questo computer Ã¨ censurata, filtrata, o passa attraverso un proxy.">
-<!ENTITY torSettings.configurePrompt2 "Devo configurare le impostazioni di rete.">
+<!ENTITY torSettings.configurePrompt2 "Ho bisogno di configurare un bridge, firewall o settaggi proxy.">
 <!ENTITY torSettings.configure "Configura">
 <!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "Questo funzionerÃ  nella maggior parte delle situazioni.">
 <!ENTITY torSettings.connect "Connetti">
 
 <!ENTITY torSettings.proxyQuestion "Questo computer usa un proxy per accedere ad Internet?">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "La connessione ad Internet di questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte?">
 <!ENTITY torSettings.firewallHelp "Se non sei sicuro su come rispondere a questa domanda, seleziona No. Nel caso in cui si verifichino problemi di connessione alla rete Tor, cambia queste impostazioni.">
 <!ENTITY torSettings.enterFirewall "Inserisci una lista di porte consentite dal firewall, separate da una virgola.">
-<!ENTITY torSettings.bridgeQuestion "Se la connessione ad Internet di questo computer Ã¨ censurata, sarÃ  necessario ottenere ed usare dei ponti relÃ©.&#160; Se non lo Ã¨, seleziona Connetti.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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: -->
 
@@ -44,16 +46,19 @@
 <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte">
 <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:">
 <!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor">
+<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.type "Tipo di trasporto:">
+<!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati">
 <!ENTITY torsettings.useBridges.label "Inserisci uno o piÃ¹ bridge relay (uno per riga)">
-<!ENTITY torsettings.useBridges.placeholder "indirzzo:porta OPPURE indirizzo:porta di trasporto">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
 
 <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema">
 <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relÃ©">
-<!ENTITY torsettings.bridgeHelp1 "Se non riesci a connetterti alla rete Tor, potrebbe essere il tuo fornitore di servizi Internet (ISP), o un altro ente, che sta bloccando Tor.&#160; Spesso Ã¨ possibile aggirare questo problema utilizzando i ponti Tor: si tratta di relÃ© nascosti, piÃ¹ difficili da bloccare.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Per ottenere una lista di ponti relÃ©, visita con un browser web la seguente pagina: https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "Un altro modo per conoscere gli indirizzi dei ponti pubblici consiste nell'inviare una e-mail all'indirizzo bridges at torproject.org con il testo 'get bridges' nel corpo del messaggio.&#160; Tuttavia, per rendere piÃ¹ difficile ad un utente malintenzionato il rilevamento di molti indirizzi dei ponti, devi inviare la richiesta da un indirizzo e-mail appartenente ad uno dei seguenti domini: gmail.com oppure yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "Una lista di ponti relÃ© puÃ² essere ottenuta anche inviando una e-mail all'indirizzo help at rt.torproject.org.">
+<!ENTITY torsettings.bridgeHelp1 "Se non ti riesci a connettere alla rete Tor, Ã¨ possibile che il tuo  Internet Service Provider (ISP) o una qualche altra agenzia stiano bloccando Tor.&#160; Spesso puoi aggirare questo problema utilizzando un Bridge Tor, che Ã¨ un relay non tracciato piÃ¹ difficile da bloccare.">
+<!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 "Attraverso il web">
+<!ENTITY torsettings.bridgeHelp2 "Usa un browser per visitare https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "Attraverso l'autorisponditore Email">
+<!ENTITY torsettings.bridgeHelp3 "Manda una mail a bridges at torproject.org con scritto 'get bridges' nel corpo del messaggio.&#160; Tuttavia, per rendere piÃ¹ difficile il riconoscimento di molti indirizzi bridge, manda questa richiesta da un account gmail.com o yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "Attraverso l'Help Desk">
+<!ENTITY torsettings.bridgeHelp4 "Come ultima spiaggia, puoi richiedere un indirizzo bridge mandando una cortese mail a help at rt.torproject.org.&#160; Tieni conto che una persona dovrÃ  rispondere ad ogni singola richiesta.">
diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd
index a0e3c8a..4cab5ff 100644
--- a/src/chrome/locale/it/progress.dtd
+++ b/src/chrome/locale/it/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Stato di Tor">
 <!ENTITY torprogress.openSettings "Apertura impostazioni">
 <!ENTITY torprogress.heading "Connessione in corso alla rete Tor">
-<!ENTITY torprogress.pleaseWait "Il Tor Browser si aprirÃ  non appena sarÃ  stabilita una connessione alla rete Tor.">
+<!ENTITY torprogress.pleaseWait "Per favore aspettare mentre stabiliamo una connessione alla rete Tor">
diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties
index 8f20ef3..0d71880 100644
--- a/src/chrome/locale/it/torlauncher.properties
+++ b/src/chrome/locale/it/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor si Ã¨ arrestato inaspettatamente.
 torlauncher.please_restart_app=Per favore riavvia questa applicazione.
 torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor.
 torlauncher.tor_failed_to_start=Si Ã¨ verificato un errore nell'avvio di Tor.
-torlauncher.tor_bootstrap_failed=Si Ã¨ verificato un errore nello stabilire una connessione alla rete Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S fallito (%2$S).
+torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor.
+torlauncher.tor_bootstrap_failed=Tor ha fallito a stabilire una connessione Tor
+torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Impossibile avviare Tor.âŽ\nâŽ\n%S
 torlauncher.tor_missing=Il file eseguibile di Tor Ã¨ mancante.
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Per favore assicurati che Tor sia in esecuzion
 torlauncher.error_proxy_addr_missing=AffinchÃ© Tor sia configurato all'utilizzo di un proxy per l'accesso ad Internet, devi specificare sia un indirizzo IP o nome Host, sia un numero di porta.
 torlauncher.error_proxy_type_missing=Devi selezionare il tipo di proxy.
 torlauncher.error_bridges_missing=Devi specificare uno o piÃ¹ ponti.
+torlauncher.error_default_bridges_type_missing=Ãˆ necessario selezionare un tipo ti trasporto per il bridge selezionato.
+torlauncher.error_bridge_bad_default_type=Non Ã¨ disponibile alcun bridge con il tipo di trasporto %S. Modificare le proprie impostazioni.
+
+torlauncher.recommended_bridge=(raccomandato)
 
 torlauncher.connect=Connetti
 torlauncher.quit=Esci
@@ -38,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=Caricamento dello stato della rete
 torlauncher.bootstrapStatus.loading_keys=Caricamento dei certificati delle authority
 torlauncher.bootstrapStatus.requesting_descriptors=Richiesta di informazioni sui relay
 torlauncher.bootstrapStatus.loading_descriptors=Caricamento delle informazioni sui relay
-torlauncher.bootstrapStatus.conn_or=Mi sto connettendo alla rete Tor
+torlauncher.bootstrapStatus.conn_or=Connessione in corso alla rete Tor
 torlauncher.bootstrapStatus.handshake_or=Sto creando un circuito Tor
 torlauncher.bootstrapStatus.done=Connesso alla rete Tor!
 
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index d12b19f..b7ea058 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -2,27 +2,29 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Tor Browser BundleãŒTorãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸æŽ¥ç¶šã‚’è©¦ã¿ã‚‹å‰ã«ã€ã“ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã«ã¤ã„ã¦ã®æƒ…å ±ã‚’æä¾›ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚">
+<!ENTITY torsettings.prompt "Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã™ã‚‹å‰ã«ã€ã“ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ãƒ¼ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã«ã¤ã„ã¦ã®æƒ…å ±ã‚’æä¾›ã—ã¦é ‚ãå¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚">
 
 <!ENTITY torSettings.yes "ã¯ã„">
 <!ENTITY torSettings.no "ã„ã„ãˆ">
 
 <!ENTITY torSettings.firstQuestion "ä»¥ä¸‹ã®ã†ã¡ã‚ãªãŸã®çŠ¶æ…‹ã«æœ€ã‚‚é©ã—ã¦ã„ã‚‹ã®ã¯ã©ã‚Œã§ã™ã‹ï¼Ÿ">
 <!ENTITY torSettings.configurePrompt1 "ã“ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã¯æ¤œé–²ã•ã‚Œã¦ã„ã‚‹ã‹ã€ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã•ã‚Œã¦ã„ã‚‹ã‹ã€ãƒ—ãƒã‚ã‚·ã‚’é€šã—ã¾ã™ã€‚">
-<!ENTITY torSettings.configurePrompt2 "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¨å®šã‚’æ§‹æˆã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚">
+<!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.proxyQuestion "ã“ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ãƒ¼ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã®ã«ProxyãŒå¿…è¦ã§ã™ã‹ï¼Ÿ">
+<!ENTITY torSettings.proxyQuestion "ã“ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ãƒ¼ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã®ã«ãƒ—ãƒã‚ã‚·ãŒå¿…è¦ã§ã™ã‹ï¼Ÿ">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "ã“ã®è³ªå•ã«ã©ã†ç”ãˆã‚‹ã¹ãã‹ç¢ºä¿¡ãŒæŒã¦ãªã‘ã‚Œã°ã€Proxyã®ä½¿ç”¨ãŒã©ã®ã‚ˆã†ã«è¨å®šã•ã‚Œã¦ã„ã‚‹ã‹ç¢ºèªã™ã‚‹ãŸã‚ã«ã€ä»–ã®ãƒ–ãƒ©ã‚¦ã‚¶ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆè¨å®šã‚’è¦‹ã¦ãã ã•ã„ã€‚">
 <!ENTITY torSettings.enterProxy "Proxyè¨å®šã‚’å…¥åŠ›">
 <!ENTITY torSettings.firewallQuestion "ã“ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã¯ç‰¹å®šã®ãƒãƒ¼ãƒˆã¸ã®æŽ¥ç¶šã®ã¿è¨±å¯ã™ã‚‹ãƒ•ã‚¡ã‚¤ã‚¢ãƒ¼ã‚¦ã‚©ãƒ¼ãƒ«ã‚’é€šã—ã¾ã™ã‹ï¼Ÿ">
 <!ENTITY torSettings.firewallHelp "ã“ã®è³ªå•ã«ã©ã†ç”ãˆã‚‹ã¹ãã‹ç¢ºä¿¡ãŒæŒã¦ãªã‘ã‚Œã°ã€ã„ã„ãˆã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚ Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸æŽ¥ç¶šã™ã‚‹æ™‚ã«å•é¡Œã«éé‡ã—ãŸãªã‚‰ã€ã“ã®è¨å®šã‚’å¤‰æ›´ã—ã¦ãã ã•ã„ã€‚">
 <!ENTITY torSettings.enterFirewall "ãƒ•ã‚¡ã‚¤ã‚¢ãƒ¼ã‚¦ã‚©ãƒ¼ãƒ«ã«ã‚ˆã£ã¦è¨±å¯ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ãƒˆã®ã‚³ãƒ³ãƒžåŒºåˆ‡ã‚Šã®ãƒªã‚¹ãƒˆã‚’å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚">
-<!ENTITY torSettings.bridgeQuestion "ã“ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šãŒæ¤œé–²ã•ã‚Œã¦ã„ã‚Œã°ã€ãƒ–ãƒªãƒƒã‚¸ãƒªãƒ¬ãƒ¼ã®å…¥æ‰‹ã¨ä½¿ç”¨ãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚&#160; ãã†ã§ãªã‘ã‚Œã°ã€æŽ¥ç¶šã‚’ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã ã‘ã§çµæ§‹ã§ã™ã€‚">
+<!ENTITY torSettings.bridgeQuestion "ã‚ãªãŸã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‚µãƒ¼ãƒ“ã‚¹ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ (ISP) ã¯ Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®æŽ¥ç¶šã‚’ãƒ–ãƒãƒƒã‚¯ã—ã¦ã„ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯åˆ¥ã®ã‚„ã‚Šæ–¹ã§æ¤œé–²ã—ã¦ã„ã¾ã™ã‹ï¼Ÿ">
+<!ENTITY torSettings.bridgeHelp "ã“ã®è³ªå•ã«ã©ã†ç”ãˆã‚‹ã¹ãã‹ã‚ˆãã‚ã‹ã‚‰ãªã„å ´åˆã¯ã€ã„ã„ãˆã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚&#160; ã¯ã„ã‚’é¸æŠžã™ã‚‹ã¨ã€Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®æŽ¥ç¶šã‚’ãƒ–ãƒãƒƒã‚¯ã™ã‚‹ã“ã¨ã‚’ã•ã‚‰ã«å›°é›£ã«ã™ã‚‹ãƒªã‚¹ãƒˆåŒ–ã•ã‚Œã¦ã„ãªã„ãƒªãƒ¬ãƒ¼ã§ã‚ã‚‹ Tor Bridges ã‚’æ§‹æˆã™ã‚‹ã“ã¨ãŒæ±‚ã‚ã‚‰ã‚Œã¾ã™ã€‚">
+<!ENTITY torSettings.bridgeSettingsPrompt "æä¾›ã•ã‚ŒãŸãƒ–ãƒªãƒƒã‚¸ã®ã‚»ãƒƒãƒˆã‚’ä½¿ç”¨ã™ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯ã‚«ã‚¹ã‚¿ãƒ ã®ãƒ–ãƒªãƒƒã‚¸ã®ã‚»ãƒƒãƒˆã‚’å–å¾—ã—ã¦å…¥åŠ›ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚">
 
 <!-- Other: -->
 
@@ -44,16 +46,19 @@
 <!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 "1ã¤ä»¥ä¸Šã®ãƒ–ãƒªãƒƒã‚¸ãƒªãƒ¬ãƒ¼ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„(è¡Œã‚ãŸã‚Š1ã¤)ã€‚">
-<!ENTITY torsettings.useBridges.placeholder "ã‚¢ãƒ‰ãƒ¬ã‚¹:ãƒãƒ¼ãƒˆ ã¾ãŸã¯ ãƒˆãƒ©ãƒ³ã‚¹ãƒãƒ¼ãƒˆã‚¢ãƒ‰ãƒ¬ã‚¹:ãƒãƒ¼ãƒˆ">
+<!ENTITY torsettings.useBridges.placeholder "ã‚¢ãƒ‰ãƒ¬ã‚¹:ãƒãƒ¼ãƒˆã‚’ å…¥åŠ›">
 
 <!ENTITY torsettings.copyLog "Torã®ãƒã‚°ã‚’ã‚¯ãƒªãƒƒãƒ—ãƒœãƒ¼ãƒ‰ã«ã‚³ãƒ”ãƒ¼">
 <!ENTITY torsettings.bridgeHelpTitle "ãƒ–ãƒªãƒƒã‚¸ãƒªãƒ¬ãƒ¼ã®ãƒ˜ãƒ«ãƒ—">
-<!ENTITY torsettings.bridgeHelp1 "Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã§ããªã„å ´åˆã€ã‚ãªãŸã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‚µãƒ¼ãƒ“ã‚¹ãƒ—ãƒãƒã‚¤ãƒ€(ISP)ã‹åˆ¥ã®ä»£ç†åº—ãŒTorã‚’ãƒ–ãƒãƒƒã‚¯ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚&#160; ãƒ–ãƒãƒƒã‚¯ã™ã‚‹ã“ã¨ã‚’ã‚ˆã‚Šå›°é›£ã«ã™ã‚‹éš ã—ãƒªãƒ¬ãƒ¼ã§ã‚ã‚‹Torãƒ–ãƒªãƒƒã‚¸ã‚’ä½¿ç”¨ã™ã‚‹ã“ã¨ã§ã€ã—ã°ã—ã°ã“ã®å•é¡Œã‚’å›žé¿å‡ºæ¥ã¾ã™ã€‚">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "ã„ãã¤ã‹ãƒ–ãƒªãƒƒã‚¸ãƒªãƒ¬ãƒ¼ã‚’å…¥æ‰‹ã™ã‚‹ã«ã¯ã€ã‚¦ã‚§ãƒ–ãƒ–ãƒ©ã‚¦ã‚¶ãƒ¼ã‚’ä½¿ç”¨ã—ã€ä»¥ä¸‹ã®ãƒšãƒ¼ã‚¸ã«è¡Œã£ã¦ãã ã•ã„: https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "ãƒ‘ãƒ–ãƒªãƒƒã‚¯ãªãƒ–ãƒªãƒƒã‚¸ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’è¦‹ã¤ã‘ã‚‹ã‚‚ã†ä¸€ã¤ã®æ–¹æ³•ã¯ã€æœ¬æ–‡ã«<b>get bridges</b>ã¨è¨˜å…¥ã—ãŸE-mailã‚’ bridges at torproject.org å®›ã«é€ä¿¡ã™ã‚‹ ã“ã¨ã§ã™ã€‚&#160; ã—ã‹ã—ã€ã‚¢ã‚¿ãƒƒã‚«ãƒ¼ãŒãŸãã•ã‚“ã®ãƒ–ãƒªãƒƒã‚¸ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’åŽé›†ã™ã‚‹ã®ã‚’å›°é›£ã«ã™ã‚‹ãŸã‚ã€ ã‚ãªãŸã¯ã€gmail.comã‹yahoo.comã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã®ã„ãšã‚Œã‹ã‹ã‚‰ã“ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ã‚‰ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ã€‚">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "help at rt.torproject.orgå®›ã«ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã™ã‚‹ã“ã¨ã§ã‚‚ãƒ–ãƒªãƒƒã‚¸ãƒªãƒ¬ãƒ¼ã‚’è¦æ±‚ã§ãã¾ã™ã€‚">
+<!ENTITY torsettings.bridgeHelp1 "Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã§ããªã„ãªã‚‰ã€ã‚ãªãŸã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‚µãƒ¼ãƒ“ã‚¹ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼(ISP)ã‚„åˆ¥ã®æ©Ÿé–¢ãŒ Tor ã‚’ãƒ–ãƒãƒƒã‚¯ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚&#160; ãƒ–ãƒãƒƒã‚¯ãŒæ¯”è¼ƒçš„å›°é›£ãªãƒªã‚¹ãƒˆã•ã‚Œã¦ã„ãªã„ãƒªãƒ¬ãƒ¼ã§ã‚ã‚‹ Tor ãƒ–ãƒªãƒƒã‚¸ã‚’ä½¿ç”¨ã™ã‚‹ã“ã¨ã§ã“ã®å•é¡Œã‚’å›žé¿ã§ãã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚">
+<!ENTITY torsettings.bridgeHelp1B "äº‹å‰è¨å®šã•ã‚ŒãŸæä¾›ã•ã‚ŒãŸãƒ–ãƒªãƒƒã‚¸ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ã‚»ãƒƒãƒˆã‚’ä½¿ç”¨ã™ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯ä»¥ä¸‹ã®3ã¤ã®æ–¹æ³•ã®ã„ãšã‚Œã‹ã‚’ç”¨ã„ã¦ã‚«ã‚¹ã‚¿ãƒ ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ã‚»ãƒƒãƒˆã‚’å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚">
+<!ENTITY torsettings.bridgeHelp2Heading "ã‚¦ã‚§ãƒ–çµŒç”±">
+<!ENTITY torsettings.bridgeHelp2 "ã‚¦ã‚§ãƒ–ã‚’ä½¿ç”¨ã—ã¦ã€https://bridges.torproject.orgã‚’é–‹ã">
+<!ENTITY torsettings.bridgeHelp3Heading "ãƒ¡ãƒ¼ãƒ«è‡ªå‹•å¿œç”ã‚·ã‚¹ãƒ†ãƒ çµŒç”±">
+<!ENTITY torsettings.bridgeHelp3 "ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®æœ¬æ–‡ã« 'get bridges' ã¨ã„ã†è¡Œã‚’ä»˜ã‘ã¦ bridges at torproject.org ã«ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã™ã‚‹ã€‚.&#160;ãŸã ã—ã€æ”»æ’ƒè€…ãŒå¤šãã®ãƒ–ãƒªãƒƒã‚¸ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’æŠŠæ¡ã™ã‚‹ã®ã‚’å›°é›£ã«ã™ã‚‹ãŸã‚ã«ã€ gmail.com ã¾ãŸã¯ yahoo.com ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‹ã‚‰ã“ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚">
+<!ENTITY torsettings.bridgeHelp4Heading "ãƒ˜ãƒ«ãƒ—ãƒ‡ã‚¹ã‚¯çµŒç”±">
+<!ENTITY torsettings.bridgeHelp4 "æœ€å¾Œã®é ¼ã¿ã®ç¶±ã¨ã—ã¦ã€ help at rt.torproject.org ã«ä¸å¯§ãªãƒ¡ãƒ¼ãƒ«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã—ã¦ã€ãƒ–ãƒªãƒƒã‚¸ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’ãƒªã‚¯ã‚¨ã‚¹ãƒˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚&#160; äººé–“ãŒå„ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«å¯¾å¿œã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã“ã¨ã«ã”æ³¨æ„ãã ã•ã„ã€‚">
diff --git a/src/chrome/locale/ja/progress.dtd b/src/chrome/locale/ja/progress.dtd
index 883f748..9d03c6b 100644
--- a/src/chrome/locale/ja/progress.dtd
+++ b/src/chrome/locale/ja/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Torã®çŠ¶æ…‹">
 <!ENTITY torprogress.openSettings "è¨å®šã‚’é–‹ã">
 <!ENTITY torprogress.heading "Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™">
-<!ENTITY torprogress.pleaseWait "Tor Browserã¯Torã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šãŒç¢ºç«‹ã•ã‚ŒãŸå¾Œã«é–‹ãã¾ã™ã€‚">
+<!ENTITY torprogress.pleaseWait "Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®æŽ¥ç¶šã‚’ç¢ºç«‹ã™ã‚‹ã¾ã§ã®é–“ãŠå¾…ã¡ãã ã•ã„ã€‚">
diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties
index 80769e1..3ab1b23 100644
--- a/src/chrome/locale/ja/torlauncher.properties
+++ b/src/chrome/locale/ja/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=Torã¯äºˆæœŸã›ãšçµ‚äº†ã—ã¾ã—ãŸã€‚
 torlauncher.please_restart_app=ã“ã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„ã€‚
 torlauncher.tor_controlconn_failed=Torã®ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ãƒãƒ¼ãƒˆã«æŽ¥ç¶šå‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸã€‚
 torlauncher.tor_failed_to_start=Torã¯é–‹å§‹å‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸã€‚
-torlauncher.tor_bootstrap_failed=Torã¯Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã®ç¢ºç«‹ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
-torlauncher.tor_bootstrap_failed_details=%1$S å¤±æ•— (%2$S).
+torlauncher.tor_control_failed=Tor ã®åˆ¶å¾¡ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
+torlauncher.tor_bootstrap_failed=Tor ã¯ Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã®ç¢ºç«‹ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
+torlauncher.tor_bootstrap_failed_details=%1$S å¤±æ•— (%2$S)ã€‚
 
 torlauncher.unable_to_start_tor=Torã‚’é–‹å§‹å‡ºæ¥ã¾ã›ã‚“ã€‚\n\n%S
 torlauncher.tor_missing=Torã®å®Ÿè¡Œå¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã€‚
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=TorãŒèµ·å‹•ã—ã¦ã„ã‚‹ã‹ã”ç¢ºèªãã ã•
 torlauncher.error_proxy_addr_missing=ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã®ã‚¢ã‚¯ã‚»ã‚¹ã«ãƒ—ãƒã‚ã‚·ã‚’ä½¿ç”¨ã™ã‚‹ã«ã¯ Tor ã®æ§‹æˆã¸ IP ã‚¢ãƒ‰ãƒ¬ã‚¹ã¾ãŸã¯ãƒ›ã‚¹ãƒˆåã¨ãƒãƒ¼ãƒˆç•ªå·ã‚’ä¸¡æ–¹æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
 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.quit=çµ‚äº†
@@ -31,21 +36,21 @@ torlauncher.done=å®Œäº†
 
 torlauncher.forAssistance=ã‚µãƒãƒ¼ãƒˆã«ã¤ã„ã¦ã¯ã€%Sã«ãŠå•ã„åˆã‚ã›ãã ã•ã„
 
-torlauncher.bootstrapStatus.conn_dir=ãƒªãƒ¬ãƒ¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸æŽ¥ç¶š
-torlauncher.bootstrapStatus.handshake_dir=æš—å·åŒ–ã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ã®æŽ¥ç¶šã‚’ç¢ºç«‹
+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.conn_or=Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™
 torlauncher.bootstrapStatus.handshake_or=Torå›žç·šã‚’è¨ç½®ã—ã¦ã„ã¾ã™
 torlauncher.bootstrapStatus.done=Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¾ã—ãŸ!
 
 torlauncher.bootstrapWarning.done=å®Œäº†
 torlauncher.bootstrapWarning.connectrefused=æŽ¥ç¶šã«å¤±æ•—
 torlauncher.bootstrapWarning.misc=ãã®ä»–
-torlauncher.bootstrapWarning.resourcelimit=è³‡æºä¸è¶³
+torlauncher.bootstrapWarning.resourcelimit=ãƒªã‚½ãƒ¼ã‚¹ä¸è¶³
 torlauncher.bootstrapWarning.identity=è˜åˆ¥åã®ä¸ä¸€è‡´
 torlauncher.bootstrapWarning.timeout=æŽ¥ç¶šã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆ
 torlauncher.bootstrapWarning.noroute=ãƒ›ã‚¹ãƒˆã¸ã®çµŒè·¯ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index 8091319..0fc76e1 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -1,59 +1,64 @@
-<!ENTITY torsettings.dialog.title "">
+<!ENTITY torsettings.dialog.title "Tor ë„¤íŠ¸ì›Œí¬ ì„¤ì •">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "">
+<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
 <!ENTITY torSettings.yes "ì˜ˆ">
-<!ENTITY torSettings.no "ì•„ë‹ˆë„">
+<!ENTITY torSettings.no "ì•„ë‹ˆì˜¤">
 
-<!ENTITY torSettings.firstQuestion "">
-<!ENTITY torSettings.configurePrompt1 "">
-<!ENTITY torSettings.configurePrompt2 "">
-<!ENTITY torSettings.configure "">
-<!ENTITY torSettings.connectPrompt2 "">
-<!ENTITY torSettings.connectPrompt3 "">
-<!ENTITY torSettings.connect "">
+<!ENTITY torSettings.firstQuestion "ì–´ë–¤ ê²ƒì´ ê·€í•˜ì˜ ìƒí™©ì— ê°€ê¹ìŠµë‹ˆê¹Œ?">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configure "êµ¬ì„±">
+<!ENTITY torSettings.connectPrompt2 "Tor ë„¤íŠ¸ì›Œí¬ì— ì§ì ‘ ì—°ê²°í•˜ê³  ì‹¶ìŠµë‹ˆë‹¤.">
+<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
+<!ENTITY torSettings.connect "ì—°ê²°">
 
-<!ENTITY torSettings.proxyQuestion "">
+<!ENTITY torSettings.proxyQuestion "ì´ ì»´í“¨í„°ëŠ” ì¸í„°ë„·ì— ì ‘ì†í•˜ëŠ” ë° í”„ë¡ì‹œê°€ í•„ìš”í•œê°€ìš”?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "">
-<!ENTITY torSettings.enterProxy "">
-<!ENTITY torSettings.firewallQuestion "">
-<!ENTITY torSettings.firewallHelp "">
-<!ENTITY torSettings.enterFirewall "">
-<!ENTITY torSettings.bridgeQuestion "">
+<!ENTITY torSettings.proxyHelp "ì´ ì§ˆë¬¸ì— ì–´ë–»ê²Œ ëŒ€ë‹µí•´ì•¼ í• ì§€ í™•ì‹ ì´ ì„œì§€ ì•Šìœ¼ë©´ í”„ë¡ì‹œì˜ ì‚¬ìš©ì´ ì–´ë–»ê²Œ ì„¤ì •ë˜ì–´ ìžˆëŠ”ì§€ í™•ì¸í•˜ê¸° ìœ„í•´ ë‹¤ë¥¸ ë¸Œë¼ìš°ì €ì˜ ì¸í„°ë„· ì„¤ì •ì„ ë³´ì„¸ìš”.">
+<!ENTITY torSettings.enterProxy "í”„ë¡ì‹œ ì„¤ì •ì— ë“¤ì–´ê°‘ë‹ˆë‹¤.">
+<!ENTITY torSettings.firewallQuestion "ì´ ì»´í“¨í„°ì˜ ì¸í„°ë„· ì—°ê²°ì€ ë°©í™”ë²½ì„ í†µí•´ì„œ íŠ¹ì • í¬íŠ¸ ì ‘ì†ë§Œ í—ˆê°€í•©ë‹ˆê¹Œ?">
+<!ENTITY torSettings.firewallHelp "ì´ ì§ˆë¬¸ì— ì–´ë–»ê²Œ ëŒ€ë‹µí•´ì•¼ í• ì§€ í™•ì‹ ì´ ì„œì§€ ì•Šìœ¼ë©´ ì•„ë‹ˆì˜¤ë¥¼ ì„ íƒí•˜ì„¸ìš”. Tor ë„¤íŠ¸ì›Œí¬ì— ì ‘ì†í•  ë•Œ ë¬¸ì œë¥¼ ë§Œë‚¬ë‹¤ë©´ ì´ ì„¤ì •ì„ ë³€ê²½í•´ ì£¼ì„¸ìš”.">
+<!ENTITY torSettings.enterFirewall "ë°©í™”ë²½ì— ë”°ë¼ í—ˆê°€ë˜ê³  ìžˆëŠ” í¬íŠ¸ ëª©ë¡ ìž…ë ¥í•´ ì£¼ì„¸ìš”. í¬íŠ¸ ë²ˆí˜¸ëŠ” ì½¤ë§ˆë¡œ êµ¬ë¶„ë©ë‹ˆë‹¤.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "">
-<!ENTITY torsettings.restart "í”„ë¡œê·¸ëž¨ ë‹¤ì‹œ ì‹œìž‘">
+<!ENTITY torsettings.startingTor "Tor ì‹œìž‘ ëŒ€ê¸° ì¤‘...">
+<!ENTITY torsettings.restart "ë‹¤ì‹œ ì‹œìž‘">
 
-<!ENTITY torsettings.optional "">
+<!ENTITY torsettings.optional "ì„ íƒ">
 
-<!ENTITY torsettings.useProxy.checkbox "">
-<!ENTITY torsettings.useProxy.type "">
+<!ENTITY torsettings.useProxy.checkbox "ì´ ì»´í“¨í„°ëŠ” ì¸í„°ë„· ì ‘ì†ì— í”„ë¡ì‹œë¥¼ ì‚¬ìš©í•´ì•¼ í•©ë‹ˆë‹¤.">
+<!ENTITY torsettings.useProxy.type "í”„ë¡ì‹œ ì¢…ë¥˜:">
 <!ENTITY torsettings.useProxy.address "ì£¼ì†Œ:">
-<!ENTITY torsettings.useProxy.address.placeholder "">
+<!ENTITY torsettings.useProxy.address.placeholder "IP ì£¼ì†Œ ë˜ëŠ” í˜¸ìŠ¤íŠ¸ ë„¤ìž„">
 <!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.checkbox "ì´ ì»´í“¨í„°ëŠ” íŠ¹ì • í¬íŠ¸ë§Œ í†µê³¼í•˜ëŠ” ë°©í™”ë²½ì„ ì§€ë‚˜ ì—°ê²°ë©ë‹ˆë‹¤.">
 <!ENTITY torsettings.firewall.allowedPorts "í—ˆìš©ëœ í¬íŠ¸:">
-<!ENTITY torsettings.useBridges.checkbox "">
-<!ENTITY torsettings.useBridges.label "">
-<!ENTITY torsettings.useBridges.placeholder "">
-
-<!ENTITY torsettings.copyLog "">
-<!ENTITY torsettings.bridgeHelpTitle "">
-<!ENTITY torsettings.bridgeHelp1 "">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "">
+<!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 "Enter one or more bridge relays (one per line).">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
+
+<!ENTITY torsettings.copyLog "Tor logë¥¼ í´ë¦½ë³´ë“œì— ë³µì‚¬í•˜ê¸°">
+<!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.&#160; 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 "Send email to bridges at torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!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.&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ko/progress.dtd b/src/chrome/locale/ko/progress.dtd
index 4a26621..dabaa61 100644
--- a/src/chrome/locale/ko/progress.dtd
+++ b/src/chrome/locale/ko/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor ìƒíƒœ">
-<!ENTITY torprogress.openSettings "">
+<!ENTITY torprogress.openSettings "ì‹œìž‘ ì„¤ì •">
 <!ENTITY torprogress.heading "Tor ë„¤íŠ¸ì›Œí¬ì— ì—°ê²°ì¤‘">
-<!ENTITY torprogress.pleaseWait "">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties
index 74aff03..3e3771f 100644
--- a/src/chrome/locale/ko/torlauncher.properties
+++ b/src/chrome/locale/ko/torlauncher.properties
@@ -1,35 +1,40 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-# torlauncher.error_title=Tor Launcher
-
-# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
-# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-# torlauncher.tor_failed_to_start=Tor failed to start.
-# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-torlauncher.tor_bootstrap_failed_details=%1$S ì‹¤íŒ¨ (%2$S).
-
-# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-# torlauncher.tor_missing=The Tor executable is missing.
-# torlauncher.torrc_missing=The torrc file is missing.
-# torlauncher.datadir_missing=The Tor data directory does not exist.
-# torlauncher.password_hash_missing=Failed to get hashed password.
-
-# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
-# torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+torlauncher.error_title=Tor ë¸Œë¼ìš°ì € Launcher
+
+torlauncher.tor_exited=Torê°€ ì˜ˆê¸°ì¹˜ ì•Šê²Œ ì¢…ë£Œë˜ì—ˆìŠµë‹ˆë‹¤.
+torlauncher.please_restart_app=ì´ ì‘ìš©í”„ë¡œê·¸ëž¨ì„ ë‹¤ì‹œ ì‹œìž‘í•´ ì£¼ì„¸ìš”.
+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.error_proxy_addr_missing=ì¸í„°ë„·ì— ì ‘ì†í•˜ê¸° ìœ„í•´ í”„ë¡ì‹œë¥¼ ì‚¬ìš©í•œë‹¤ë©´, Ipì£¼ì†Œë‚˜ í˜¸ìŠ¤íŠ¸ ì´ë¦„, ê·¸ë¦¬ê³  í¬íŠ¸ ë²ˆí˜¸ë¥¼ ìž…ë ¥í•´ì•¼ í•©ë‹ˆë‹¤.
 torlauncher.error_proxy_type_missing=í”„ë¡ì‹œ ìœ í˜•ì„ ì„ íƒí•´ ì£¼ì‹ì‹œì˜¤.
 torlauncher.error_bridges_missing=í•˜ë‚˜ ì´ìƒì˜ bridgeë¥¼ ì§€ì •í•´ì•¼ í•©ë‹ˆë‹¤.
+# 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.recommended_bridge=(ê¶Œìž¥í•¨)
 
-# torlauncher.connect=Connect
+torlauncher.connect=ì—°ê²°
 torlauncher.quit=ëë‚´ê¸°
 torlauncher.quit_win=ì¢…ë£Œ
 torlauncher.done=ì™„ë£Œ
 
-# torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance=ì§€ì›ìž ì—°ê²° %S
 
 torlauncher.bootstrapStatus.conn_dir=ì¤‘ê³„ì„œë²„ ë””ë ‰í† ë¦¬ì— ì—°ê²°
 torlauncher.bootstrapStatus.handshake_dir=ì•”í˜¸í™”ëœ ë””ë ‰í„°ë¦¬ ì—°ê²°ì„ ì„¤ì •
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index 23caff2..8d04d0a 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Vooraleer het Tor Browser Pakket probeert om een verbinding met het Tor netwerk te maken, moet je informatie over de internetverbinding van deze computer opgeven.">
+<!ENTITY torsettings.prompt "Voordat je verbind met het Tor Netwerk, moet je eerst wat meer informatie geven over deze computers internet connectie.">
 
 <!ENTITY torSettings.yes "Ja">
 <!ENTITY torSettings.no "Nee">
 
 <!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?">
 <!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer wordt gecensureerd, gefilterd of geproxyed.">
-<!ENTITY torSettings.configurePrompt2 "Ik moet netwerkinstellingen configureren.">
+<!ENTITY torSettings.configurePrompt2 "Ik moet bridge, firewall, of proxy instellingen wijzigen.">
 <!ENTITY torSettings.configure "Configureer">
 <!ENTITY torSettings.connectPrompt2 "Ik zou graag rechtstreeks met het Tor netwerk verbinden.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "Dit zal in de meeste omstandigheden werken">
 <!ENTITY torSettings.connect "Verbind">
 
 <!ENTITY torSettings.proxyQuestion "Heeft deze computer een proxy nodig om met het internet te verbinden?">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "Loopt de internetverbinding van deze computer door een firewall die enkel toegang tot bepaalde poorten toestaat?">
 <!ENTITY torSettings.firewallHelp "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee. Als je op problemen botst tijdens het verbinden met het Tor netwerk, verander dan deze instelling.">
 <!ENTITY torSettings.enterFirewall "Voer de poorten in die toegestaan zijn door de firewall, gescheiden door komma's.">
-<!ENTITY torSettings.bridgeQuestion "Als de internetverbinding van deze computer gecensureerd wordt, zal je bridge relays &#160; moeten verkrijgen en gebruiken. Als dit niet het geval is, klik op Verbind.">
+<!ENTITY torSettings.bridgeQuestion "Doet je Internet Service Provider (ISP) het Tor netwerk verbieden of filteren?">
+<!ENTITY torSettings.bridgeHelp "Als je niet zeker weet hoe je deze vraag moet beantwoorden, kies dan Nee.&#160; Als je Ja kiest, moet je Tor bridges instellen, die doordat ze geen bekende relays zijn het dus moeilijker maken om verbinding te maken met het Tor Netwerk. ">
+<!ENTITY torSettings.bridgeSettingsPrompt "Je kunt de ingegeven bridges gebruiken, of je kunt een eigen bridge instellen. ">
 
 <!-- Other: -->
 
@@ -44,16 +46,19 @@
 <!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die enkel verbindingen tot bepaalde poorten toestaat.">
 <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:">
 <!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor netwerk">
+<!ENTITY torsettings.useBridges.default "Verbind met ingestelde bridges">
+<!ENTITY torsettings.useBridges.type "Transport type:">
+<!ENTITY torsettings.useBridges.custom "Eigen bridge instellingen">
 <!ENTITY torsettings.useBridges.label "Voer een of meer bridge relays in (een per regel)">
-<!ENTITY torsettings.useBridges.placeholder "adres:poort OF transport adres:poort">
+<!ENTITY torsettings.useBridges.placeholder "type adres:poortnummer">
 
 <!ENTITY torsettings.copyLog "Kopieer Tor log naar het klembord">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Hulp">
-<!ENTITY torsettings.bridgeHelp1 "Als je niet kan verbinden met het Tor netwerk, dan is het mogelijk dat je Internet Service Provider (ISP) of en ander agentschap Tor &#160; blokkeert. Vaak kan je dit probleem omzeilen door gebruik te maken van Tor Bridges. Dit zijn verborgen relays die moeilijker te blokkeren zijn.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Om enkele bridge relays te verkrijgen gebruik je een web browser om de volgende pagina te bezoeken: https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "Een andere manier om openbare bridge addressen te verkrijgen is door e-mail te sturen naar bridges at torproject.org met de woorden 'get bridges' als losstaande tekst in het berichtgedeelte van de e-mail. &#160; Echter: om het moelijker te maken voor een aanvaller om veel bridge adressen te verkrijgen, moet je deze e-mail versturen vanaf een e-mailadres uit Ã©Ã©n van de volgende domeinen: gmail.com of yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "Je kan ook bridge relays opvragen door een e-mail te sturen naar help at rt.torproject.org.">
+<!ENTITY torsettings.bridgeHelp1 "Indien u geen verbinding kan maken met het Tor netwerk, zou het kunnen dat uw Internet Service Provider (ISP) of dergelijke Tor blokkeert.&#160; Vaak kan u dit voorkomen door gebruikt te maken van Tor Bridges, dit zijn ongeregistreerde routers die moeilijker te blokkeren zijn.">
+<!ENTITY torsettings.bridgeHelp1B "Je kan de voor geconfigureerde bridge adres instellingen gebruiken, of je kan hier zelf een eigen adres instellen met 1 van de volgende 3 methodes: ">
+<!ENTITY torsettings.bridgeHelp2Heading "Door middel van het Web">
+<!ENTITY torsettings.bridgeHelp2 "Gebruik een browser om https://bridges.torproject.org te bezoeken">
+<!ENTITY torsettings.bridgeHelp3Heading "Door middel van de E-mail Autoresponder">
+<!ENTITY torsettings.bridgeHelp3 "Zend een e-mail naar bridges at torproject.org met als inhoud van de mail de tekst 'get bridges'.&#160; Let wel, om het aanvallers te bemoeilijken informatie te krijgen over bridge adressen, dient u uw aanvraag te versturen van een gmail.com of yahoo.com e-mailadres.">
+<!ENTITY torsettings.bridgeHelp4Heading "Door middel van de helpdesk">
+<!ENTITY torsettings.bridgeHelp4 "Als laatste redmiddel, kan u bridge adressen aanvraag door een zeer vriendelijke e-mail te sturen naar help at rt.torproject.org.&#160; Houd er wel rekening mee dat deze persoon elke aanvraag moet behandelen.">
diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd
index c46a5f2..89b7b7c 100644
--- a/src/chrome/locale/nl/progress.dtd
+++ b/src/chrome/locale/nl/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor status">
 <!ENTITY torprogress.openSettings "Open Instellingen">
 <!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk">
-<!ENTITY torprogress.pleaseWait "De Tor Browser zal geopend worden zodra een verbinding met het Tor-netwerk gemaakt is.">
+<!ENTITY torprogress.pleaseWait "Wacht alstublieft terwijl we een verbinding met het Tor-netwerk tot stand brengen.">
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index c436126..39fd76a 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor is onverwacht afgesloten.
 torlauncher.please_restart_app=Herstart deze applicatie alstublieft.
 torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort.
 torlauncher.tor_failed_to_start=Tor kon niet starten.
-torlauncher.tor_bootstrap_failed=Tor slaagde er niet in een verbinding met het Tor netwerk te maken.
-torlauncher.tor_bootstrap_failed_details=%1$S mislukt (%2$S).
+torlauncher.tor_control_failed=Controle over Tor mislukt.
+torlauncher.tor_bootstrap_failed=Tor kon geen Tor netwerkverbinding maken
+torlauncher.tor_bootstrap_failed_details=%1$S mislukte (%2$S).
 
 torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S
 torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt.
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Controleer dat Tor actief is alstublieft.
 torlauncher.error_proxy_addr_missing=Je moet zowel een IP-adres of hostnaam en een poortnummer invoeren om Tor te configureren om een â€‹â€‹proxy te gebruiken om toegang te krijgen tot het internet.
 torlauncher.error_proxy_type_missing=Je moet het proxy-type kiezen.
 torlauncher.error_bridges_missing=Je moet Ã©Ã©n of meerdere bridges opgeven.
+torlauncher.error_default_bridges_type_missing=U dient een transport-type te selecteren voor de verstrekte bridges.
+torlauncher.error_bridge_bad_default_type=GÃ©Ã©n van de verstrekte bridges met het transport-type %S zijn beschikbaar. Pas aub uw instellingen aan.
+
+torlauncher.recommended_bridge=(aanbevolen)
 
 torlauncher.connect=Verbind
 torlauncher.quit=Stop
@@ -38,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=Laden van de netwerkstatus
 torlauncher.bootstrapStatus.loading_keys=Laden van de authoriteitcertificaten
 torlauncher.bootstrapStatus.requesting_descriptors=Opvragen van verbindingsinformatie
 torlauncher.bootstrapStatus.loading_descriptors=Laden van verbindingsinformatie
-torlauncher.bootstrapStatus.conn_or=Verbinden met het Tor-netwerk
+torlauncher.bootstrapStatus.conn_or=Bezig met verbinden met het Tor-netwerk
 torlauncher.bootstrapStatus.handshake_or=Maken van een Tor circuit
 torlauncher.bootstrapStatus.done=Verbonden met het Tor-netwerk!
 
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index f18352a..149647e 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Przed poÅ‚Ä…czeniem z sieciÄ… Tor musisz podaÄ‡ informacje o poÅ‚Ä…czeniu internetowym tego komputera.">
+<!ENTITY torsettings.prompt "Zanim podÅ‚Ä…czysz siÄ™ do sieci Tor, uzupeÅ‚nij informacje o parametrach poÅ‚Ä…czenia tego komputera z internetem.">
 
 <!ENTITY torSettings.yes "Tak">
 <!ENTITY torSettings.no "Nie">
 
 <!ENTITY torSettings.firstQuestion "KtÃ³re z poniÅ¼szych najlepiej opisuje TwojÄ… sytuacjÄ™?">
 <!ENTITY torSettings.configurePrompt1 "PoÅ‚Ä…czenie tego komputera jest cenzurowane, filtrowane lub przekierowywane.">
-<!ENTITY torSettings.configurePrompt2 "PotrzebujÄ™ dostosowaÄ‡ ustawienia sieci.">
+<!ENTITY torSettings.configurePrompt2 "MuszÄ™ skonfigurowaÄ‡ most, firewall lub ustawienia serwera proxy.">
 <!ENTITY torSettings.configure "Konfiguruj">
 <!ENTITY torSettings.connectPrompt2 "ChcÄ™ poÅ‚Ä…czyÄ‡ siÄ™ bezpoÅ›rednio z sieciÄ… Tor.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "To zadziaÅ‚a w wiÄ™kszoÅ›ci sytuacji.">
 <!ENTITY torSettings.connect "PoÅ‚Ä…cz">
 
 <!ENTITY torSettings.proxyQuestion "Czy ten komputer potrzebuje proxy w celu poÅ‚Ä…czenia siÄ™ z Internetem?">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "Czy poÅ‚Ä…czenie internetowe Twojego komputera pozwala przejÅ›Ä‡ przez zaporÄ™ sieciowÄ… w celu nawiÄ…zania poÅ‚Ä…czenia z ustalonymi portami?">
 <!ENTITY torSettings.firewallHelp "JeÅ›li nie jesteÅ› pewien jak odpowiedzieÄ‡ na to pytanie, wybierz Nie. W przypadku wystÄ…pienia problemÃ³w z poÅ‚Ä…czeniem, zmieÅ„ tÄ… opcjÄ™.">
 <!ENTITY torSettings.enterFirewall "WprowadÅº listÄ™ portÃ³w dozwolonych przez zaporÄ™ (kolejne porty oddzielaj przecinkiem).">
-<!ENTITY torSettings.bridgeQuestion "JeÅ›li poÅ‚Ä…czenie internetowe tego komputera jest cenzurowane, wymagane bÄ™dzie wykorzystanie przekaÅºnikÃ³w mostkowych.&#160; JeÅ›li nie, wybierz PoÅ‚Ä…cz.">
+<!ENTITY torSettings.bridgeQuestion "Czy TwÃ³j dostawca usÅ‚ug internetowych (ISP) blokuje lub ocenzurowuje poÅ‚Ä…czenia sieci Tor?">
+<!ENTITY torSettings.bridgeHelp "JeÅ›li nie jesteÅ› pewny odpowiedzi na to pytanie proszÄ™ wybraÄ‡ odpowiedÅº Nie.&#160; JeÅ›li wybierzesz Tak, to bÄ™dziesz poproszony o skonfigurowanie mostkÃ³w Tora, ktÃ³re nie sÄ… publicznie wymienione, dziÄ™ki czemu bÄ™dzie trudniej zablokowaÄ‡ poÅ‚Ä…czenia do sieci Tor.">
+<!ENTITY torSettings.bridgeSettingsPrompt "MoÅ¼esz wybraÄ‡ dostÄ™pny zestaw mostkÃ³w, albo moÅ¼esz uzyskaÄ‡ i wprowadziÄ‡ niestandardowy zestaw mostÃ³w.">
 
 <!-- Other: -->
 
@@ -44,16 +46,19 @@
 <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na poÅ‚Ä…czenie z ustalonymi portami">
 <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:">
 <!ENTITY torsettings.useBridges.checkbox "MÃ³j dostawca internetu blokuje poÅ‚Ä…czenia do sieci Tor">
+<!ENTITY torsettings.useBridges.default "PoÅ‚Ä…cz z dostÄ™pnymi mostami.">
+<!ENTITY torsettings.useBridges.type "Typ Transportu:">
+<!ENTITY torsettings.useBridges.custom "WprowadÅº wÅ‚asne mosty">
 <!ENTITY torsettings.useBridges.label "Dodaj jeden lub wiÄ™cej przekaÅºnikÃ³w mostowych (jeden w kaÅ¼dej linijce)">
-<!ENTITY torsettings.useBridges.placeholder "adres:port ALBO transport adres:port">
+<!ENTITY torsettings.useBridges.placeholder "wpisz adres:port">
 
 <!ENTITY torsettings.copyLog "Skopiuj log do schowka">
 <!ENTITY torsettings.bridgeHelpTitle "Pomoc PrzekaÅºnikÃ³w Mostkowych">
-<!ENTITY torsettings.bridgeHelp1 "JeÅ›li nie moÅ¼esz poÅ‚Ä…czyÄ‡ siÄ™ z sieciÄ… Tor moÅ¼liwe jest, Å¼e TwÃ³j dostawca internetu (ISP) blokuje Ci ten dostÄ™p&#160. CzÄ™stym rozwiÄ…zaniem jest uÅ¼ycie mostkÃ³w Tora, w ktÃ³rych ukryte sÄ… przekaÅºniki trudne do wykrycia.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "W celu uzyskania przekaÅºnikÃ³w mostkowych skorzystaÄ‡ ze strony  https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "InnÄ… drogÄ… do znalezienia publicznych mostkÃ³w jest wysÅ‚anie e-maila do bridges at torproject.org z poleceniem 'get bridges' w tytule wiadomoÅ›ci.&#160; JednakÅ¼e, by utrudniÄ‡ atakujÄ…cym dostÄ™p do wiedzy o mostkach musisz wysÅ‚aÄ‡ zapytanie z adresu o domenach: gmail.com lub yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "MoÅ¼esz zgÅ‚osiÄ‡ mostki wysyÅ‚ajÄ…c e-maila do help at rt.torproject.org.">
+<!ENTITY torsettings.bridgeHelp1 "JeÅ›li nie jesteÅ› w stanie poÅ‚Ä…czyÄ‡ siÄ™ z sieciÄ… Tor, moÅ¼e to oznaczaÄ‡, Å¼e TwÃ³j Dostawca UsÅ‚ug Internetowych (ISP) lub inna agencja blokuje dostÄ™p do sieci Tor.&#160; CzÄ™sto moÅ¼na obejÅ›Ä‡ ten problem uÅ¼ywajÄ…c MostÃ³w Tor, ktÃ³re sÄ… nienotowanymi przekaÅºnikami, dziÄ™ki czemu trudniej je zablokowaÄ‡.">
+<!ENTITY torsettings.bridgeHelp1B "MoÅ¼esz uÅ¼yÄ‡ wstÄ™pnie skonfigurowany, domyÅ›lny zestaw adresÃ³w mostÃ³w lub moÅ¼esz uzyskaÄ‡ wÅ‚asny zestaw adresÃ³w za pomocÄ… jednej z tych trzech metod:">
+<!ENTITY torsettings.bridgeHelp2Heading "Za poÅ›rednictwem sieci Web">
+<!ENTITY torsettings.bridgeHelp2 "UÅ¼yj przeglÄ…darki internetowej do odwiedzenia https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder">
+<!ENTITY torsettings.bridgeHelp3 "WyÅ›lij e-mail do bridges at torproject.org z liniÄ… "get bridges" w treÅ›ci wiadomoÅ›ci.&#160; Aby jednak, utrudniÄ‡ napastnikom naukÄ™ o adresach mostÃ³w, naleÅ¼y wysÅ‚aÄ‡ proÅ›bÄ™ z adresu email gmail.com lub yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "Przez Help Desk">
+<!ENTITY torsettings.bridgeHelp4 "W ostatecznoÅ›ci, moÅ¼na zaÅ¼Ä…daÄ‡ adresÃ³w mostÃ³w, wysyÅ‚ajÄ…c uprzejmÄ… wiadomoÅ›Ä‡ e-mail do help at rt.torproject.org.&#160;  NaleÅ¼y pamiÄ™taÄ‡, Å¼e osoba bÄ™dzie musiaÅ‚a odpowiedzieÄ‡ na kaÅ¼de Å¼Ä…danie.">
diff --git a/src/chrome/locale/pl/progress.dtd b/src/chrome/locale/pl/progress.dtd
index d7d1ccc..f8d75cc 100644
--- a/src/chrome/locale/pl/progress.dtd
+++ b/src/chrome/locale/pl/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Status sieci Tor">
 <!ENTITY torprogress.openSettings "Ustawienia">
 <!ENTITY torprogress.heading "ÅÄ…czenie z sieciÄ… Tor">
-<!ENTITY torprogress.pleaseWait "PrzeglÄ…darka Tor uruchomi siÄ™ po zestawieniu poÅ‚Ä…czenia z sieciÄ… Tor">
+<!ENTITY torprogress.pleaseWait "Poczekaj chwilÄ™, aÅ¼ ustanowimy poÅ‚Ä…czenie z sieciÄ… Tor.">
diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties
index 8a9482b..847d994 100644
--- a/src/chrome/locale/pl/torlauncher.properties
+++ b/src/chrome/locale/pl/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor wyÅ‚Ä…czyÅ‚ siÄ™ niespodziewanie.
 torlauncher.please_restart_app=ProszÄ™ zrestartuj tÄ… aplikacjÄ™.
 torlauncher.tor_controlconn_failed=Nie moÅ¼na poÅ‚Ä…czyÄ‡ siÄ™ z portem kontrolnym Tora.
 torlauncher.tor_failed_to_start=Nie powiodÅ‚o siÄ™ wÅ‚Ä…czenie Tora.
-torlauncher.tor_bootstrap_failed=BÅ‚Ä…d w ustanowieniu poÅ‚Ä…czenia przez Tora.
-torlauncher.tor_bootstrap_failed_details=%1$S nie powiodÅ‚o siÄ™ (%2$S).
+torlauncher.tor_control_failed=Nie udaÅ‚o siÄ™ przejÄ…Ä‡ kontroli nad Tor'em.
+torlauncher.tor_bootstrap_failed=BÅ‚Ä…d Tor, nie udaÅ‚o siÄ™ nawiÄ…zaÄ‡ poÅ‚Ä…czenia z sieciÄ… Tora.
+torlauncher.tor_bootstrap_failed_details=%1$S bÅ‚Ä…d (%2$S).
 
 torlauncher.unable_to_start_tor=Nie moÅ¼na wystartowaÄ‡ aplikacji Tor.\n\n%S
 torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora.
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=ProszÄ™ upewniÄ‡ siÄ™, czy Tor jest wÅ‚Ä…czony
 torlauncher.error_proxy_addr_missing=Musisz okreÅ›liÄ‡ adres IP lub nazwÄ™ hosta oraz numer portu, aby Tor mÃ³gÅ‚ uÅ¼ywaÄ‡ serwera proxy w dostÄ™pie do Internetu.
 torlauncher.error_proxy_type_missing=Musisz wybraÄ‡ typ proxy.
 torlauncher.error_bridges_missing=Musisz podaÄ‡ jeden lub wiÄ™cej mostÃ³w. (bridges)
+torlauncher.error_default_bridges_type_missing=Musisz wybraÄ‡ rodzaj transportu dla dostÄ™pnych mostÃ³w.
+torlauncher.error_bridge_bad_default_type=Brak dostÄ™pnych mostkÃ³w, ktÃ³re majÄ… typ transportu %S. ProszÄ™ zmieniÄ‡ swoje ustawienia.
+
+torlauncher.recommended_bridge=(zalecane)
 
 torlauncher.connect=PoÅ‚Ä…cz
 torlauncher.quit=WyjÅ›cie
@@ -38,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=Wczytywanie stanu sieci
 torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatÃ³w
 torlauncher.bootstrapStatus.requesting_descriptors=Å»Ä…danie informacji o wÄ™Åºle
 torlauncher.bootstrapStatus.loading_descriptors=Wczytywanie informacji o wÄ™Åºle
-torlauncher.bootstrapStatus.conn_or=PodÅ‚Ä…czanie do sieci Tor
+torlauncher.bootstrapStatus.conn_or=ÅÄ…czenie z sieciÄ… Tor
 torlauncher.bootstrapStatus.handshake_or=Ustanawianie Å›cieÅ¼ki Tora
 torlauncher.bootstrapStatus.done=PoÅ‚Ä…czony z sieciÄ… Tor!
 
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index e998fb1..9c5b2f1 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Antes que o Tor Browser Bundle tente ligar-se Ã  rede Tor, Ã© necessÃ¡rio fornecer algumas informaÃ§Ãµes sobre a ligaÃ§Ã£o Ã  Internet deste computador.">
+<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
 <!ENTITY torSettings.yes "Sim">
 <!ENTITY torSettings.no "NÃ£o">
 
 <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situaÃ§Ã£o?">
 <!ENTITY torSettings.configurePrompt1 "A ligaÃ§Ã£o Ã  Internet deste computador estÃ¡ a ser censurada, filtrada ou utilizada atravÃ©s de um proxy.">
-<!ENTITY torSettings.configurePrompt2 "Preciso de configuar definiÃ§Ãµes de rede.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
 <!ENTITY torSettings.configure "Configurar">
 <!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente Ã  rede Tor.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Ligar">
 
 <!ENTITY torSettings.proxyQuestion "Este computador precisa de usar um proxy para aceder a Internet?">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "A ligaÃ§Ã£o Ã  Internet deste computador atravessa um firewall que sÃ³ permite algumas ligaÃ§Ãµes a certas portas?">
 <!ENTITY torSettings.firewallHelp "Se nÃ£o tem a certeza de como responder esta questÃ£o, escolha NÃ£o. Se encontrar quaisquer problemas ao ligar-se Ã¡ rede Tor, mude esta definiÃ§Ã£o.">
 <!ENTITY torSettings.enterFirewall "Introduza uma lista de portas separada por vÃrgulas que sÃ£o permitidas pela firewall.">
-<!ENTITY torSettings.bridgeQuestion "Se a ligaÃ§Ã£o Ã  internet deste computador estÃ¡ a ser censurada, precisarÃ¡ de obter e usar bridge relays.&#160; Se nÃ£o, clique apenas Ligar.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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: -->
 
@@ -44,16 +46,19 @@
 <!ENTITY torsettings.firewall.checkbox "Este computador estÃ¡ protegido por um firewall que permite apenas algumas ligaÃ§Ãµes a algumas portas.">
 <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:">
 <!ENTITY torsettings.useBridges.checkbox "O meu Internet Service Provider (ISP) bloqueia ligaÃ§Ãµes Ã  rede 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 "Introduza um ou mais relays bridge (um por linha).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OU transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
 
 <!ENTITY torsettings.copyLog "Copiar o Tor Log para o Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Ajuda Bridge Relay">
-<!ENTITY torsettings.bridgeHelp1 "Se nÃ£o consegue ligar-se Ã  rede Tor, o seu Internet Service Provider (ISP) ou outra agÃªncia estÃ¡ a bloquear o Tor.&#160; Muito frequentemente poderÃ¡ contornar este problema usando Bridges Tor que sÃ£o relays escondidos mais difÃceis de bloquear.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Para obter alguns bridge relays, utilize um navegador web para visitar a seguinte pÃ¡gina: https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "Outra forma de encontrar enderenÃ§oes de bridges pÃºblicos Ã© enviar um e-mail para bridges at torproject.org com "get bridges" no corpo da mensagem.&#160; Contudo, para tornar mais difÃcil para um atacante descobrir muito sobre endereÃ§Ãµes bridge, deve enviar este pedido a partir de um endereÃ§o de e-mail de um dos seguintes domÃnios: gmail.com ou yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "TambÃ©m pode pedir bridge relays enviando um e-mail para help at rt.torproject.org.">
+<!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.&#160; 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 "Send email to bridges at torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!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.&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd
index 92136c4..473438c 100644
--- a/src/chrome/locale/pt/progress.dtd
+++ b/src/chrome/locale/pt/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado do Tor">
 <!ENTITY torprogress.openSettings "Abrir ConfiguraÃ§Ãµes">
-<!ENTITY torprogress.heading "Conectando Ã  rede Tor">
-<!ENTITY torprogress.pleaseWait "O Navegador Tor vai abrir-se assim que se estabeleÃ§a uma ligaÃ§Ã£o Ã  rede Tor.">
+<!ENTITY torprogress.heading "A conetar Ã  rede Tor">
+<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nÃ³s estabelecemos uma ligaÃ§Ã£o Ã  rede Tor">
diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties
index 13008d4..08961b1 100644
--- a/src/chrome/locale/pt/torlauncher.properties
+++ b/src/chrome/locale/pt/torlauncher.properties
@@ -4,49 +4,54 @@
 torlauncher.error_title=Iniciador Tor
 
 torlauncher.tor_exited=O Tor fechou-se insperadamente.
-torlauncher.please_restart_app=Por favor reinicie a aplicaÃ§Ã£o.
-torlauncher.tor_controlconn_failed=NÃ£o foi possÃvel ligar Ã  porta de controlo do Tor.
+torlauncher.please_restart_app=Por favor, reinicie a aplicaÃ§Ã£o.
+torlauncher.tor_controlconn_failed=NÃ£o foi possÃvel ligar ao porto de controlo do Tor.
 torlauncher.tor_failed_to_start=O Tor falhou a inicializaÃ§Ã£o.
-torlauncher.tor_bootstrap_failed=o Tor nÃ£o conseguiu ligar-se Ã  rede Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S Falhou (%2$S).
+torlauncher.tor_control_failed=Falha ao tentar controlar o Tor
+torlauncher.tor_bootstrap_failed=O Tor falhou ao estabelecer uma ligaÃ§Ã£o de rede Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S).
 
-torlauncher.unable_to_start_tor=ImpossÃvel inicializar o Tor.\n\n %S
+torlauncher.unable_to_start_tor=NÃ£o Ã© possÃvel iniciar o Tor.\n\n %S
 torlauncher.tor_missing=O executÃ¡vel do Tor estÃ¡ em falta.
-torlauncher.torrc_missing=O ficheiro  estÃ¡ em falta.
-torlauncher.datadir_missing=A diretoria de dados do Tor nÃ£o existe.
-torlauncher.password_hash_missing=Falhou 
+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=Incapaz de aceder as definiÃ§Ãµes do Tor\n\n %S
-torlauncher.failed_to_save_settings=Incapaz de gavar as definiÃ§Ãµes do Tor\n\n %S
-torlauncher.ensure_tor_is_running=Por favor confirme que o Tor estÃ¡ a correr.
+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.ensure_tor_is_running=Por favor, verifique se o Tor estÃ¡ em execuÃ§Ã£o.
 
-torlauncher.error_proxy_addr_missing=Deve especificar tanto um endereÃ§o IP ou nome do hospedeiro como um nÃºmero de porta, para configurar o Tor para utilizar um proxy para aceder Ã  Internet.
-torlauncher.error_proxy_type_missing=Tem de seleccionar o tipo de proxy
+torlauncher.error_proxy_addr_missing=Deve especificar tanto um endereÃ§o IP ou nome do hospedeiro como um nÃºmero de porto, para configurar o Tor para utilizar um proxy para aceder Ã  Internet.
+torlauncher.error_proxy_type_missing=Deve selecionar o tipo de proxy.
 torlauncher.error_bridges_missing=Deve especificar uma ou mais pontes.
+torlauncher.error_default_bridges_type_missing=Deve selecionar o tipo de transporte para as pontes fornecidas
+torlauncher.error_bridge_bad_default_type=NÃ£o hÃ¡ pontes disponÃveis que tenham o tipo de transport %S. Por favor ajuste as configuraÃ§Ãµes.
+
+torlauncher.recommended_bridge=(recomendado)
 
 torlauncher.connect=Ligar
 torlauncher.quit=Sair
 torlauncher.quit_win=Sair
 torlauncher.done=Completo
 
-torlauncher.forAssistance=Para assistÃªncia contacte %S
+torlauncher.forAssistance=Para assistÃªncia, contacte %S
 
-torlauncher.bootstrapStatus.conn_dir=Conectando-se a uma pasta do retransmissor
-torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexÃ£o de pasta criptografada
-torlauncher.bootstrapStatus.requesting_status=A recuperar o estado da rede
+torlauncher.bootstrapStatus.conn_dir=A ligar ao diretÃ³rio do retransmissor
+torlauncher.bootstrapStatus.handshake_dir=A estabelecer uma ligaÃ§Ã£o de diretÃ³rio encriptada
+torlauncher.bootstrapStatus.requesting_status=A obter o estado da rede
 torlauncher.bootstrapStatus.loading_status=A carregar o estado da rede
-torlauncher.bootstrapStatus.loading_keys=A carregar o certificados de autoridade
-torlauncher.bootstrapStatus.requesting_descriptors=Pedindo informaÃ§Ã£o do retransmissor
-torlauncher.bootstrapStatus.loading_descriptors=Carregando informaÃ§Ãµes do retransmissor
-torlauncher.bootstrapStatus.conn_or=Conectando Ã  rede Tor
-torlauncher.bootstrapStatus.handshake_or=Estabelecendo um circuito Tor
-torlauncher.bootstrapStatus.done=Conectado Ã  rede Tor
-
-torlauncher.bootstrapWarning.done=Feito
-torlauncher.bootstrapWarning.connectrefused=conexÃ£o recusada
+torlauncher.bootstrapStatus.loading_keys=A carregar os certificados de autoridade
+torlauncher.bootstrapStatus.requesting_descriptors=A pedir informaÃ§Ã£o do retransmissor
+torlauncher.bootstrapStatus.loading_descriptors=A carregar informaÃ§Ãµes do retransmissor
+torlauncher.bootstrapStatus.conn_or=A ligar Ã  rede Tor
+torlauncher.bootstrapStatus.handshake_or=A estabelecer um circuito Tor
+torlauncher.bootstrapStatus.done=Ligado Ã  rede Tor
+
+torlauncher.bootstrapWarning.done=finalizado
+torlauncher.bootstrapWarning.connectrefused=ligaÃ§Ã£o recusada
 torlauncher.bootstrapWarning.misc=diversos
 torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes
-torlauncher.bootstrapWarning.identity=identidade incompatÃvel
+torlauncher.bootstrapWarning.identity=identidade nÃ£o correspondente
 torlauncher.bootstrapWarning.timeout=Tempo de ligaÃ§Ã£o expirado
 torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro
 torlauncher.bootstrapWarning.ioerror=Erro de leitura/escrita 
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index c84d7de..e8edaf2 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "ÐŸÑ€ÐµÐ¶Ð´Ðµ Ñ‡ÐµÐ¼ Ð¿Ð°ÐºÐµÑ‚ Tor Browser Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°ÐµÑ‚ÑÑ ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ Ñ ÑÐµÑ‚ÑŒÑŽ Tor, Ð²Ð°Ð¼ Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾Ð± Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸ ÑÑ‚Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°">
+<!ENTITY torsettings.prompt "ÐŸÑ€ÐµÐ¶Ð´Ðµ Ñ‡ÐµÐ¼ Ð²Ñ‹ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐµÑ‚Ð¸ Tor, Ð²Ð°Ð¼ Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾Ð± Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸ ÑÑ‚Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°.">
 
 <!ENTITY torSettings.yes "Ð”Ð°">
 <!ENTITY torSettings.no "ÐÐµÑ‚">
 
 <!ENTITY torSettings.firstQuestion "Ð§Ñ‚Ð¾ Ð»ÑƒÑ‡ÑˆÐµ Ð¾Ð¿Ð¸ÑÑ‹Ð²Ð°ÐµÑ‚ Ð²Ð°ÑˆÑƒ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸ÑŽ?">
 <!ENTITY torSettings.configurePrompt1 "Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ ÑÑ‚Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸Ñ€ÑƒÐµÑ‚ÑÑ, Ñ„Ð¸Ð»ÑŒÑ‚Ñ€ÑƒÐµÑ‚ÑÑ Ð¸Ð»Ð¸ Ð½Ð°Ñ…Ð¾Ð´ÑÑ‚ÑÑ Ð·Ð° Ð¿Ñ€Ð¾ÐºÑÐ¸.">
-<!ENTITY torSettings.configurePrompt2 "ÐœÐ½Ðµ Ð½ÑƒÐ¶Ð½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ ÑÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹.">
+<!ENTITY torSettings.configurePrompt2 "ÐœÐ½Ðµ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð¼Ð¾ÑÑ‚, Ð±Ñ€Ð°Ð½Ð´Ð¼Ð°ÑƒÑÑ€ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¾ÐºÑÐ¸.">
 <!ENTITY torSettings.configure "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ">
 <!ENTITY torSettings.connectPrompt2 "Ð¯ Ð±Ñ‹ Ñ…Ð¾Ñ‚ÐµÐ» ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ Ñ ÑÐµÑ‚ÑŒÑŽ Tor Ð½Ð°Ð¿Ñ€ÑÐ¼ÑƒÑŽ.">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "ÐÑ‚Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ Ð² Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ð¹.">
 <!ENTITY torSettings.connect "Ð¡Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ">
 
 <!ENTITY torSettings.proxyQuestion "ÐÑ‚Ð¾Ð¼Ñƒ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñƒ Ð½ÑƒÐ¶ÐµÐ½ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ð² Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚?">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "Ð—Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð¾ Ð»Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð±Ñ€Ð°Ð½Ð´Ð¼Ð°ÑƒÑÑ€Ð¾Ð¼, Ñ€Ð°Ð·Ñ€ÐµÑˆÐ°ÑŽÑ‰Ð¸Ð¼ ÑÐ²ÑÐ·ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ‡ÐµÑ€ÐµÐ· Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ð¾Ñ€Ñ‚Ñ‹?">
 <!ENTITY torSettings.firewallHelp "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ ÐºÐ°Ðº Ð¾Ñ‚Ð²ÐµÑ‡Ð°Ñ‚ÑŒ, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð½ÐµÑ‚. Ð•ÑÐ»Ð¸ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½ÑƒÑ‚ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑÐµÑ‚ÑŒÑŽ Tor, Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚Ðµ ÑÑ‚Ñƒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ.">
 <!ENTITY torSettings.enterFirewall "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ñ€Ñ‚Ð¾Ð² Ñ‡ÐµÑ€ÐµÐ· Ð·Ð°Ð¿ÑÑ‚ÑƒÑŽ, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±Ñ€Ð°Ð½Ð´Ð¼Ð°ÑƒÑÑ€ Ð½Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚.">
-<!ENTITY torSettings.bridgeQuestion "Ð•ÑÐ»Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ ÑÑ‚Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸Ñ€ÑƒÐµÑ‚ÑÑ, Ð²Ð°Ð¼ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸Ñ‚ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ñ‹ Ñ‚Ð¸Ð¿Ð° Ð¼Ð¾ÑÑ‚.&#160; Ð•ÑÐ»Ð¸ Ð½ÐµÑ‚, Ð¿Ñ€Ð¾ÑÑ‚Ð¾ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ.">
+<!ENTITY torSettings.bridgeQuestion "Ð’Ð°Ñˆ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚ Ð¸Ð»Ð¸ ÐºÐ°Ðº-Ð»Ð¸Ð±Ð¾ Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸Ñ€ÑƒÐµÑ‚ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ‚Ð¸ Tor?">
+<!ENTITY torSettings.bridgeHelp "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚Ðµ, ÐºÐ°Ðº Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ð²Ð¾Ð¿Ñ€Ð¾Ñ, Ð²Ñ‹Ð±Ð¸Ñ€Ð°Ð¹Ñ‚Ðµ ÐÐµÑ‚.&#160; Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð²Ñ‹Ð±ÐµÑ€ÐµÑ‚Ðµ Ð”Ð°, Ð²Ð°Ñ Ð¿Ð¾Ð¿Ñ€Ð¾ÑÑÑ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð¼Ð¾ÑÑ‚Ñ‹ Tor, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ÑÐ²Ð»ÑÑŽÑ‚ÑÑ Ð½ÐµÐ¾Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ‚Ð¾Ñ€Ð°Ð¼Ð¸, Ñ‡Ñ‚Ð¾ Ð·Ð°Ñ‚Ñ€ÑƒÐ´Ð½ÑÐµÑ‚ Ð¸Ñ… Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÑƒ.">
+<!ENTITY torSettings.bridgeSettingsPrompt "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€ÐµÐ´Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ð½Ð°Ð±Ð¾Ñ€ Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð¸Ð»Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¸ Ð²Ð²ÐµÑÑ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ.">
 
 <!-- Other: -->
 
@@ -44,16 +46,19 @@
 <!ENTITY torsettings.firewall.checkbox "ÐœÐ¾Ð¹ ÑÐµÑ‚ÐµÐ²Ð¾Ð¹ ÑÐºÑ€Ð°Ð½ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ‚ Ð¼Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ðº Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼ Ð¿Ð¾Ñ€Ñ‚Ð°Ð¼">
 <!ENTITY torsettings.firewall.allowedPorts "Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½Ñ‹Ðµ Ð¿Ð¾Ñ€Ñ‚Ñ‹:">
 <!ENTITY torsettings.useBridges.checkbox "ÐœÐ¾Ð¹ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÐµÑ‚Ð¸ Tor">
+<!ENTITY torsettings.useBridges.default "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº Ð¿Ñ€ÐµÐ´Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼ Ð¼Ð¾ÑÑ‚Ð°Ð¼">
+<!ENTITY torsettings.useBridges.type "Ð¢Ð¸Ð¿ Ñ‚Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚Ð°:">
+<!ENTITY torsettings.useBridges.custom "Ð’Ð²ÐµÑÑ‚Ð¸ Ð¼Ð¾ÑÑ‚Ñ‹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ">
 <!ENTITY torsettings.useBridges.label "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¾Ð´Ð¸Ð½ Ð¸Ð»Ð¸ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð¾Ð² Ñ‚Ð¸Ð¿Ð° Ð¼Ð¾ÑÑ‚ (Ð¾Ð´Ð¸Ð½ Ð½Ð° ÑÑ‚Ñ€Ð¾ÐºÑƒ)">
-<!ENTITY torsettings.useBridges.placeholder "address:port Ð˜Ð›Ð˜ transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð°Ð´Ñ€ÐµÑ:Ð¿Ð¾Ñ€Ñ‚">
 
 <!ENTITY torsettings.copyLog "Ð¡ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð» Tor Ð² Ð±ÑƒÑ„ÐµÑ€ Ð¾Ð±Ð¼ÐµÐ½Ð°">
 <!ENTITY torsettings.bridgeHelpTitle "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ Ð¿Ð¾ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð°Ð¼ Ñ‚Ð¸Ð¿Ð° Ð¼Ð¾ÑÑ‚">
-<!ENTITY torsettings.bridgeHelp1 "Ð•ÑÐ»Ð¸ Tor Ð¿Ð¾-Ð¿Ñ€ÐµÐ¶Ð½ÐµÐ¼Ñƒ Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚, Ð²Ð¿Ð¾Ð»Ð½Ðµ Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, Ñ‡Ñ‚Ð¾ Ð’Ð°Ñˆ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚ Tor. &#160; ÐžÑ‡ÐµÐ½ÑŒ Ñ‡Ð°ÑÑ‚Ð¾ ÑÑ‚Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ð¾Ð¹Ñ‚Ð¸ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Tor Ð¼Ð¾ÑÑ‚Ð¾Ð² - ÑÐºÑ€Ñ‹Ñ‚Ñ‹Ñ… Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð¾Ð², ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ðµ Ñ‚Ð°Ðº Ð»ÐµÐ³ÐºÐ¾ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ.">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð½Ð°Ð¹Ñ‚Ð¸ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ñ‹ Ñ‚Ð¸Ð¿Ð° Ð¼Ð¾ÑÑ‚ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÐ¹Ñ‚ÐµÑÑŒ Ð¿Ð¾ Ð°Ð´Ñ€ÐµÑÑƒ https://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "Ð”Ñ€ÑƒÐ³Ð¾Ð¹ ÑÐ¿Ð¾ÑÐ¾Ð± Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð°Ð´Ñ€ÐµÑÐ° - Ð¿Ð¾ÑÐ»Ð°Ñ‚ÑŒ Ð¿Ð¸ÑÑŒÐ¼Ð¾ Ð½Ð° Ð°Ð´Ñ€ÐµÑ bridges at torproject.org ÑÐ¾ ÑÑ‚Ñ€Ð¾ÐºÐ¾Ð¹ get bridges Ð² Ñ‚ÐµÐ»Ðµ Ð¿Ð¸ÑÑŒÐ¼Ð°. Ð’ Ñ†ÐµÐ»ÑÑ… Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚ Ð¿Ð¸ÑÑŒÐ¼Ð° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ Ð°Ð´Ñ€ÐµÑÐ¾Ð² gmail.com Ð¸ yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "Ð’Ñ‹ Ñ‚Ð°ÐºÐ¶Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð¿Ñ€Ð¾ÑÐ¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ð² Ð¿Ð¸ÑÑŒÐ¼Ð¾ Ð½Ð° help at rt.torproject.org">
+<!ENTITY torsettings.bridgeHelp1 "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº ÑÐµÑ‚Ð¸ Tor, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²Ð°Ñˆ Ð¿Ñ€Ð¾Ð²Ð°Ð¹Ð´ÐµÑ€ (ISP) Ð¸Ð»Ð¸ Ð¸Ð½Ð°Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚ Tor.&#160; Ð§Ð°ÑÑ‚Ð¾ ÑÑ‚Ñƒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ð¾Ð¹Ñ‚Ð¸ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ Ð¼Ð¾ÑÑ‚Ð¾Ð² Tor, Ð½Ðµ Ð¿ÐµÑ€ÐµÑ‡Ð¸ÑÐ»ÐµÐ½Ð½Ñ‹Ñ… Ð² Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… ÑÐ¿Ð¸ÑÐºÐ°Ñ…, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ÑÐ»Ð¾Ð¶Ð½ÐµÐµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ.">
+<!ENTITY torsettings.bridgeHelp1B "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ð¿Ñ€ÐµÐ´Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ð½Ð°Ð±Ð¾Ñ€ Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð¸Ð»Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¸ Ð²Ð²ÐµÑÑ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· ÑÑ‚Ð¸Ñ… Ñ‚Ñ€Ñ‘Ñ… Ð¼ÐµÑ‚Ð¾Ð´Ð¾Ð²:">
+<!ENTITY torsettings.bridgeHelp2Heading "Ð˜Ð· Ð’ÐµÐ±">
+<!ENTITY torsettings.bridgeHelp2 "ÐžÑ‚ÐºÑ€Ð¾Ð¹Ñ‚Ðµ Ð² Ð²ÐµÐ±-Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ðµ https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "Ð§ÐµÑ€ÐµÐ· Ð°Ð²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸Ðº ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹">
+<!ENTITY torsettings.bridgeHelp3 "ÐžÑ‚Ð¿Ñ€Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¸ÑÑŒÐ¼Ð¾ Ð¿Ð¾ Ð°Ð´Ñ€ÐµÑÑƒ bridges at torproject.org ÑÐ¾ ÑÑ‚Ñ€Ð¾ÐºÐ¾Ð¹ 'get bridges' Ð² Ñ‚ÐµÐ»Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ.&#160; ÐžÐ´Ð½Ð°ÐºÐ¾ Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÐ»Ð¾Ð¶Ð½Ð¸Ñ‚ÑŒ ÑÐ±Ð¾Ñ€ Ð°Ñ‚Ð°ÐºÑƒÑŽÑ‰Ð¸Ð¼Ð¸ Ð°Ð´Ñ€ÐµÑÐ¾Ð² Ð²ÑÐµÑ… Ð¼Ð¾ÑÑ‚Ð¾Ð², Ð¾Ñ‚ Ð’Ð°Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ Ð°Ð´Ñ€ÐµÑÐ° gmail.com Ð¸Ð»Ð¸ yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "Ð’ ÑÐ¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½Ð¾Ð¹ ÑÐ»ÑƒÐ¶Ð±Ðµ">
+<!ENTITY torsettings.bridgeHelp4 "Ð’ ÐºÑ€Ð°Ð¹Ð½ÐµÐ¼ ÑÐ»ÑƒÑ‡Ð°Ðµ, Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²ÐµÐ¶Ð»Ð¸Ð²Ð¾ Ð¿Ð¾Ð¿Ñ€Ð¾ÑÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑÐ° Ð¼Ð¾ÑÑ‚Ð¾Ð² Ð¿Ð¾ Ð°Ð´Ñ€ÐµÑÑƒ help at rt.torproject.org.&#160; ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¸Ð¼ÐµÐ¹Ñ‚Ðµ Ð² Ð²Ð¸Ð´Ñƒ, Ñ‡Ñ‚Ð¾ ÐºÐ°Ð¶Ð´Ñ‹Ð¹ Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÐµÑ‚ÑÑ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ¾Ð¼.">
diff --git a/src/chrome/locale/ru/progress.dtd b/src/chrome/locale/ru/progress.dtd
index 2ff1b90..47827da 100644
--- a/src/chrome/locale/ru/progress.dtd
+++ b/src/chrome/locale/ru/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/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties
index 20b9155..f9f81a7 100644
--- a/src/chrome/locale/ru/torlauncher.properties
+++ b/src/chrome/locale/ru/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ.
 torlauncher.please_restart_app=ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ
 torlauncher.tor_controlconn_failed=ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ Ñ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð¼ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Tor.
 torlauncher.tor_failed_to_start=ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Tor.
-torlauncher.tor_bootstrap_failed=Tor Ð½Ðµ ÑÑƒÐ¼ÐµÐ» ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐµÑ‚ÐµÐ²Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ.
-torlauncher.tor_bootstrap_failed_details=%1$S Ð½Ðµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ (%2$S).
+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 Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚.
@@ -23,6 +24,10 @@ 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=Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ñ‚Ð¸Ð¿ Ñ‚Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚Ð° Ð¿Ñ€ÐµÐ´Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ñ… Ð¼Ð¾ÑÑ‚Ð¾Ð².
+torlauncher.error_bridge_bad_default_type=ÐŸÑ€ÐµÐ´Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ðµ Ð¼Ð¾ÑÑ‚Ñ‹ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚ Ñ‚Ð¸Ð¿ Ñ‚Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚Ð° %S. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¸ÑÐ¿Ñ€Ð°Ð²ÑŒÑ‚Ðµ Ð²Ð°ÑˆÐ¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸.
+
+torlauncher.recommended_bridge=(Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ñ‹Ð¹)
 
 torlauncher.connect=Ð¡Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ
 torlauncher.quit=Ð’Ñ‹Ð¹Ñ‚Ð¸
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties
index 0a93939..985868c 100644
--- a/src/chrome/locale/sv/torlauncher.properties
+++ b/src/chrome/locale/sv/torlauncher.properties
@@ -1,24 +1,57 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.tor_bootstrap_failed_details=%1$S misslyckade (%2$S).
+torlauncher.error_title=Tor Launcher
 
-torlauncher.bootstrapStatus.conn_dir=Ansluter till en nodkatalog
+torlauncher.tor_exited=Tor stÃ¤ngdes av ovÃ¤ntat.
+torlauncher.please_restart_app=Var god starta om det hÃ¤r programmet.
+torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport.
+torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades.
+torlauncher.tor_control_failed=Misslyckades med att ta kontroll Ã¶ver Tor.
+torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprÃ¤tta en anslutning till Tor-nÃ¤tverket.
+torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S).
+
+torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S
+torlauncher.tor_missing=Tors kÃ¶rbara programfil saknas.
+torlauncher.torrc_missing=Filen torrc saknas.
+torlauncher.datadir_missing=Tors data-katalog saknas.
+torlauncher.password_hash_missing=Misslyckades med att hÃ¤mta hashat lÃ¶senord.
+
+torlauncher.failed_to_get_settings=Kunde inte lÃ¤sa in instÃ¤llningar fÃ¶r Tor.\n\n%S
+torlauncher.failed_to_save_settings=Kunde inte spara instÃ¤llningar fÃ¶r Tor.\n\n%S
+torlauncher.ensure_tor_is_running=FÃ¶rsÃ¤kra dig om att Tor Ã¤r startad.
+
+torlauncher.error_proxy_addr_missing=Du mÃ¥ste ange bÃ¥de en IP-adress eller vÃ¤rdnamn, samt ett port-nummer fÃ¶r att konfigurera Tor till att anvÃ¤nda en proxy fÃ¶r att nÃ¥ Internet.
+torlauncher.error_proxy_type_missing=Du mÃ¥ste vÃ¤lja typ av proxy.
+torlauncher.error_bridges_missing=Du mÃ¥ste ange en eller flera bryggor.
+# 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.recommended_bridge=(rekommenderas)
+
+torlauncher.connect=Anslut
+torlauncher.quit=Avsluta
+torlauncher.quit_win=StÃ¤ng
+torlauncher.done=Klar
+
+torlauncher.forAssistance=FÃ¶r assistans, kontakta %S
+
+torlauncher.bootstrapStatus.conn_dir=Ansluter till en relÃ¤katalog
 torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning
-torlauncher.bootstrapStatus.requesting_status=HÃ¤mtar nÃ¤tverksstatusen
-torlauncher.bootstrapStatus.loading_status=Laddar nÃ¤tverksstatus
-torlauncher.bootstrapStatus.loading_keys=Laddar auktoritÃ¤ra certifikat
-torlauncher.bootstrapStatus.requesting_descriptors=BegÃ¤r nodinformation
-torlauncher.bootstrapStatus.loading_descriptors=Laddar routerinformation
-torlauncher.bootstrapStatus.conn_or=Ansluter till Tor-nÃ¤tverket
-torlauncher.bootstrapStatus.handshake_or=Skapar en Torkrets
+torlauncher.bootstrapStatus.requesting_status=HÃ¤mtar nÃ¤tverksstatus
+torlauncher.bootstrapStatus.loading_status=LÃ¤ser in nÃ¤tverksstatus
+torlauncher.bootstrapStatus.loading_keys=LÃ¤ser in auktoritÃ¤ra certifikat
+torlauncher.bootstrapStatus.requesting_descriptors=BegÃ¤r relÃ¤information
+torlauncher.bootstrapStatus.loading_descriptors=LÃ¤ser in relÃ¤information
+torlauncher.bootstrapStatus.conn_or=Ansluter till Tor nÃ¤tverket
+torlauncher.bootstrapStatus.handshake_or=Skapar en Tor-krets
 torlauncher.bootstrapStatus.done=Ansluten till Tor-nÃ¤tverket!
 
-torlauncher.bootstrapWarning.done=redo
+torlauncher.bootstrapWarning.done=klar
 torlauncher.bootstrapWarning.connectrefused=anslutningen vÃ¤grades
 torlauncher.bootstrapWarning.misc=blandat
 torlauncher.bootstrapWarning.resourcelimit=otillrÃ¤ckliga resurser
 torlauncher.bootstrapWarning.identity=identitet felmatchad
-torlauncher.bootstrapWarning.timeout=anslutningen gjorde en timeout
-torlauncher.bootstrapWarning.noroute=framkomlig vÃ¤g till vÃ¤rddatorn saknas (no route to host)
-torlauncher.bootstrapWarning.ioerror=lÃ¤s/skrivfel
+torlauncher.bootstrapWarning.timeout=tidsgrÃ¤nsen Ã¶verskreds
+torlauncher.bootstrapWarning.noroute=framkomlig vÃ¤g till vÃ¤rddatorn saknas
+torlauncher.bootstrapWarning.ioerror=lÃ¤s-/skrivfel
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index 3ac3994..e42c83b 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -1,59 +1,64 @@
-<!ENTITY torsettings.dialog.title "">
+<!ENTITY torsettings.dialog.title "CÃ i Ä‘áº·t máº¡ng Tor">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "">
+<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
 <!ENTITY torSettings.yes "CÃ³">
 <!ENTITY torSettings.no "KhÃ´ng">
 
-<!ENTITY torSettings.firstQuestion "">
-<!ENTITY torSettings.configurePrompt1 "">
-<!ENTITY torSettings.configurePrompt2 "">
-<!ENTITY torSettings.configure "">
-<!ENTITY torSettings.connectPrompt2 "">
-<!ENTITY torSettings.connectPrompt3 "">
-<!ENTITY torSettings.connect "">
+<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configure "Cáº¥u hÃ¬nh">
+<!ENTITY torSettings.connectPrompt2 "TÃ´i muá»‘n káº¿t ná»‘i trá»±c tiáº¿p Ä‘áº¿n máº¡ng Tor,">
+<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
+<!ENTITY torSettings.connect "Káº¿t ná»‘i">
 
-<!ENTITY torSettings.proxyQuestion "">
+<!ENTITY torSettings.proxyQuestion "MÃ¡y tÃnh nÃ y cÃ³ cáº§n dÃ¹ng proxy Ä‘á»ƒ káº¿t ná»‘i Ä‘áº¿n Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "">
-<!ENTITY torSettings.enterProxy "">
-<!ENTITY torSettings.firewallQuestion "">
-<!ENTITY torSettings.firewallHelp "">
-<!ENTITY torSettings.enterFirewall "">
-<!ENTITY torSettings.bridgeQuestion "">
+<!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 proxy.">
+<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
+<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
+<!ENTITY torSettings.firewallHelp "Náº¿u nhÆ° báº¡n khÃ´ng cháº¯c cháº¯n lÃ m tháº¿ nÃ o tráº£ lá»i cÃ¢u há»i nÃ y, chá»n KhÃ´ng. Náº¿u nhÆ° báº¡n gáº·p váº¥n Ä‘á» káº¿t ná»‘i Ä‘áº¿n máº¡ng Tor, thay Ä‘á»•i thiáº¿t láºp nÃ y.">
+<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "">
-<!ENTITY torsettings.restart "">
+<!ENTITY torsettings.startingTor "Chá» Ä‘á»£i Ä‘á»ƒ Tor khá»Ÿi Ä‘á»™ng..">
+<!ENTITY torsettings.restart "Khá»Ÿi Ä‘á»™ng láº¡i">
 
-<!ENTITY torsettings.optional "">
+<!ENTITY torsettings.optional "Tuá»³ chá»n">
 
-<!ENTITY torsettings.useProxy.checkbox "">
-<!ENTITY torsettings.useProxy.type "">
+<!ENTITY torsettings.useProxy.checkbox "MÃ¡y chá»§ nÃ y cáº§n pháº£i dÃ¹ng proxy Ä‘á»ƒ truy cáºp Internet">
+<!ENTITY torsettings.useProxy.type "Dáº¡ng proxy:">
 <!ENTITY torsettings.useProxy.address "Äá»‹a chá»‰:">
-<!ENTITY torsettings.useProxy.address.placeholder "">
+<!ENTITY torsettings.useProxy.address.placeholder "Äá»‹a chá»‰ IP hoáº·c hostname">
 <!ENTITY torsettings.useProxy.port "Cá»•ng:">
 <!ENTITY torsettings.useProxy.username "TÃªn Ä‘Äƒng nháºp:">
 <!ENTITY torsettings.useProxy.password "Máºt kháº©u:">
-<!ENTITY torsettings.useProxy.type.socks4 "">
-<!ENTITY torsettings.useProxy.type.socks5 "">
-<!ENTITY torsettings.useProxy.type.http "">
-<!ENTITY torsettings.firewall.checkbox "">
+<!ENTITY torsettings.useProxy.type.socks4 "SOCK 4">
+<!ENTITY torsettings.useProxy.type.socks5 "SOCK 5">
+<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
+<!ENTITY torsettings.firewall.checkbox "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 "">
-<!ENTITY torsettings.useBridges.label "">
-<!ENTITY torsettings.useBridges.placeholder "">
-
-<!ENTITY torsettings.copyLog "">
-<!ENTITY torsettings.bridgeHelpTitle "">
-<!ENTITY torsettings.bridgeHelp1 "">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "">
+<!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.label "Enter one or more bridge relays (one per line).">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
+
+<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
+<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
+<!ENTITY torsettings.bridgeHelp1 "Náº¿u nhÆ° báº¡n khÃ´ng thá»ƒ káº¿t ná»‘i Ä‘áº¿n máº¡ng Tor, cÃ³ thá»ƒ lÃ  nhÃ  cung cáº¥p dá»‹ch vá»¥ cá»§a báº¡n (ISP) hoáº·c cÆ¡ quan khÃ¡c Ä‘Ã£ cháº·n káº¿t ná»‘i Ä‘áº¿n Tor. ThÃ´ng thÆ°á»ng, báº¡n cÃ³ thá»ƒ giáº£i quyáº¿t váº¥n nÃ y báº±ng cÃ¡ch sá» dá»¥ng Tor Bridges, cÃ¡c Tor Bridges nÃ y sáº½ khÃ´ng Ä‘Æ°á»£c liá»‡t kÃª Ä‘á»ƒ lÃ m cho viá»‡c ngÄƒn cháº·n khÃ³ khÄƒn hÆ¡n.">
+<!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 "Äi qua Web">
+<!ENTITY torsettings.bridgeHelp2 "Sá» dá»¥ng trÃ¬nh duyá»‡t web truy cáºp vÃ o https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
+<!ENTITY torsettings.bridgeHelp3 "Gá»i email Ä‘áº¿n bridges at torproject.org vá»›i dÃ²ng get bridges trong pháº§n thÃ¢n cá»§a email. Tuy nhiÃªn, Ä‘á»ƒ lÃ m cho káº» táº¥n cÃ´ng khÃ³ khÄƒn hÆ¡n trong viá»‡c biáº¿t Ä‘Æ°á»£c Ä‘á»‹a chá»‰ cáº§u ná»‘i, báº¡n pháº£i gá»i yÃªu cáº§u nÃ y tá»« email cá»§a yahoo.com hoáº·c gmail.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.&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/vi/progress.dtd b/src/chrome/locale/vi/progress.dtd
index f2b867b..cbafae0 100644
--- a/src/chrome/locale/vi/progress.dtd
+++ b/src/chrome/locale/vi/progress.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torprogress.dialog.title "">
-<!ENTITY torprogress.openSettings "">
+<!ENTITY torprogress.dialog.title "Tor Status">
+<!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Káº¿t ná»‘i vá»›i máº¡ng Tor">
-<!ENTITY torprogress.pleaseWait "">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties
index 7162829..8566a15 100644
--- a/src/chrome/locale/vi/torlauncher.properties
+++ b/src/chrome/locale/vi/torlauncher.properties
@@ -4,30 +4,35 @@
 # torlauncher.error_title=Tor Launcher
 
 # torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
+torlauncher.please_restart_app=Vui lÃ²ng khá»Ÿi Ä‘á»™ng láº¡i á»©ng dá»¥ng nÃ y.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Cháº¡y Tor tháº¥t báº¡i.
-torlauncher.tor_bootstrap_failed=KhÃ´ng thá»ƒ thiáº¿t láºp káº¿t ná»‘i vÃ o máº¡ng Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S tháº¥t báº¡i (%2$S).
+# torlauncher.tor_control_failed=Failed to take control of Tor.
+torlauncher.tor_bootstrap_failed=Tor Ä‘Ã£ tháº¥t báº¡i khi thiáº¿t láºp káº¿t ná»‘i Ä‘áº¿n máº¡ng Tor
+# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-# torlauncher.tor_missing=The Tor executable is missing.
-# torlauncher.torrc_missing=The torrc file is missing.
-# torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.tor_missing=Táºp tin thá»±c thi cá»§a Tor bá»‹ thiáº¿u.
+torlauncher.torrc_missing=Thiáº¿u táºp tin torrc.
+torlauncher.datadir_missing=ThÆ° má»¥c data trong Tor khÃ´ng tá»“n táº¡i.
 # torlauncher.password_hash_missing=Failed to get hashed password.
 
 # torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
-# torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+torlauncher.failed_to_save_settings=KhÃ´ng thá»ƒ lÆ°u láº¡i cÃ¡c cÃ i Ä‘áº·t cá»§a Tor.
+torlauncher.ensure_tor_is_running=HÃ£y cháº¯c cháº¯n ráº±ng Tor Ä‘ang cháº¡y.
 
 torlauncher.error_proxy_addr_missing=Báº¡n pháº£i xÃ¡c Ä‘á»‹nh cáº£ hai má»™t Ä‘á»‹a chá»‰ IP hay tÃªn mÃ¡y vÃ  sá»‘ cá»•ng Ä‘á»ƒ cáº¥u hÃ¬nh Tor Ä‘á»ƒ sá» dá»¥ng má»™t proxy á»§y quyá»n truy cáºp vÃ o  LiÃªn máº¡ng
-# torlauncher.error_proxy_type_missing=You must select the proxy type.
-# torlauncher.error_bridges_missing=You must specify one or more bridges.
+torlauncher.error_proxy_type_missing=Báº¡n pháº£i chá»n kiá»ƒu proxy.
+torlauncher.error_bridges_missing=Báº¡n pháº£i chá»‰ dáº«n má»™t hoáº·c nhiá»u cáº§u ná»‘i.
+# 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.connect=Connect
+# torlauncher.recommended_bridge=(recommended)
+
+torlauncher.connect=Káº¿t ná»‘i
 torlauncher.quit=ThoÃ¡t
 torlauncher.quit_win=ThoÃ¡t
-# torlauncher.done=Done
+torlauncher.done=HoÃ n thÃ nh
 
 # torlauncher.forAssistance=For assistance, contact %S
 
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index 267e4bb..8bbe5f7 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -2,17 +2,17 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "åœ¨ Tor Browser Bundle å°è¯•è¿žæŽ¥äº’è”ç½‘ä¹‹å‰ï¼Œä½ éœ€è¦æä¾›ä¸€äº›è¯¥è®¡ç®—æœºç½‘ç»œè¿žæŽ¥çš„ç›¸å…³ä¿¡æ¯ã€‚">
+<!ENTITY torsettings.prompt "åœ¨æ‚¨è¿žæŽ¥åˆ°Torç½‘ç»œä¹‹å‰ï¼Œéœ€è¦æä¾›æœ¬æœºçš„è‹±ç‰¹ç½‘è¿žæŽ¥ä¿¡æ¯ã€‚">
 
 <!ENTITY torSettings.yes "æ˜¯">
 <!ENTITY torSettings.no "å¦">
 
 <!ENTITY torSettings.firstQuestion "ä»¥ä¸‹å“ªä¸ªæè¿°ä¸Žä½ çš„æƒ…å†µæœ€ä¸ºåŒ¹é…ï¼Ÿ">
 <!ENTITY torSettings.configurePrompt1 "è¯¥è®¡ç®—æœºçš„ç½‘ç»œè¿žæŽ¥å—åˆ°å®¡æŸ¥æˆ–è¿‡æ»¤ï¼Œæˆ–è€…éœ€è¦ä½¿ç”¨ä»£ç†ã€‚">
-<!ENTITY torSettings.configurePrompt2 "æˆ‘éœ€è¦é…ç½®ç½‘ç»œè®¾ç½®ã€‚">
+<!ENTITY torSettings.configurePrompt2 "æˆ‘éœ€è¦é…ç½®ç½‘æ¡¥ã€é˜²ç«å¢™æˆ–è€…ä»£ç†è®¾ç½®ã€‚">
 <!ENTITY torSettings.configure "é…ç½®">
 <!ENTITY torSettings.connectPrompt2 "æˆ‘æƒ³è¦ç›´æŽ¥è¿žæŽ¥ Tor ç½‘ç»œã€‚">
-<!ENTITY torSettings.connectPrompt3 "">
+<!ENTITY torSettings.connectPrompt3 "è¿™åœ¨å¤§å¤šæ•°æƒ…å†µä¸‹æ£å¸¸å·¥ä½œã€‚">
 <!ENTITY torSettings.connect "è¿žæŽ¥">
 
 <!ENTITY torSettings.proxyQuestion "è¯¥è®¡ç®—æœºæ˜¯å¦éœ€è¦é€šè¿‡ä»£ç†è®¿é—®äº’è”ç½‘ï¼Ÿ">
@@ -22,7 +22,9 @@
 <!ENTITY torSettings.firewallQuestion "è¯¥è®¡ç®—æœºçš„é˜²ç«å¢™æ˜¯å¦ä»…å…è®¸ç‰¹å®šç«¯å£çš„äº’è”ç½‘è¿žæŽ¥ï¼Ÿ">
 <!ENTITY torSettings.firewallHelp "å¦‚æžœä¸çŸ¥é“å¦‚ä½•å›žç”è¯¥é—®é¢˜ï¼Œè¯·é€‰æ‹©å¦ã€‚å¦‚æžœè¿žæŽ¥ Tor ç½‘ç»œæ—¶å‡ºçŽ°é—®é¢˜ï¼Œè¯·æ›´æ”¹è¯¥è®¾ç½®ã€‚">
 <!ENTITY torSettings.enterFirewall "è¯·è¾“å…¥é˜²ç«å¢™å…è®¸çš„ç«¯å£ï¼Œä¸é—´ç”¨é€—å·éš”å¼€ã€‚">
-<!ENTITY torSettings.bridgeQuestion "å¦‚æžœè¯¥è®¡ç®—æœºçš„ç½‘ç»œè¿žæŽ¥å—åˆ°å®¡æŸ¥ï¼Œä½ éœ€è¦ä½¿ç”¨ç½‘æ¡¥ä¸ç»§ï¼Œå¦åˆ™è¯·ç›´æŽ¥ç‚¹å‡»â€œè¿žæŽ¥â€ã€‚">
+<!ENTITY torSettings.bridgeQuestion "æ‚¨çš„äº’è”ç½‘æœåŠ¡æä¾›å•† (ISP) é˜»æŒ¡æˆ–å®¡æŸ¥ä¸Ž Tor ç½‘ç»œçš„è¿žæŽ¥å—ï¼Ÿ">
+<!ENTITY torSettings.bridgeHelp "å¦‚æžœæ‚¨ä¸çŸ¥é“æ¤é—®é¢˜çš„ç”æ¡ˆï¼Œè¯·é€‰æ‹©å¦ã€‚&#160; å¦‚æžœæ‚¨é€‰æ‹©æ˜¯ï¼Œæ‚¨å°†è¢«è¦æ±‚é…ç½® Tor ç½‘æ¡¥ï¼Œå®ƒä»¬æ˜¯æœªè¢«å…¬å¼€çš„ä¸ç»§ç‚¹ï¼Œå¯ä»¥ä½¿å¾— Tor ç½‘ç»œçš„è¿žæŽ¥æ›´éš¾ä»¥è¢«å°æŽ‰ã€‚">
+<!ENTITY torSettings.bridgeSettingsPrompt "æ‚¨å¯ä»¥ä½¿ç”¨ç½‘æ¡¥çš„é»˜è®¤è®¾ç½®ï¼Œæ‚¨ä¹Ÿå¯ä»¥èŽ·å–å’Œè¾“å…¥è‡ªå®šä¹‰çš„ç½‘æ¡¥åœ°å€ã€‚">
 
 <!-- Other: -->
 
@@ -44,16 +46,19 @@
 <!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 "åœ°å€:ç«¯å£æˆ– obfs ç½‘æ¡¥åœ°å€:ç«¯å£">
+<!ENTITY torsettings.useBridges.placeholder "è¾“å…¥ åœ°å€:ç«¯å£">
 
 <!ENTITY torsettings.copyLog "è¯·å°† Tor æ—¥å¿—å¤åˆ¶åˆ°å‰ªè´´æ¿">
 <!ENTITY torsettings.bridgeHelpTitle "ç½‘æ¡¥ä¸ç»§å¸®åŠ©">
-<!ENTITY torsettings.bridgeHelp1 "å¦‚æžœæ— æ³•è¿žæŽ¥ Tor ç½‘ç»œï¼Œå¯èƒ½æ˜¯å› ä¸ºäº’è”ç½‘æœåŠ¡æä¾›å•† (ISP) å°é”äº† Torã€‚é€šå¸¸ï¼Œåˆ©ç”¨æ›´éš¾ä»¥å°é”çš„éšè—ä¸ç»§ Tor ç½‘æ¡¥å¯ä»¥åº”å¯¹è¿™ä¸€é—®é¢˜ã€‚">
-<!ENTITY torsettings.bridgeHelp1B "">
-<!ENTITY torsettings.bridgeHelp2Heading "">
-<!ENTITY torsettings.bridgeHelp2 "å¦‚éœ€èŽ·å–ç½‘æ¡¥ï¼Œè¯·ä½¿ç”¨æµè§ˆå™¨è®¿é—®ä»¥ä¸‹é¡µé¢ï¼šhttps://bridges.torproject.org">
-<!ENTITY torsettings.bridgeHelp3Heading "">
-<!ENTITY torsettings.bridgeHelp3 "èŽ·å–å…¬å…±ç½‘æ¡¥åœ°å€è¿˜æœ‰ä¸€ä¸ªæ–¹å¼ï¼šå‘é€é‚®ä»¶è‡³ bridges at torproject.orgï¼Œå¹¶åœ¨æ£æ–‡ä¸å¡«ä¸Šâ€œget bridgesâ€ã€‚ä¸è¿‡ï¼Œä¸ºäº†é˜²æ¢æ”»å‡»è€…èŽ·å¾—å¤§é‡ç½‘æ¡¥åœ°å€ï¼Œå‘é€é‚®ä»¶çš„ç”µåé‚®ä»¶åœ°å€å¿…é¡»æ¥è‡ªä»¥ä¸‹åŸŸåï¼šgmail.com æˆ– yahoo.comã€‚">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "å¦å¤–ï¼Œè¿˜å¯ä»¥å‘é€ç”µåé‚®ä»¶è‡³ help at rt.torproject.org æ¥èŽ·å–ç½‘æ¡¥ä¸ç»§ã€‚">
+<!ENTITY torsettings.bridgeHelp1 "å¦‚æžœæ‚¨æ— æ³•è¿žæŽ¥åˆ° Tor ç½‘ç»œï¼Œå¯èƒ½æ˜¯æ‚¨çš„äº’è”ç½‘æœåŠ¡æä¾›å•† (ISP) æˆ–å…¶ä»–æœºæž„åœ¨é˜»æŒ¡ Torã€‚&#160; é€šå¸¸æ¥è¯´ï¼Œä½ å¯ä»¥ä½¿ç”¨ Tor ç½‘æ¡¥è§£å†³æ¤é—®é¢˜ï¼Œå› ä¸ºå®ƒä»¬æ˜¯æœªå…¬å¼€çš„ä¸ç»§ç‚¹ï¼Œæ›´ä¸å®¹æ˜“è¢«å°é”ã€‚">
+<!ENTITY torsettings.bridgeHelp1B "æ‚¨å¯ä»¥ä½¿ç”¨é¢„å…ˆé…ç½®å¥½çš„é»˜è®¤è®¾ç½®çš„ç½‘æ¡¥åœ°å€ï¼›æˆ–è€…ï¼Œæ‚¨ä¹Ÿå¯ä»¥ä½¿ç”¨ä»¥ä¸‹ä¸‰ç§æ–¹æ³•ä¹‹ä¸€èŽ·å–è‡ªå®šä¹‰çš„åœ°å€ã€‚">
+<!ENTITY torsettings.bridgeHelp2Heading "é€šè¿‡ä¸‡ç»´ç½‘">
+<!ENTITY torsettings.bridgeHelp2 "ä½¿ç”¨ç½‘é¡µæµè§ˆå™¨è®¿é—® https://bridges.torproject.org">
+<!ENTITY torsettings.bridgeHelp3Heading "é€šè¿‡ç”µåé‚®ä»¶è‡ªåŠ¨å›žå¤ç³»ç»Ÿ">
+<!ENTITY torsettings.bridgeHelp3 "å‘é€é‚®ä»¶åˆ° bridges at torproject.orgï¼Œé‚®ä»¶æ£æ–‡é¡»åŒ…å« get bridges è¡Œã€‚&#160; ç„¶è€Œï¼Œè¿™ä¹Ÿå¯èƒ½è‡´ä½¿æ”»å‡»è€…èŽ·çŸ¥å¤§é‡ç½‘æ¡¥åœ°å€ï¼Œæ‰€ä»¥ä½ å¿…é¡»ä»Ž gmail.com æˆ–è€… yahoo.com çš„ç”µåé‚®ä»¶åœ°å€å‘é€è¿™ä¸€è¯·æ±‚ã€‚">
+<!ENTITY torsettings.bridgeHelp4Heading "é€šè¿‡å¸®åŠ©å°">
+<!ENTITY torsettings.bridgeHelp4 "ä½œä¸ºæœ€åŽçš„æ‰‹æ®µï¼Œä½ å¯ä»¥å†™ä¸€å°ç¤¼è²Œçš„é‚®ä»¶å‘é€åˆ° help at rt.torproject.org ä»¥è¯·æ±‚ç½‘æ¡¥åœ°å€ã€‚&#160; è¯·æ³¨æ„ï¼Œæ¯ä¸ªè¯·æ±‚éœ€è¦äººå·¥å“åº”ã€‚">
diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd
index 75b64ec..c014812 100644
--- a/src/chrome/locale/zh-CN/progress.dtd
+++ b/src/chrome/locale/zh-CN/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/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties
index 6a98bfd..adc973e 100644
--- a/src/chrome/locale/zh-CN/torlauncher.properties
+++ b/src/chrome/locale/zh-CN/torlauncher.properties
@@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor æ„å¤–é€€å‡ºã€‚
 torlauncher.please_restart_app=è¯·é‡å¯è¯¥åº”ç”¨ç¨‹åºã€‚
 torlauncher.tor_controlconn_failed=æ— æ³•è¿žæŽ¥ Tor æŽ§åˆ¶ç«¯å£ã€‚
 torlauncher.tor_failed_to_start=Tor æ— æ³•å¯åŠ¨ã€‚
-torlauncher.tor_bootstrap_failed=Tor æ— æ³•å»ºç«‹ Tor ç½‘ç»œè¿žæŽ¥ã€‚
-torlauncher.tor_bootstrap_failed_details=%1$S å¤±è´¥ (%2$S).
+torlauncher.tor_control_failed=æŽ§åˆ¶ Tor å¤±è´¥ã€‚
+torlauncher.tor_bootstrap_failed=Tor å»ºç«‹åˆ° Tor ç½‘ç»œçš„è¿žæŽ¥å¤±è´¥ã€‚
+torlauncher.tor_bootstrap_failed_details=%1$S å¤±è´¥ (%2$S)ã€‚
 
 torlauncher.unable_to_start_tor=æ— æ³•å¯åŠ¨ Torã€‚\n\n%S
 torlauncher.tor_missing=ç¼ºå°‘ Tor å¯æ‰§è¡Œæ–‡ä»¶ã€‚
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=è¯·ç¡®ä¿ Tor æ£åœ¨è¿è¡Œã€‚
 torlauncher.error_proxy_addr_missing=ä¸ºäº†å°† Tor é…ç½®ä¸ºä½¿ç”¨ä»£ç†è®¿é—®äº’è”ç½‘ï¼Œå¿…é¡»æŒ‡å®š IP åœ°å€æˆ–ä¸»æœºåä»¥åŠç«¯å£å·ã€‚
 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.quit=é€€å‡º
@@ -31,18 +36,18 @@ torlauncher.done=å®Œæˆ
 
 torlauncher.forAssistance=å¦‚éœ€å¸®åŠ©ï¼Œè¯·è”ç³» %S
 
-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.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.done=å®Œæˆ
 torlauncher.bootstrapWarning.connectrefused=è¿žæŽ¥è¢«æ‹’ç»
 torlauncher.bootstrapWarning.misc=æ‚é¡¹
 torlauncher.bootstrapWarning.resourcelimit=èµ„æºä¸å¤Ÿ

