June 2017 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 21 Jun '17

21 Jun '17

commit bf6a628af05806b510761bb031a5d7313ba774b2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 21 19:15:03 2017 +0000 Update translations for bridgedb --- hy/LC_MESSAGES/bridgedb.po | 49 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/hy/LC_MESSAGES/bridgedb.po b/hy/LC_MESSAGES/bridgedb.po index 5d5ea4a..b9641e4 100644 --- a/hy/LC_MESSAGES/bridgedb.po +++ b/hy/LC_MESSAGES/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # Hrach Mkrtchyan <mhrach87(a)gmail.com>, 2016 +# Sarkis Andreyan <sarkis.andreyan(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-07-20 13:28+0000\n" -"Last-Translator: Hrach Mkrtchyan <mhrach87(a)gmail.com>\n" +"PO-Revision-Date: 2017-06-21 19:14+0000\n" +"Last-Translator: Sarkis Andreyan <sarkis.andreyan(a)gmail.com>\n" "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,19 +33,19 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "Ներեցե՛ք, Ձեր հարցումը սխալ ընթացք ստացավ:" #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "Հայտնել սխալի մասին" #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "" +msgstr "Ելակետային կոդ" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "Փոփոխությունների մատյան" #: bridgedb/https/templates/base.html:88 msgid "Contact" @@ -52,7 +53,7 @@ msgstr "" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "Դիտել բոլորը" +msgstr "Ընտրել բոլորը" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" @@ -69,11 +70,11 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "Փֆֆ, մի բան նենց չեղավ:" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Կարծես թե սխալ տեղի ունեցավ Ձեր QRCode-ը ստանալիս:" #: bridgedb/https/templates/bridges.html:73 msgid "" @@ -83,14 +84,14 @@ msgstr "" #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Այժմ հասանելի ոչ մի bridge չկա..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Հավանաբար՝ փորձեք %sետ վերադառնալ%s և ընտրել ուրիշ bridge-ի տեսակ:" #: bridgedb/https/templates/index.html:11 #, python-format @@ -100,7 +101,7 @@ msgstr "Քայլ %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Ներբեռնե՛ք %s«Tor Browser»-ը%s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -110,17 +111,17 @@ msgstr "Քայլ %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Ստացե՛ք %sbridge-ներ%s" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Քայլ %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Այժմ %sավելացրե՛ք bridge-ները «Tor Browser»-ին%s:" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -129,19 +130,19 @@ msgstr "" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sԸ%sնդամենը ինձ bridge-նե՛ր տուր:" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" -msgstr "" +msgstr "Ավելի շատ ընտրանքեր" #: bridgedb/https/templates/options.html:86 msgid "No" -msgstr "" +msgstr "Ոչ" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "" +msgstr "ոչ մեկը" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -149,7 +150,7 @@ msgstr "" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sԱ%sյո՛, ինձ պետք են IPv6 հասցեներ:" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -157,22 +158,22 @@ msgstr "" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sՍ%sտացե՛ք Bridge-ներ:" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[Սա ավտոմատ ուղարկված նամակ է. խնդրում ենք՝ չպատասխանել]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "" +msgstr "Ահա Ձեր bridge-ները." #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "Դուք գերազանցել եք սահմանաչափը, դանդաղե՛ք մի քիչ: Էլ. նամակների միջև նվազագույն\nժամանակը %s ժամ է: Բոլոր հետագա նամակները, որոնք կուղարկվեն այդ ժամանակահատվածում, կարհամարվեն:" #: bridgedb/strings.py:50 msgid ""

1 0

[tor/release-0.3.1] Merge branch 'bug22356_029' into maint-0.3.1
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit 784b29a2bfc7b7ce5ef355629528a38c50b81908 Merge: e51e7bd e3efc07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 21 13:54:02 2017 -0400 Merge branch 'bug22356_029' into maint-0.3.1 changes/bug22356 | 5 +++++ src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Downgrade "assign_to_cpuworker failed" to INFO.
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit e3efc076c53467be4785301b3f1872bcb52630b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 15:24:33 2017 -0400 Downgrade "assign_to_cpuworker failed" to INFO. Closes ticket 22356 --- changes/bug22356 | 5 +++++ src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22356 b/changes/bug22356 new file mode 100644 index 0000000..0082b54 --- /dev/null +++ b/changes/bug22356 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, relay): + - Downgrade "assigned_to_cpuworker failed" message to INFO-level + severity. In every case that can reach it, either a better warning + has already been logged, or no warning is warranted. Fixes bug 22356; + bugfix on 0.2.6.3-alpha. diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index fd6de6e..884b2d0 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -475,7 +475,7 @@ queue_pending_tasks(void) return; if (assign_onionskin_to_cpuworker(circ, onionskin)) - log_warn(LD_OR,"assign_to_cpuworker failed. Ignoring."); + log_info(LD_OR,"assign_to_cpuworker failed. Ignoring."); } }

1 0

