March 2014 - tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 28 Mar '14

28 Mar '14

commit b82e3dfcd19143defc252e55d833a6573e13f0a4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 28 20:15:14 2014 +0000 Update translations for torcheck_completed --- sk/torcheck.po | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/sk/torcheck.po b/sk/torcheck.po index 76c18e7..63bd091 100644 --- a/sk/torcheck.po +++ b/sk/torcheck.po @@ -1,16 +1,17 @@ # TorCheck gettext template -# Copyright (C) 2008-2012 The Tor Project, Inc +# Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: # K0L0M4N <koloman375(a)gmail.com>, 2012 # martinstrucel <martin.strucel(a)gmail.com>, 2012 # Michelozzo <michalslovak2(a)hotmail.com>, 2013 +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-06 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-28 20:00+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,8 +20,8 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -msgid "Congratulations. Your browser is configured to use Tor." -msgstr "Blahoželáme. Váš prehliadač je nakonfigurovaný na použitie Tor." +msgid "Congratulations. This browser is configured to use Tor." +msgstr "Gratulujeme. Tento prehliadač je nastavený aby používal Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -56,3 +57,41 @@ msgstr "Dočasný výpadok služby nám zabránil určiť, či Vaša zdrojová I msgid "Your IP address appears to be: " msgstr "Vaša IP adresa je: " + +msgid "Are you using Tor?" +msgstr "Používate Tor?" + +msgid "This page is also available in the following languages:" +msgstr "Táto stránka je tiež dostupná v týchto jazykoch:" + +msgid "For more information about this exit relay, see:" +msgstr "Pre viac informácií o tomto výstupnom relé, pozrite:" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "Projekt Tor je US 501(c)(3) neziskovký, určený na vývoj, výskum a vzdelanie o online anonymite a súkromí." + +msgid "Learn More »" +msgstr "Dozvedieť sa viac »" + +msgid "Go" +msgstr "Ísť" + +msgid "Short User Manual" +msgstr "Krátky uživateľský manuál" + +msgid "Donate to Support Tor" +msgstr "Prispejte na podporu Toru" + +msgid "Tor Q&A Site" +msgstr "Torovská Q&A stránka" + +msgid "Volunteer" +msgstr "Dobrovoľník" + +msgid "JavaScript is enabled." +msgstr "JavaScript je povolený." + +msgid "JavaScript is disabled." +msgstr "JavaScript nie je povolený."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 28 Mar '14

28 Mar '14

commit 1312e623a28f1268c4354d101f8a9e51f1ab6217 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 28 20:15:10 2014 +0000 Update translations for torcheck --- sk/torcheck.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sk/torcheck.po b/sk/torcheck.po index e6627ed..63bd091 100644 --- a/sk/torcheck.po +++ b/sk/torcheck.po @@ -5,12 +5,13 @@ # K0L0M4N <koloman375(a)gmail.com>, 2012 # martinstrucel <martin.strucel(a)gmail.com>, 2012 # Michelozzo <michalslovak2(a)hotmail.com>, 2013 +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-02 08:41+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-28 20:00+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,25 +73,25 @@ msgid "" msgstr "Projekt Tor je US 501(c)(3) neziskovký, určený na vývoj, výskum a vzdelanie o online anonymite a súkromí." msgid "Learn More »" -msgstr "" +msgstr "Dozvedieť sa viac »" msgid "Go" -msgstr "" +msgstr "Ísť" msgid "Short User Manual" -msgstr "" +msgstr "Krátky uživateľský manuál" msgid "Donate to Support Tor" -msgstr "" +msgstr "Prispejte na podporu Toru" msgid "Tor Q&A Site" -msgstr "" +msgstr "Torovská Q&A stránka" msgid "Volunteer" -msgstr "" +msgstr "Dobrovoľník" msgid "JavaScript is enabled." -msgstr "" +msgstr "JavaScript je povolený." msgid "JavaScript is disabled." -msgstr "" +msgstr "JavaScript nie je povolený."

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 28 Mar '14

28 Mar '14

commit 2c34eda0112fbceea9710455baaa91fde74ffb51 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 28 15:45:55 2014 +0000 Update translations for torbutton-browserproperties_completed --- vi/browser.properties | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vi/browser.properties b/vi/browser.properties new file mode 100644 index 0000000..295a03a --- /dev/null +++ b/vi/browser.properties @@ -0,0 +1,13 @@ +# Default home page +browser.startup.homepage=about:tor + +# Spell checker dictionary +spellchecker.dictionary=en_US + +# Default search engine +browser.search.defaultenginename=Startpage + +# Search engine order (order displayed in the search bar dropdown) +browser.search.order.1=Startpage +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google

