April 2016 - tor-commits - lists.torproject.org

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit 1800418af3fdae245d7f7adf56879f67b5c004bb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 09:46:13 2016 +0000 Update translations for tor-and-https_completed --- zh_TW.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 0d7667b..3a6e084 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -2,13 +2,14 @@ # Translators: # Agustín Wu <losangwuyts(a)gmail.com>, 2016 # danfong <danfong.hsieh(a)gmail.com>, 2014 +# Kin Kwok, 2016 # LNDDYL, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-13 09:39+0000\n" +"Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "ltr" +msgstr "左至右" #. (itstool) path: svg/title #: C/tor-and-https.svg:14 @@ -98,7 +99,7 @@ msgstr "Sysadmin" #: C/tor-and-https.svg:363 #, no-wrap msgid "Police" -msgstr "Police" +msgstr "員警" #. (itstool) path: defs/text #: C/tor-and-https.svg:363

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit 150518dd0d10b5c0bc20f00f76a2523169f7fb2f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 09:46:10 2016 +0000 Update translations for tor-and-https --- zh_TW.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 0d7667b..3a6e084 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -2,13 +2,14 @@ # Translators: # Agustín Wu <losangwuyts(a)gmail.com>, 2016 # danfong <danfong.hsieh(a)gmail.com>, 2014 +# Kin Kwok, 2016 # LNDDYL, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-13 09:39+0000\n" +"Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "ltr" +msgstr "左至右" #. (itstool) path: svg/title #: C/tor-and-https.svg:14 @@ -98,7 +99,7 @@ msgstr "Sysadmin" #: C/tor-and-https.svg:363 #, no-wrap msgid "Police" -msgstr "Police" +msgstr "員警" #. (itstool) path: defs/text #: C/tor-and-https.svg:363

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit 97878edb52092eb289209305b0228b5f05cb8b13 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 09:46:05 2016 +0000 Update translations for tails-iuk_completed --- zh_TW.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index ce1c691..d656b10 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -4,6 +4,7 @@ # # Translators: # danfong <danfong.hsieh(a)gmail.com>, 2014 +# Kin Kwok, 2016 # Wen-Gan Li <wgli(a)wgli.net>, 2015 # x4r <xatierlike(a)gmail.com>, 2014 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-03-07 17:51+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Wen-Gan Li <wgli(a)wgli.net>\n" +"PO-Revision-Date: 2016-04-13 09:42+0000\n" +"Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -167,7 +168,7 @@ msgstr "下載升級時發生錯誤" msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "輸出檔 '%{output_file}s' 不存在，但是 tails-iut-get-target-file 沒有抱怨。請回報錯誤。" +msgstr "輸出檔「%{output_file}s」不存在，但是 tails-iut-get-target-file 沒有抱怨。請回報錯誤。" #: ../lib/Tails/IUK/Frontend.pm:558 msgid "Error while creating temporary downloading directory"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit d688d79f93637395c2c4c6dabd6b30cedd01d817 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 09:46:02 2016 +0000 Update translations for tails-iuk --- zh_TW.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index ce1c691..d656b10 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -4,6 +4,7 @@ # # Translators: # danfong <danfong.hsieh(a)gmail.com>, 2014 +# Kin Kwok, 2016 # Wen-Gan Li <wgli(a)wgli.net>, 2015 # x4r <xatierlike(a)gmail.com>, 2014 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-03-07 17:51+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Wen-Gan Li <wgli(a)wgli.net>\n" +"PO-Revision-Date: 2016-04-13 09:42+0000\n" +"Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -167,7 +168,7 @@ msgstr "下載升級時發生錯誤" msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "輸出檔 '%{output_file}s' 不存在，但是 tails-iut-get-target-file 沒有抱怨。請回報錯誤。" +msgstr "輸出檔「%{output_file}s」不存在，但是 tails-iut-get-target-file 沒有抱怨。請回報錯誤。" #: ../lib/Tails/IUK/Frontend.pm:558 msgid "Error while creating temporary downloading directory"

