tbb-commits
Threads by month
- ----- 2025 -----
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
March 2014
- 3 participants
- 51 discussions
[tor-browser-bundle/master] Fix changelog: We don't build DMGs for 3.5.
by mikeperry＠torproject.org 17 Mar '14
by mikeperry＠torproject.org 17 Mar '14
17 Mar '14
commit e72925e055b78cb4a972dd6a8447baffd8aedf6e
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Mon Mar 17 16:03:29 2014 -0700
Fix changelog: We don't build DMGs for 3.5.
---
Bundle-Data/Docs/ChangeLog.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 8e8fdde..865975d 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -9,8 +9,6 @@ Tor Browser Bundle 3.5.3 -- Mar 19 2014
* Bug 10237: Disable the media cache to prevent disk leaks for videos
* Bug 10703: Force the default charset to avoid locale fingerprinting
* Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders)
- * Mac:
- * Bug 4271: Use DMG instead of ZIP for Mac packages
* Linux:
* Bug 9533: Fix keyboard input on Ubuntu 13.10
* Bug 9896: Provide debug symbols for Tor Browser binary
1
0
17 Mar '14
commit 8573820727cee94f516d2b2c9d4718b69a56c952
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Mar 17 13:37:16 2014 +0000
Added changelog entry for 3.5.3.
---
Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index ae2cb4b..8e8fdde 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,21 @@
+Tor Browser Bundle 3.5.3 -- Mar 19 2014
+ * All Platforms
+ * Update Firefox to 24.4.0esr
+ * Update Torbutton to 1.6.7.0:
+ * Bug 9901: Fix browser freeze due to content type sniffing
+ * Bug 10611: Add Swedish (sv) to extra locales to update
+ * Update NoScript to 2.6.8.17
+ * Update Tor to 0.2.4.21
+ * Bug 10237: Disable the media cache to prevent disk leaks for videos
+ * Bug 10703: Force the default charset to avoid locale fingerprinting
+ * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders)
+ * Mac:
+ * Bug 4271: Use DMG instead of ZIP for Mac packages
+ * Linux:
+ * Bug 9533: Fix keyboard input on Ubuntu 13.10
+ * Bug 9896: Provide debug symbols for Tor Browser binary
+ * Bug 10472: Pass arguments to the browser from Linux startup script
+
Tor Browser Bundle 3.6-beta-1 -- Mar 17 2014
* All Platforms
* Update Firefox to 24.4.0esr
1
0
[tor-browser-bundle/master] Make it harder to mess up the Firefox langpack+version update.
by mikeperry＠torproject.org 17 Mar '14
by mikeperry＠torproject.org 17 Mar '14
17 Mar '14
commit 1929fd5db0802782066d52512d4c2a0fef144ed6
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Mon Mar 17 01:12:01 2014 -0700
Make it harder to mess up the Firefox langpack+version update.
---
gitian/versions | 6 ++++--
gitian/versions.alpha | 6 ++++--
gitian/versions.beta | 6 ++++--
gitian/versions.nightly | 6 ++++--
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/gitian/versions b/gitian/versions
index 8358f94..f007100 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -3,7 +3,9 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"
VERIFY_TAGS=1
-TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1
+FIREFOX_VERSION=24.4.0esr
+
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1
TOR_TAG=tor-0.2.4.21
TORLAUNCHER_TAG=0.2.4.4
TORBUTTON_TAG=1.6.7.0
@@ -22,7 +24,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
-FIREFOX_LANG_VER=24.4.0esr
+FIREFOX_LANG_VER=$FIREFOX_VERSION
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 48e4464..5adee9a 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
-TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1
+FIREFOX_VERSION=24.4.0esr
+
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1
TOR_TAG=tor-0.2.5.2-alpha
TORLAUNCHER_TAG=0.2.5.1a
TORBUTTON_TAG=1.6.7.0
@@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
-FIREFOX_LANG_VER=24.4.0esr
+FIREFOX_LANG_VER=$FIREFOX_VERSION
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 846ddfb..c4ad3fa 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
-TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1
+FIREFOX_VERSION=24.4.0esr
+
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1
TOR_TAG=tor-0.2.4.21
TORLAUNCHER_TAG=0.2.5.1a
TORBUTTON_TAG=1.6.7.0
@@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
-FIREFOX_LANG_VER=24.4.0esr
+FIREFOX_LANG_VER=$FIREFOX_VERSION
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 8ecbebb..57157c0 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1
VERIFY_TAGS=0
-TORBROWSER_TAG=tor-browser-24.4.0esr-1
+FIREFOX_VERSION=24.4.0esr
+
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1
TOR_TAG=master
TORLAUNCHER_TAG=master
TORBUTTON_TAG=master
@@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
-FIREFOX_LANG_VER=24.4.0esr
+FIREFOX_LANG_VER=$FIREFOX_VERSION
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
1
0
17 Mar '14
commit 0f97e3208443a38537775916672fd519e84d90cd
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Mar 17 09:01:43 2014 +0000
Bump FIREFOX_LANG_VER to 24.4.0esr.
---
gitian/versions | 2 +-
gitian/versions.alpha | 2 +-
gitian/versions.beta | 2 +-
gitian/versions.nightly | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitian/versions b/gitian/versions
index 3097b65..8358f94 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -22,7 +22,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
-FIREFOX_LANG_VER=24.3.0esr
+FIREFOX_LANG_VER=24.4.0esr
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index b7f4c93..48e4464 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -23,7 +23,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
-FIREFOX_LANG_VER=24.3.0esr
+FIREFOX_LANG_VER=24.4.0esr
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
diff --git a/gitian/versions.beta b/gitian/versions.beta
index e654784..846ddfb 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -23,7 +23,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
-FIREFOX_LANG_VER=24.3.0esr
+FIREFOX_LANG_VER=24.4.0esr
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 7569a10..8ecbebb 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -23,7 +23,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
-FIREFOX_LANG_VER=24.3.0esr
+FIREFOX_LANG_VER=24.4.0esr
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
1
0
[tor-browser-bundle/master] Update Changelog and tags for new Firefox and Tor Launcher.
by mikeperry＠torproject.org 16 Mar '14
by mikeperry＠torproject.org 16 Mar '14
16 Mar '14
commit e8b437c91d9a41b7c0517c6239edc7c947451dfc
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 15 20:13:04 2014 -0700
Update Changelog and tags for new Firefox and Tor Launcher.
---
Bundle-Data/Docs/ChangeLog.txt | 5 +++--
gitian/versions | 2 +-
gitian/versions.alpha | 4 ++--
gitian/versions.beta | 4 ++--
gitian/versions.nightly | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index b82ccd7..ae2cb4b 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,8 +1,9 @@
-Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014
+Tor Browser Bundle 3.6-beta-1 -- Mar 17 2014
* All Platforms
+ * Update Firefox to 24.4.0esr
* Include Pluggable Transports by default:
* Obfsproxy3 0.2.4, Flashproxy 1.6, and FTE 0.2.6 are now included
- * Update Tor Launcher to 0.2.5.0
+ * Update Tor Launcher to 0.2.5.1
* Bug 10418: Provide UI configuration for Pluggable Transports
* Bug 10604: Allow Tor status & error messages to be translated
* Bug 10894: Make bridge UI clear that helpdesk is a last resort for
diff --git a/gitian/versions b/gitian/versions
index 4f1d1c8..3097b65 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"
VERIFY_TAGS=1
-TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1
+TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1
TOR_TAG=tor-0.2.4.21
TORLAUNCHER_TAG=0.2.4.4
TORBUTTON_TAG=1.6.7.0
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 83febef..b7f4c93 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -4,9 +4,9 @@ BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
-TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1
+TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1
TOR_TAG=tor-0.2.5.2-alpha
-TORLAUNCHER_TAG=0.2.5.0
+TORLAUNCHER_TAG=0.2.5.1a
TORBUTTON_TAG=1.6.7.0
HTTPSE_TAG=3.4.5
NSIS_TAG=v0.1
diff --git a/gitian/versions.beta b/gitian/versions.beta
index fd4a715..e654784 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -4,9 +4,9 @@ BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
-TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1
+TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1
TOR_TAG=tor-0.2.4.21
-TORLAUNCHER_TAG=0.2.5.0
+TORLAUNCHER_TAG=0.2.5.1a
TORBUTTON_TAG=1.6.7.0
HTTPSE_TAG=3.4.5
NSIS_TAG=v0.1
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index baefbae..7569a10 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1
VERIFY_TAGS=0
-TORBROWSER_TAG=tor-browser-24.3.0esr-2
+TORBROWSER_TAG=tor-browser-24.4.0esr-1
TOR_TAG=master
TORLAUNCHER_TAG=master
TORBUTTON_TAG=master
1
0
commit 800f3d177e405803acddd105a2fe16ae4c8ef572
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 15 20:09:09 2014 -0700
Bump version.
---
src/install.rdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/install.rdf b/src/install.rdf
index d57db8f..1cd36da 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
<em:creator>The Tor Project, Inc.</em:creator>
<em:contributor>Pearl Crescent, LLC</em:contributor>
<em:id>tor-launcher(a)torproject.org</em:id>
- <em:version>0.2.5.0</em:version>
+ <em:version>0.2.5.1</em:version>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL>
<em:updateURL>https://127.0.0.1/</em:updateURL>
<!--
1
0
16 Mar '14
commit 51685778211bb0c9b51d2ac401fa4258efeac51b
Author: Mike Perry <mikeperry-git(a)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(a)torproject.org يحتوي علي 'get bridges' في قلب البريد.  و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو إما yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "يمكنك إيضاً طلب الجسور يإرسال بريد إلكتروني إلي help(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)torproject.org ارسال کنید.&#160; برای اینکه بتوانیم جلوی فیلتر شدن پل ها را بگیریم، مجبوریم شما را محدود کنیم تا فقط از یک آدرس ایمیل yahoo.com و یا gmail.com درخواست خود را ارسال کنید. لطفاً صبور باشید. از چند دقیقه تا چند ساعت طول خواهد کشید تا به طور خودکار پل ها برای شما ارسال شوند.">
+<!ENTITY torsettings.bridgeHelp4Heading "از طریق واحد کمک رسانی">
+<!ENTITY torsettings.bridgeHelp4 "اگر از طریق هیچ کدام از راه حل های فوق به نتیجه نرسیدید، یک درخواست مودبانه به آدرس help(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)torproject.org 宛に送信する ことです。&#160; しかし、アタッカーがたくさんのブリッジアドレスを収集するのを困難にするため、 あなたは、gmail.comかyahoo.comのドメインのいずれかからこのリクエストを送らなければなりません。">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "help@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(a)torproject.org にメールを送信する。.&#160;ただし、攻撃者が多くのブリッジアドレスを把握するのを困難にするために、 gmail.com または yahoo.com のメールアドレスからこのリクエストを送信する必要があります。">
+<!ENTITY torsettings.bridgeHelp4Heading "ヘルプデスク経由">
+<!ENTITY torsettings.bridgeHelp4 "最後の頼みの綱として、 help(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)torproject.org со строкой get bridges в теле письма. В целях безопасности система принимает письма только с адресов gmail.com и yahoo.com">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "Вы также можете запросить список мостов отправив письмо на help(a)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(a)torproject.org со строкой 'get bridges' в теле сообщения.&#160; Однако чтобы усложнить сбор атакующими адресов всех мостов, от Вас требуется отправить запрос с адреса gmail.com или yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "В справочной службе">
+<!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)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(a)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(a)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(a)torproject.xn--org,get-z36c1381b8ja265f1ods20awtw38t bridges”。不过，为了防止攻击者获得大量网桥地址，发送邮件的电子邮件地址必须来自以下域名：gmail.com 或 yahoo.com。">
-<!ENTITY torsettings.bridgeHelp4Heading "">
-<!ENTITY torsettings.bridgeHelp4 "另外，还可以发送电子邮件至 help(a)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(a)torproject.xn--org,-t85f28s26bzx6dy9kx14gz6r get bridges 行。&#160; 然而，这也可能致使攻击者获知大量网桥地址，所以你必须从 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。">
+<!ENTITY torsettings.bridgeHelp4Heading "通过帮助台">
+<!ENTITY torsettings.bridgeHelp4 "作为最后的手段，你可以写一封礼貌的邮件发送到 help(a)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=资源不够
1
0
[tor-browser-bundle/master] Update FTE bridges to actual IPs+fingerprints.
by mikeperry＠torproject.org 14 Mar '14
by mikeperry＠torproject.org 14 Mar '14
14 Mar '14
commit 304ad7605db71d32bd06c2287cc32e65836cbb02
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Fri Mar 14 10:35:36 2014 -0700
Update FTE bridges to actual IPs+fingerprints.
---
Bundle-Data/PTConfigs/bridge_prefs.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js
index e3d6b69..9a3dfc2 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -12,4 +12,5 @@ pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:477
pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1");
-pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080");
+pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E");
+pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73");
1
0
13 Mar '14
commit 7e006125569a58b4793c2950fb0a22d9b196a917
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Thu Mar 13 13:54:35 2014 -0400
Bug #11180: Improve the "Use Bridges" UI.
When the provided/custom bridges radio buttons are changed, disable the
labels and controls associated with the inactive radio button.
Reduce vertical space between the "Connect with provided bridges" radio button
and its associated "Transport type" menu.
---
src/chrome/content/network-settings-overlay.xul | 32 ++++++++-------
src/chrome/content/network-settings.js | 48 +++++++++++++++++------
2 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul
index 6a85be4..4172af5 100644
--- a/src/chrome/content/network-settings-overlay.xul
+++ b/src/chrome/content/network-settings-overlay.xul
@@ -75,29 +75,31 @@
<groupbox id="bridgeSpecificSettings">
<hbox pack="end">
- <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px">
- <radio id="bridgeRadioDefault"
- label="&torsettings.useBridges.default;" selected="true" />
- <hbox align="baseline">
- <spacer style="width: 1.9em" />
- <label value="&torsettings.useBridges.type;"
- control="defaultBridgeType" />
- <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()">
+ <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px"
+ oncommand="onBridgeTypeRadioChange()">
+ <radio id="bridgeRadioDefault"
+ label="&torsettings.useBridges.default;" selected="true" />
+ <hbox align="baseline" style="margin-top: -5px">
+ <spacer style="width: 1.9em" />
+ <label id="defaultBridgeTypeLabel"
+ value="&torsettings.useBridges.type;"
+ control="defaultBridgeType"/>
+ <menulist id="defaultBridgeType">
<menupopup id="defaultBridgeType_menuPopup" />
- </menulist>
- <spring/>
- </hbox>
+ </menulist>
+ <spring/>
+ </hbox>
<spacer style="height: 0.5em" />
<hbox align="baseline" flex="1">
- <radio align="start" id="bridgeRadioCustom" label="&torsettings.useBridges.custom;"
- oncommand="onCustomBridges()" />
+ <radio align="start" id="bridgeRadioCustom"
+ label="&torsettings.useBridges.custom;" />
<button align="end" dlgtype="help" oncommand="onOpenHelp()" />
- </hbox>
+ </hbox>
</radiogroup>
</hbox>
<vbox id="bridgeCustomEntry">
- <label style="margin-top:0px;"
+ <label id="bridgeListLabel" style="margin-top:0px;"
value="&torsettings.useBridges.label;" control="bridgeList"/>
<textbox id="bridgeList" multiline="true" rows="3"
oninput="onCustomBridgesTextInput();"
diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index de7259f..07526c8 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -249,14 +249,19 @@ function onCustomBridgesTextInput()
var customBridges = document.getElementById(kCustomBridgesRadio);
if (customBridges)
customBridges.control.selectedItem = customBridges;
+ onBridgeTypeRadioChange();
}
-function onCustomBridges()
+function onBridgeTypeRadioChange()
{
- var bridgeList = document.getElementById(kBridgeList);
- if (bridgeList)
- bridgeList.focus();
+ var useCustom = getElemValue(kCustomBridgesRadio, false);
+ enableElemWithLabel(kDefaultBridgeTypeMenuList, !useCustom);
+ enableElemWithLabel(kBridgeList + "Label", useCustom);
+ var focusElemID = (useCustom) ? kBridgeList : kDefaultBridgeTypeMenuList;
+ var elem = document.getElementById(focusElemID);
+ if (elem)
+ elem.focus();
}
@@ -470,13 +475,14 @@ function setButtonAttr(aID, aAttr, aValue)
}
-function enableTextBox(aID, aEnable)
+// Enables / disables aID as well as optional aID+"Label" element.
+function enableElemWithLabel(aID, aEnable)
{
if (!aID)
return;
- var textbox = document.getElementById(aID);
- if (textbox)
+ var elem = document.getElementById(aID);
+ if (elem)
{
var label = document.getElementById(aID + "Label");
if (aEnable)
@@ -484,17 +490,34 @@ function enableTextBox(aID, aEnable)
if (label)
label.removeAttribute("disabled");
- textbox.removeAttribute("disabled");
- var s = textbox.getAttribute("origPlaceholder");
- if (s)
- textbox.setAttribute("placeholder", s);
+ elem.removeAttribute("disabled");
}
else
{
if (label)
label.setAttribute("disabled", true);
- textbox.setAttribute("disabled", true);
+ elem.setAttribute("disabled", true);
+ }
+ }
+}
+
+
+// Removes placeholder text when disabled.
+function enableTextBox(aID, aEnable)
+{
+ enableElemWithLabel(aID, aEnable);
+ var textbox = document.getElementById(aID);
+ if (textbox)
+ {
+ if (aEnable)
+ {
+ var s = textbox.getAttribute("origPlaceholder");
+ if (s)
+ textbox.setAttribute("placeholder", s);
+ }
+ else
+ {
textbox.setAttribute("origPlaceholder", textbox.placeholder);
textbox.removeAttribute("placeholder");
}
@@ -804,6 +827,7 @@ function initBridgeSettings()
var radio = document.getElementById(radioID);
if (radio)
radio.control.selectedItem = radio;
+ onBridgeTypeRadioChange();
return true;
}
1
0
[tor-launcher/master] Bug #10418: Increase dialog height on Windows.
by brade＠torproject.org 13 Mar '14
by brade＠torproject.org 13 Mar '14
13 Mar '14
commit 32ba7dee797e51199bbd214031fc264d5d515be9
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Thu Mar 13 13:45:36 2014 -0400
Bug #10418: Increase dialog height on Windows.
This is necessary so that the bridges help text can be displayed without a
vertical scrollbar.
---
src/chrome/skin/network-settings.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index 4873ca8..b1f7f92 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -13,6 +13,7 @@ dialog {
dialog.os-windows {
width: 49em;
+ height: 42em;
}
wizard {
1
0