1 0

[translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
by translation＠torproject.org 28 Mar '14

28 Mar '14

commit 8ba57f66dac17f45ea0bd1c9903db5f5cea27580 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 28 15:45:48 2014 +0000 Update translations for torbutton-brandproperties --- vi/brand.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/brand.properties b/vi/brand.properties index 9ae168e..8f3610e 100644 --- a/vi/brand.properties +++ b/vi/brand.properties @@ -10,6 +10,6 @@ homePageSingleStartMain=Firefox Start, a fast home page with built-in search homePageImport=Import your home page from %S homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationDescription=Vui lòng chọn trang chủ mà bạn muốn dùng: syncBrandShortName=Sync

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Mar '14

28 Mar '14

commit 82bc1db9646d7a0e3ca03fb2223e38af92d6b211 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 28 15:45:40 2014 +0000 Update translations for tor-launcher-network-settings --- vi/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vi/network-settings.dtd b/vi/network-settings.dtd index e42c83b..8283781 100644 --- a/vi/network-settings.dtd +++ b/vi/network-settings.dtd @@ -2,14 +2,14 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Trước khi kết nối đến mạng lưới Tor, bạn cần phải cung cấp thông tin về kết nối Internet của máy tính này."> <!ENTITY torSettings.yes "Có"> <!ENTITY torSettings.no "Không"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Những mục này có miêu tả đúng vị trí của bạn không?"> <!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.configurePrompt2 "Tôi cần phải cấu hình cầu nối, tường lửa, hoặc thiết lập máy chủ uỷ quyền."> <!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."> @@ -22,7 +22,7 @@ <!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.bridgeQuestion "Nhà cung cấp dịch vụ (ISP) của bạn có ngăn chặn hoặc kiểm duyệt kết nối đến mạng Tor không?"> <!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.">

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 28 Mar '14

28 Mar '14

commit 74032e451d813db95cec9e32b15d72f07188a9d8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 28 15:45:38 2014 +0000 Update translations for tor-launcher-progress_completed --- vi/progress.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vi/progress.dtd b/vi/progress.dtd new file mode 100644 index 0000000..507803b --- /dev/null +++ b/vi/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "Trạng thái Tor"> +<!ENTITY torprogress.openSettings "Cài đặt Mở"> +<!ENTITY torprogress.heading "Kết nối với mạng Tor"> +<!ENTITY torprogress.pleaseWait "Vui lòng chờ đợi để chúng tôi kết nối đến mạng lưới Tor.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 28 Mar '14

28 Mar '14

commit ee64aef7dfe4893a79768ea4d81e33a7036e7665 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 28 15:45:36 2014 +0000 Update translations for tor-launcher-progress --- vi/progress.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vi/progress.dtd b/vi/progress.dtd index cbafae0..507803b 100644 --- a/vi/progress.dtd +++ b/vi/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> +<!ENTITY torprogress.dialog.title "Trạng thái Tor"> +<!ENTITY torprogress.openSettings "Cài đặt Mở"> <!ENTITY torprogress.heading "Kết nối với mạng Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Vui lòng chờ đợi để chúng tôi kết nối đến mạng lưới Tor.">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 28 Mar '14

28 Mar '14

commit fb0ca9dedf61c5755a8c19ffbee1cf442037f796 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 28 15:45:32 2014 +0000 Update translations for tor-launcher-properties --- vi/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vi/torlauncher.properties b/vi/torlauncher.properties index d656235..9cfc93d 100644 --- a/vi/torlauncher.properties +++ b/vi/torlauncher.properties @@ -27,14 +27,14 @@ torlauncher.error_bridges_missing=Bạn phải chỉ dẫn một hoặc nhiều 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.recommended_bridge=(khuyên dùng) torlauncher.connect=Kết nối torlauncher.quit=Thoát torlauncher.quit_win=Thoát torlauncher.done=Hoàn thành -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Để được trợ giúp, liên hệ %S torlauncher.bootstrapStatus.conn_dir=Kết nối vào một thư mục chuyển tiếp torlauncher.bootstrapStatus.handshake_dir=Thành lập một kết nối thư mục được mã hóa

1 0

[bridgedb/develop] Add bridgedb.conf settings from bridgedb-admin repo.
by isis＠torproject.org 28 Mar '14

28 Mar '14

commit 87451679860c3e1561a61d309c5c894a54d00dc2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 28 06:43:36 2014 +0000 Add bridgedb.conf settings from bridgedb-admin repo. --- bridgedb.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bridgedb.conf b/bridgedb.conf index 1eb3037..006f715 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,15 +15,21 @@ # for details. # :copyright: (c) 2007-2013 The Tor Project, Inc. # (c) 2007-2013, all sentient entities within the AUTHORS file -# :version: 0.0.5 +# :version: 0.0.6 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.6 - 2014-03-28 +# * CHANGE gimp-captchas to be the norm. +# * ADD bucket for support team. +# # Changes in version 0.0.5 - 2014-02-27 # * ADD GIMP_CAPTCHA_ENABLED, GIMP_CAPTCHA_DIR, GIMP_CAPTCHA_HMAC_KEYFILE, # and GIMP_CAPTCHA_RSA_KEYFILE settings (see #10809). # * Decrease email share. +# * Whitelist the public IP address of bridges.torproject.org in +# RECAPTCHA_REMOTE_IP setting. # # Changes in version 0.0.4 - 2014-01-24 # * ADD COLLECT_TIMESTAMPS option (see #10724). Set it to False for the

1 0

[tor/master] Renamed "onionskins_completed" to "onionskins_assigned"
by nickm＠torproject.org 28 Mar '14

28 Mar '14

commit 6ad7f3417c80f195e382e98a0fe80371bc9b8c99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 22:57:53 2014 -0400 Renamed "onionskins_completed" to "onionskins_assigned" This improves the accuracy of the function/variable names. --- src/or/cpuworker.c | 2 +- src/or/rephist.c | 16 ++++++++-------- src/or/rephist.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index ecf0d20..209274d 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -686,7 +686,7 @@ assign_onionskin_to_cpuworker(connection_t *cpuworker, } if (connection_or_digest_is_known_relay(circ->p_chan->identity_digest)) - rep_hist_note_circuit_handshake_completed(onionskin->handshake_type); + rep_hist_note_circuit_handshake_assigned(onionskin->handshake_type); should_time = should_time_request(onionskin->handshake_type); memset(&req, 0, sizeof(req)); diff --git a/src/or/rephist.c b/src/or/rephist.c index 16e16ab..87f930a 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2992,11 +2992,11 @@ rep_hist_conn_stats_write(time_t now) } /** Internal statistics to track how many requests of each type of - * handshake we've received, and how many we've completed. Useful for - * seeing trends in cpu load. + * handshake we've received, and how many we've assigned to cpuworkers. + * Useful for seeing trends in cpu load. * @{ */ static int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; -static int onion_handshakes_completed[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; +static int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; /**@}*/ /** A new onionskin (using the <b>type</b> handshake) has arrived. */ @@ -3010,10 +3010,10 @@ rep_hist_note_circuit_handshake_requested(uint16_t type) /** We've sent an onionskin (using the <b>type</b> handshake) to a * cpuworker. */ void -rep_hist_note_circuit_handshake_completed(uint16_t type) +rep_hist_note_circuit_handshake_assigned(uint16_t type) { if (type <= MAX_ONION_HANDSHAKE_TYPE) - onion_handshakes_completed[type]++; + onion_handshakes_assigned[type]++; } /** Log our onionskin statistics since the last time we were called. */ @@ -3023,11 +3023,11 @@ rep_hist_log_circuit_handshake_stats(time_t now) (void)now; log_notice(LD_HEARTBEAT, "Circuit handshake stats since last time: " "%d/%d TAP, %d/%d NTor.", - onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], + onion_handshakes_assigned[ONION_HANDSHAKE_TYPE_TAP], onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP], - onion_handshakes_completed[ONION_HANDSHAKE_TYPE_NTOR], + onion_handshakes_assigned[ONION_HANDSHAKE_TYPE_NTOR], onion_handshakes_requested[ONION_HANDSHAKE_TYPE_NTOR]); - memset(onion_handshakes_completed, 0, sizeof(onion_handshakes_completed)); + memset(onion_handshakes_assigned, 0, sizeof(onion_handshakes_assigned)); memset(onion_handshakes_requested, 0, sizeof(onion_handshakes_requested)); } diff --git a/src/or/rephist.h b/src/or/rephist.h index de82474..df01ae6 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -97,7 +97,7 @@ time_t rep_hist_conn_stats_write(time_t now); void rep_hist_conn_stats_term(void); void rep_hist_note_circuit_handshake_requested(uint16_t type); -void rep_hist_note_circuit_handshake_completed(uint16_t type); +void rep_hist_note_circuit_handshake_assigned(uint16_t type); void rep_hist_log_circuit_handshake_stats(time_t now); void rep_hist_free_all(void);

1 0