[tor/master] Merge branch 'bug22356_029' into maint-0.3.1
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit 784b29a2bfc7b7ce5ef355629528a38c50b81908 Merge: e51e7bd e3efc07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 21 13:54:02 2017 -0400 Merge branch 'bug22356_029' into maint-0.3.1 changes/bug22356 | 5 +++++ src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Downgrade "assign_to_cpuworker failed" to INFO.
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit e3efc076c53467be4785301b3f1872bcb52630b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 15:24:33 2017 -0400 Downgrade "assign_to_cpuworker failed" to INFO. Closes ticket 22356 --- changes/bug22356 | 5 +++++ src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22356 b/changes/bug22356 new file mode 100644 index 0000000..0082b54 --- /dev/null +++ b/changes/bug22356 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, relay): + - Downgrade "assigned_to_cpuworker failed" message to INFO-level + severity. In every case that can reach it, either a better warning + has already been logged, or no warning is warranted. Fixes bug 22356; + bugfix on 0.2.6.3-alpha. diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index fd6de6e..884b2d0 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -475,7 +475,7 @@ queue_pending_tasks(void) return; if (assign_onionskin_to_cpuworker(circ, onionskin)) - log_warn(LD_OR,"assign_to_cpuworker failed. Ignoring."); + log_info(LD_OR,"assign_to_cpuworker failed. Ignoring."); } }

1 0

[tor/maint-0.3.1] Merge branch 'bug22356_029' into maint-0.3.1
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit 784b29a2bfc7b7ce5ef355629528a38c50b81908 Merge: e51e7bd e3efc07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 21 13:54:02 2017 -0400 Merge branch 'bug22356_029' into maint-0.3.1 changes/bug22356 | 5 +++++ src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Downgrade "assign_to_cpuworker failed" to INFO.
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit e3efc076c53467be4785301b3f1872bcb52630b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 15:24:33 2017 -0400 Downgrade "assign_to_cpuworker failed" to INFO. Closes ticket 22356 --- changes/bug22356 | 5 +++++ src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22356 b/changes/bug22356 new file mode 100644 index 0000000..0082b54 --- /dev/null +++ b/changes/bug22356 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, relay): + - Downgrade "assigned_to_cpuworker failed" message to INFO-level + severity. In every case that can reach it, either a better warning + has already been logged, or no warning is warranted. Fixes bug 22356; + bugfix on 0.2.6.3-alpha. diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index fd6de6e..884b2d0 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -475,7 +475,7 @@ queue_pending_tasks(void) return; if (assign_onionskin_to_cpuworker(circ, onionskin)) - log_warn(LD_OR,"assign_to_cpuworker failed. Ignoring."); + log_info(LD_OR,"assign_to_cpuworker failed. Ignoring."); } }

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit 5d3f484f4ac4f45c0404b1f8b998983636f2a693 Merge: 72b132e 784b29a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 21 13:54:07 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22356 | 5 +++++ src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Remove obsolete authdir_mode_any_main()
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit 0471c905a18760413a63f05f50535313c76ca0c4 Author: huyvq <huyvq.c633(a)gmail.com> Date: Fri Jun 2 23:23:39 2017 +0700 Remove obsolete authdir_mode_any_main() --- src/or/config.c | 2 +- src/or/router.c | 8 +------- src/or/router.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 3413442..e17ae86 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3161,7 +3161,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "UseEntryGuards. Disabling."); options->UseEntryGuards = 0; } - if (!options->DownloadExtraInfo && authdir_mode_any_main(options)) { + if (!options->DownloadExtraInfo && authdir_mode_v3(options)) { log_info(LD_CONFIG, "Authoritative directories always try to download " "extra-info documents. Setting DownloadExtraInfo."); options->DownloadExtraInfo = 1; diff --git a/src/or/router.c b/src/or/router.c index 2187a76..849cffd 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1596,12 +1596,6 @@ authdir_mode_v3(const or_options_t *options) { return authdir_mode(options) && options->V3AuthoritativeDir != 0; } -/** Return true iff we are a v3 directory authority. */ -int -authdir_mode_any_main(const or_options_t *options) -{ - return options->V3AuthoritativeDir; -} /** Return true if we believe ourselves to be any kind of * authoritative directory beyond just a hidserv authority. */ int @@ -1619,7 +1613,7 @@ authdir_mode_handles_descs(const or_options_t *options, int purpose) if (purpose < 0) return authdir_mode_any_nonhidserv(options); else if (purpose == ROUTER_PURPOSE_GENERAL) - return authdir_mode_any_main(options); + return authdir_mode_v3(options); else if (purpose == ROUTER_PURPOSE_BRIDGE) return (options->BridgeAuthoritativeDir); else diff --git a/src/or/router.h b/src/or/router.h index 9c5def5..2e62185 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -54,7 +54,6 @@ int net_is_disabled(void); int authdir_mode(const or_options_t *options); int authdir_mode_v3(const or_options_t *options); -int authdir_mode_any_main(const or_options_t *options); int authdir_mode_any_nonhidserv(const or_options_t *options); int authdir_mode_handles_descs(const or_options_t *options, int purpose); int authdir_mode_publishes_statuses(const or_options_t *options);

1 0

[tor/master] changes file for ticket22311
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit 72b132e2a4e0f2ae5865b5a40e62ee139512adba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 21 12:45:18 2017 -0400 changes file for ticket22311 --- changes/ticket22311 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket22311 b/changes/ticket22311 new file mode 100644 index 0000000..0bfd465 --- /dev/null +++ b/changes/ticket22311 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove several now-obsolete functions for asking about old variants + directory authority status. Closes ticket 22311; patch from "huyvq".

1 0