1 0

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit c28f0c82049ba7e855f1be1bce2601f1b298e3ed Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 09:45:56 2016 +0000 Update translations for torbutton-branddtd_completed --- zh_TW/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/brand.dtd b/zh_TW/brand.dtd index efbe610..565fc61 100644 --- a/zh_TW/brand.dtd +++ b/zh_TW/brand.dtd @@ -11,5 +11,5 @@  <!ENTITY plugins.installed.find "點擊以載入已安裝的系統外掛"> <!ENTITY plugins.installed.enable "啟用外掛"> -<!ENTITY plugins.installed.disable "禁用外掛"> +<!ENTITY plugins.installed.disable "停用外掛"> <!ENTITY plugins.installed.disable.tip "點擊以阻止載入已安裝的系統外掛">

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit 50454ab51586c8c1eac1805764fad9bdd3eecef8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 09:45:53 2016 +0000 Update translations for torbutton-branddtd --- zh_TW/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/brand.dtd b/zh_TW/brand.dtd index efbe610..565fc61 100644 --- a/zh_TW/brand.dtd +++ b/zh_TW/brand.dtd @@ -11,5 +11,5 @@  <!ENTITY plugins.installed.find "點擊以載入已安裝的系統外掛"> <!ENTITY plugins.installed.enable "啟用外掛"> -<!ENTITY plugins.installed.disable "禁用外掛"> +<!ENTITY plugins.installed.disable "停用外掛"> <!ENTITY plugins.installed.disable.tip "點擊以阻止載入已安裝的系統外掛">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit 92e8a4af76d7e6887f1cc73d578199388622ae1e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 09:45:45 2016 +0000 Update translations for tails-misc_completed --- zh_TW.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 14b6918..a266669 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -8,6 +8,7 @@ # cges30901 <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 +# Kin Kwok, 2016 # LNDDYL, 2014 # Po-Chun Huang <aphroteus(a)gmail.com>, 2014 # Wen-Gan Li <wgli(a)wgli.net>, 2015 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-13 09:40+0000\n" +"Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,7 +110,7 @@ msgstr "_Manage 金鑰" #: config/chroot_local-includes/usr/local/bin/gpgApplet:208 msgid "_Open Text Editor" -msgstr "文件编辑器" +msgstr "_Open Text Editor" #: config/chroot_local-includes/usr/local/bin/gpgApplet:252 msgid "The clipboard does not contain valid input data."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit c7bcd1cc4d28bd125fe752ec0455cc9a14482bea Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 09:45:41 2016 +0000 Update translations for tails-misc --- zh_TW.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 14b6918..a266669 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -8,6 +8,7 @@ # cges30901 <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 +# Kin Kwok, 2016 # LNDDYL, 2014 # Po-Chun Huang <aphroteus(a)gmail.com>, 2014 # Wen-Gan Li <wgli(a)wgli.net>, 2015 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-13 09:40+0000\n" +"Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,7 +110,7 @@ msgstr "_Manage 金鑰" #: config/chroot_local-includes/usr/local/bin/gpgApplet:208 msgid "_Open Text Editor" -msgstr "文件编辑器" +msgstr "_Open Text Editor" #: config/chroot_local-includes/usr/local/bin/gpgApplet:252 msgid "The clipboard does not contain valid input data."

1 0

[tor/master] fix typos/etc before i go nuts on #18809
by arma＠torproject.org 13 Apr '16

13 Apr '16

commit 525307c0ea5717adba9f35cf7ccb1c5108ac3440 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 13 00:06:30 2016 -0400 fix typos/etc before i go nuts on #18809 --- src/or/directory.c | 12 ++++++------ src/or/main.c | 2 +- src/or/networkstatus.c | 17 +++++++++-------- src/or/networkstatus.h | 2 +- src/test/test_connection.c | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index dbb2987..45061ae 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3648,7 +3648,7 @@ connection_dir_would_close_consensus_conn_helper(void) * consensus, and we are still bootstrapping (that is, we have no usable * consensus), we don't want to close any until one starts downloading. */ if (!networkstatus_consensus_is_downloading_usable_flavor() - && networkstatus_consensus_is_boostrapping(time(NULL))) { + && networkstatus_consensus_is_bootstrapping(time(NULL))) { return 0; } @@ -3682,7 +3682,7 @@ connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose) * bootstrapping (that is, we have no usable consensus), we can be sure that * any further connections would be excess. */ if (networkstatus_consensus_is_downloading_usable_flavor() - && networkstatus_consensus_is_boostrapping(time(NULL))) { + && networkstatus_consensus_is_bootstrapping(time(NULL))) { return 1; } @@ -3723,12 +3723,12 @@ connection_dir_close_consensus_conn_if_extra(dir_connection_t *conn) return 0; } - const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( time(NULL)); /* We don't want to check other connections to see if they are downloading, * as this is prone to race-conditions. So leave it for - * connection_dir_consider_close_extra_consensus_conns() to clean up. + * connection_dir_close_extra_consensus_conns(() to clean up. * * But if conn has just started connecting, or we have a consensus already, * we can be sure it's not needed any more. */ @@ -3768,7 +3768,7 @@ connection_dir_close_extra_consensus_conns(void) return; } - int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( time(NULL)); const char *usable_resource = networkstatus_get_flavor_name( @@ -3877,7 +3877,7 @@ find_dl_schedule(download_status_t *dls, const or_options_t *options) const int dir_server = dir_server_mode(options); const int multi_d = networkstatus_consensus_can_use_multiple_directories( options); - const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( time(NULL)); const int use_fallbacks = networkstatus_consensus_can_use_extra_fallbacks( options); diff --git a/src/or/main.c b/src/or/main.c index a2cf5b1..bf5b2b8 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1917,7 +1917,7 @@ fetch_networkstatus_callback(time_t now, const or_options_t *options) /* How often do we check whether we should download network status * documents? */ - const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( now); const int prefer_mirrors = !directory_fetches_from_authorities( get_options()); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3967f56..51c985e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -819,7 +819,7 @@ update_consensus_networkstatus_downloads(time_t now) { int i; const or_options_t *options = get_options(); - const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( now); const int use_multi_conn = networkstatus_consensus_can_use_multiple_directories(options); @@ -875,12 +875,13 @@ update_consensus_networkstatus_downloads(time_t now) resource, DIR_CONN_STATE_CONNECTING); - if (i == usable_consensus_flavor() - && connect_consens_conn_count < consens_conn_count) { + /* If not all connections are "connecting", then some are + * downloading. We want to have at most one downloading at a time. */ + if (connect_consens_conn_count < consens_conn_count) { continue; } - /* Make multiple connections for a bootstrap consensus download */ + /* Make multiple connections for a bootstrap consensus download. */ update_consensus_bootstrap_multiple_downloads(now, options, we_are_bootstrapping); } else { @@ -954,7 +955,7 @@ update_consensus_bootstrap_attempt_downloads( * connections. * Only call when bootstrapping, and when we want to make additional * connections. Only nodes that satisfy - * networkstatus_consensus_can_use_multiple_directories make additonal + * networkstatus_consensus_can_use_multiple_directories make additional * connections. */ static void @@ -969,7 +970,7 @@ update_consensus_bootstrap_multiple_downloads(time_t now, return; } - /* If we've managed to validate a usable consensus, don't make additonal + /* If we've managed to validate a usable consensus, don't make additional * connections. */ if (!we_are_bootstrapping) { return; @@ -1277,7 +1278,7 @@ networkstatus_get_reasonably_live_consensus(time_t now, int flavor) * only using the authorities and fallback directory mirrors to download the * consensus flavour we'll use. */ int -networkstatus_consensus_is_boostrapping(time_t now) +networkstatus_consensus_is_bootstrapping(time_t now) { /* If we don't have a consensus, we must still be bootstrapping */ return !networkstatus_get_reasonably_live_consensus( @@ -1327,7 +1328,7 @@ networkstatus_consensus_can_use_extra_fallbacks(const or_options_t *options) * return value of this function to see if a client could make multiple * bootstrap connections. Use * networkstatus_consensus_can_use_multiple_directories() - * and networkstatus_consensus_is_boostrapping(). */ + * and networkstatus_consensus_is_bootstrapping(). */ int networkstatus_consensus_has_excess_connections(void) { diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 9bbb9a3..f2f8af5 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -70,7 +70,7 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, networkstatus_t *networkstatus_get_live_consensus(time_t now); networkstatus_t *networkstatus_get_reasonably_live_consensus(time_t now, int flavor); -int networkstatus_consensus_is_boostrapping(time_t now); +int networkstatus_consensus_is_bootstrapping(time_t now); int networkstatus_consensus_can_use_multiple_directories( const or_options_t *options); int networkstatus_consensus_can_use_extra_fallbacks( diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 15ae973..6f7aef8 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -705,7 +705,7 @@ test_conn_download_status(void *arg) /* now try closing the one that isn't downloading: * these tests won't work unless tor thinks it is bootstrapping */ - tt_assert(networkstatus_consensus_is_boostrapping(time(NULL))); + tt_assert(networkstatus_consensus_is_bootstrapping(time(NULL))); tt_assert(connection_dir_count_by_purpose_and_resource( TEST_CONN_RSRC_PURPOSE,

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 13 Apr '16

13 Apr '16

commit 75852c2749f17af109c34cdcad7f95d557a2a214 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 13 03:46:17 2016 +0000 Update translations for tor_animation_completed --- zh_TW.srt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW.srt b/zh_TW.srt index 21635a9..ef05e12 100644 --- a/zh_TW.srt +++ b/zh_TW.srt @@ -17,7 +17,7 @@ 5 00:00:13,280 --> 00:00:14,640 -讓我更好地解釋它, +讓我更好地解釋它， 6 00:00:14,920 --> 00:00:17,740 @@ -29,7 +29,7 @@ 8 00:00:22,800 --> 00:00:26,500 -所有你訪問過的網站，瀏覽器用來瀏覽網頁, +所有你訪問過的網站，瀏覽器用來瀏覽網頁， 9 00:00:26,700 --> 00:00:29,140

1 0