October 2015 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Oct '15

07 Oct '15

commit 66e1131d451cef79ce43bea5dcfa08cc4ab0413c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 20:15:04 2015 +0000 Update translations for bridgedb --- es_MX/LC_MESSAGES/bridgedb.po | 338 +++++++++++++++++++++-------------------- 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po index 6c1079e..09acfc8 100644 --- a/es_MX/LC_MESSAGES/bridgedb.po +++ b/es_MX/LC_MESSAGES/bridgedb.po @@ -4,18 +4,20 @@ # # Translators: # manuelglz <cglzmtzg(a)gmail.com>, 2014 +# Javier Flores Topete <javierflorestopete789(a)gmail.com>, 2015 # TheFreeman <maurocarrizales(a)outlook.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\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: 2015-10-07 20:02+0000\n" +"Last-Translator: Javier Flores Topete <javierflorestopete789(a)gmail.com>\n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -30,57 +32,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." +msgstr "Perdón!Algo salió mal con tu cuestionario" + +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "No" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "{Este es un mensage automático;por favor no lo conteste.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Aquí están tus puentes:" -#: lib/bridgedb/strings.py:22 +#: 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 "Has excedido el limite de tu porcentage. ¡Por favor pausa! El tiempo minimo entre\ncorreos electrónicos es %s horas. Todos los demás correos electrónicos durante este período serán ignorados." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "ORDENEs:(combina COMMANDs para especificar opciones multiples)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "¡Bienvenido a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "En este momento los TYPEs para tranporte apoyados:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "¡Eh, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "¡Hola, amigo!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Claves Públicas" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -91,7 +218,7 @@ msgstr "Este correo electrónico fue creado con arcoiris, unicornios y chispas\n #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -102,7 +229,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -114,7 +241,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -123,20 +250,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -144,12 +271,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -157,48 +284,48 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -207,21 +334,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -229,153 +356,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "No" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit cd14405a431cf351abe79441214899cfee5eb670 Merge: aeb9373 c464a36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 15:21:23 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7' changes/ifaddrs-tests-network-configs | 7 +++++ src/test/test_address.c | 46 +++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 16 deletions(-)

1 0

[tor/master] Make get_ifaddrs tests more tolerant of unusual network configs
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit c464a367728dcd123b9ad9bd0cf6a4a3e4397310 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Oct 6 15:32:44 2015 +1100 Make get_ifaddrs tests more tolerant of unusual network configs * Don't assume that every test box has an IPv4 address * Don't assume that every test box has a non-local address Resolves issue #17255 released in unit tests in 0.2.7.3-rc. --- changes/ifaddrs-tests-network-configs | 7 +++++ src/test/test_address.c | 46 +++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/changes/ifaddrs-tests-network-configs b/changes/ifaddrs-tests-network-configs new file mode 100644 index 0000000..f7f3d3e --- /dev/null +++ b/changes/ifaddrs-tests-network-configs @@ -0,0 +1,7 @@ + o Minor fixes (unit tests, networking): + - Make get_ifaddrs_* unit tests more tolerant of different network + configurations: + - Don't assume every test box has an IPv4 address. + - Don't assume every test box has a non-localhost address. + - Closes ticket #17255. Patch by "teor". + Fix for unit tests released in 0.2.7.3. diff --git a/src/test/test_address.c b/src/test/test_address.c index 938f776..3e73c3e 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -688,16 +688,20 @@ test_address_get_if_addrs_list_internal(void *arg) results = get_interface_address_list(LOG_ERR, 1); tt_assert(results != NULL); - /* Assume every system has at least 1 non-local non-multicast IPv4 - * interface, even if it is an internal one */ - tt_int_op(smartlist_len(results),>=,1); + /* When the network is down, a system might not have any non-local + * non-multicast addresseses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + tt_int_op(smartlist_len(results),>=,0); tt_assert(!smartlist_contains_localhost_tor_addr(results)); tt_assert(!smartlist_contains_multicast_tor_addr(results)); /* The list may or may not contain internal addresses */ - tt_assert(smartlist_contains_ipv4_tor_addr(results)); - tt_assert(!smartlist_contains_ipv6_tor_addr(results)); + /* Allow unit tests to pass on IPv6-only machines */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(results) + || smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address_list(results); @@ -721,7 +725,10 @@ test_address_get_if_addrs_list_no_internal(void *arg) tt_assert(!smartlist_contains_multicast_tor_addr(results)); tt_assert(!smartlist_contains_internal_tor_addr(results)); - /* The list may or may not contain IPv4 addresses */ + /* if there are any addresses, they must be IPv4 */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(results)); + } tt_assert(!smartlist_contains_ipv6_tor_addr(results)); done: @@ -746,8 +753,11 @@ test_address_get_if_addrs6_list_internal(void *arg) tt_assert(!smartlist_contains_multicast_tor_addr(results)); /* The list may or may not contain internal addresses */ + /* if there are any addresses, they must be IPv6 */ tt_assert(!smartlist_contains_ipv4_tor_addr(results)); - /* The list may or may not contain IPv6 addresses */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address6_list(results); @@ -772,7 +782,9 @@ test_address_get_if_addrs6_list_no_internal(void *arg) tt_assert(!smartlist_contains_internal_tor_addr(results)); tt_assert(!smartlist_contains_ipv4_tor_addr(results)); - /* The list may or may not contain IPv6 addresses */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address6_list(results); @@ -883,16 +895,18 @@ test_address_get_if_addrs(void *arg) rv = get_interface_address(LOG_ERR, &addr_h); - /* Assume every system has at least 1 non-local non-multicast IPv4 - * interface, even if it is an internal one */ - tt_assert(rv == 0); - tor_addr_from_ipv4h(&tor_addr, addr_h); + /* When the network is down, a system might not have any non-local + * non-multicast IPv4 addresses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + if (rv == 0) { + tor_addr_from_ipv4h(&tor_addr, addr_h); - tt_assert(!tor_addr_is_loopback(&tor_addr)); - tt_assert(!tor_addr_is_multicast(&tor_addr)); - /* The address may or may not be an internal address */ + tt_assert(!tor_addr_is_loopback(&tor_addr)); + tt_assert(!tor_addr_is_multicast(&tor_addr)); + /* The address may or may not be an internal address */ - tt_assert(tor_addr_is_v4(&tor_addr)); + tt_assert(tor_addr_is_v4(&tor_addr)); + } done: return;

1 0

[tor/maint-0.2.7] Make get_ifaddrs tests more tolerant of unusual network configs
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit c464a367728dcd123b9ad9bd0cf6a4a3e4397310 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Oct 6 15:32:44 2015 +1100 Make get_ifaddrs tests more tolerant of unusual network configs * Don't assume that every test box has an IPv4 address * Don't assume that every test box has a non-local address Resolves issue #17255 released in unit tests in 0.2.7.3-rc. --- changes/ifaddrs-tests-network-configs | 7 +++++ src/test/test_address.c | 46 +++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/changes/ifaddrs-tests-network-configs b/changes/ifaddrs-tests-network-configs new file mode 100644 index 0000000..f7f3d3e --- /dev/null +++ b/changes/ifaddrs-tests-network-configs @@ -0,0 +1,7 @@ + o Minor fixes (unit tests, networking): + - Make get_ifaddrs_* unit tests more tolerant of different network + configurations: + - Don't assume every test box has an IPv4 address. + - Don't assume every test box has a non-localhost address. + - Closes ticket #17255. Patch by "teor". + Fix for unit tests released in 0.2.7.3. diff --git a/src/test/test_address.c b/src/test/test_address.c index 938f776..3e73c3e 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -688,16 +688,20 @@ test_address_get_if_addrs_list_internal(void *arg) results = get_interface_address_list(LOG_ERR, 1); tt_assert(results != NULL); - /* Assume every system has at least 1 non-local non-multicast IPv4 - * interface, even if it is an internal one */ - tt_int_op(smartlist_len(results),>=,1); + /* When the network is down, a system might not have any non-local + * non-multicast addresseses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + tt_int_op(smartlist_len(results),>=,0); tt_assert(!smartlist_contains_localhost_tor_addr(results)); tt_assert(!smartlist_contains_multicast_tor_addr(results)); /* The list may or may not contain internal addresses */ - tt_assert(smartlist_contains_ipv4_tor_addr(results)); - tt_assert(!smartlist_contains_ipv6_tor_addr(results)); + /* Allow unit tests to pass on IPv6-only machines */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(results) + || smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address_list(results); @@ -721,7 +725,10 @@ test_address_get_if_addrs_list_no_internal(void *arg) tt_assert(!smartlist_contains_multicast_tor_addr(results)); tt_assert(!smartlist_contains_internal_tor_addr(results)); - /* The list may or may not contain IPv4 addresses */ + /* if there are any addresses, they must be IPv4 */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(results)); + } tt_assert(!smartlist_contains_ipv6_tor_addr(results)); done: @@ -746,8 +753,11 @@ test_address_get_if_addrs6_list_internal(void *arg) tt_assert(!smartlist_contains_multicast_tor_addr(results)); /* The list may or may not contain internal addresses */ + /* if there are any addresses, they must be IPv6 */ tt_assert(!smartlist_contains_ipv4_tor_addr(results)); - /* The list may or may not contain IPv6 addresses */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address6_list(results); @@ -772,7 +782,9 @@ test_address_get_if_addrs6_list_no_internal(void *arg) tt_assert(!smartlist_contains_internal_tor_addr(results)); tt_assert(!smartlist_contains_ipv4_tor_addr(results)); - /* The list may or may not contain IPv6 addresses */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address6_list(results); @@ -883,16 +895,18 @@ test_address_get_if_addrs(void *arg) rv = get_interface_address(LOG_ERR, &addr_h); - /* Assume every system has at least 1 non-local non-multicast IPv4 - * interface, even if it is an internal one */ - tt_assert(rv == 0); - tor_addr_from_ipv4h(&tor_addr, addr_h); + /* When the network is down, a system might not have any non-local + * non-multicast IPv4 addresses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + if (rv == 0) { + tor_addr_from_ipv4h(&tor_addr, addr_h); - tt_assert(!tor_addr_is_loopback(&tor_addr)); - tt_assert(!tor_addr_is_multicast(&tor_addr)); - /* The address may or may not be an internal address */ + tt_assert(!tor_addr_is_loopback(&tor_addr)); + tt_assert(!tor_addr_is_multicast(&tor_addr)); + /* The address may or may not be an internal address */ - tt_assert(tor_addr_is_v4(&tor_addr)); + tt_assert(tor_addr_is_v4(&tor_addr)); + } done: return;

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 07 Oct '15

07 Oct '15

commit 51cf853f0a34b00aed488265670cdaa8652ac19b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:45:22 2015 +0000 Update translations for liveusb-creator_completed --- vi/vi.po | 600 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 600 insertions(+) diff --git a/vi/vi.po b/vi/vi.po new file mode 100644 index 0000000..7a95df7 --- /dev/null +++ b/vi/vi.po @@ -0,0 +1,600 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Hoang Thu Giang <hoanggiang0811(a)yahoo.com>, 2014 +# Khanh Nguyen <nguyenduykhanh85(a)gmail.com>, 2015 +# Tho Nguyen <tho.nguyen(a)savoirfairelinux.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-10 16:01+0200\n" +"PO-Revision-Date: 2015-10-07 18:45+0000\n" +"Last-Translator: Tho Nguyen <tho.nguyen(a)savoirfairelinux.com>\n" +"Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: vi\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../liveusb/gui.py:451 +msgid "\"Clone & Install\"" +msgstr "\"Tạo bản sao và Cài đặt\"" + +#: ../liveusb/gui.py:453 +msgid "\"Install from ISO\"" +msgstr "\"Cài đặt từ ISO\"" + +#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 +#, python-format +msgid "%(distribution)s Installer" +msgstr "%(distribution)s Bản cài đặt" + +#: ../liveusb/gui.py:804 +#, python-format +msgid "%(filename)s selected" +msgstr "%(filename)s được chọn" + +#: ../liveusb/gui.py:424 +#, python-format +msgid "%(size)s %(label)s" +msgstr "%(size)s %(label)s" + +#: ../liveusb/gui.py:430 +#, python-format +msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" + +#: ../liveusb/creator.py:1097 +#, python-format +msgid "%s already bootable" +msgstr "%s đã có thể khởi động" + +#: ../liveusb/launcher_ui.py:156 +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Cần giúp đỡ? Hãy đọc </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">Tài liệu</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" + +#: ../liveusb/launcher_ui.py:151 +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Chép hệ điều hành Tails đang chạy vào USB hay thẻ SD. Tất cả dữ liệu trong ổ đĩa đó sẽ bị mất.</span></p></body></html>" + +#: ../liveusb/launcher_ui.py:153 +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Chép hệ điều hành Tails đang chạy vào thiết bị đã được cài Tails. Những phân vùng được tìm thấy trên thẻ nhớ được giữ lại.</span></p></body></html>" + +#: ../liveusb/launcher_ui.py:155 +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Nâng cấp một thiết bị đã được cài Tails từ hình ảnh ISO mới.</span></p></body></html>" + +#: ../liveusb/dialog.py:154 +msgid "Alt+B" +msgstr "Alt+B" + +#: ../liveusb/dialog.py:153 +msgid "Browse" +msgstr "Duyệt qua" + +#: ../liveusb/dialog.py:160 +msgid "" +"By allocating extra space on your USB stick for a persistent overlay, you " +"will be able to store data and make permanent modifications to your live " +"operating system. Without it, you will not be able to save data that will " +"persist after a reboot." +msgstr "Bằng việc phân chia thêm khoảng trống trên USB dành cho một vùng cố định, bạn có thể lưu dữ liệu và tạo sự thay đổi vĩnh viễn đối với hệ thống vận hành hiện nay của bạn. Nếu không có nó, bạn không thể lưu dữ liệu mà có thể tồn tại sau khi khởi động lại." + +#: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 +#, python-format +msgid "Calculating the SHA1 of %s" +msgstr "Đang tính toán SHA của %s" + +#: ../liveusb/creator.py:1407 +msgid "Cannot find" +msgstr "Không thể tìm thấy" + +#: ../liveusb/creator.py:560 +#, python-format +msgid "Cannot find device %s" +msgstr "Không thể tìm thấy thiết bị %s" + +#: ../liveusb/launcher_ui.py:150 +msgid "" +"Clone\n" +"&&\n" +"Install" +msgstr "Tạo bản sao\n&&\nCài đặt" + +#: ../liveusb/launcher_ui.py:152 +msgid "" +"Clone\n" +"&&\n" +"Upgrade" +msgstr "Tạo bản sao\n&&\nNâng cấp" + +#: ../liveusb/creator.py:417 +#, python-format +msgid "Creating %sMB persistent overlay" +msgstr "Đang tạo vùng cố định %sMB" + +#: ../liveusb/gui.py:582 +msgid "" +"Device is not yet mounted, so we cannot determine the amount of free space." +msgstr "Thiết bị chưa được gắn vào, nên chúng tôi không thể xác định dung lượng còn trống" + +#: ../liveusb/dialog.py:157 +#, python-format +msgid "Download %(distribution)s" +msgstr "Tải về %(distribution)s" + +#: ../liveusb/gui.py:778 +msgid "Download complete!" +msgstr "Tải xuống hoàn tất!" + +#: ../liveusb/gui.py:782 +msgid "Download failed: " +msgstr "Tải xuống thất bại:" + +#: ../liveusb/gui.py:89 +#, python-format +msgid "Downloading %s..." +msgstr "Đang tải xuống %s" + +#: ../liveusb/creator.py:1192 +msgid "Drive is a loopback, skipping MBR reset" +msgstr "Ổ đĩa là loopback, bỏ qua việc thiết lập lại MBR" + +#: ../liveusb/creator.py:837 +#, python-format +msgid "Entering unmount_device for '%(device)s'" +msgstr "Đang nhập thiết bị_chưa gắn cho '%(device)s'" + +#: ../liveusb/creator.py:1272 +msgid "Error probing device" +msgstr "Thiết bị gặp lỗi thăm dò" + +#: ../liveusb/gui.py:213 +msgid "" +"Error: Cannot set the label or obtain the UUID of your device. Unable to " +"continue." +msgstr "Lỗi: Không thể gán nhãn hoặc lấy UUID từ thiết bị của bạn. Không thể tiếp tục." + +#: ../liveusb/creator.py:393 +msgid "" +"Error: The SHA1 of your Live CD is invalid. You can run this program with " +"the --noverify argument to bypass this verification check." +msgstr "Lỗi: SHA1 của Live CD không hợp lệ. Bạn có thể chạy chương trình với -noverify argument để bỏ qua việc kiểm tra này." + +#: ../liveusb/creator.py:155 +msgid "Extracting live image to the target device..." +msgstr "Đang trích xuất hình ảnh tới ổ đĩa đích..." + +#: ../liveusb/creator.py:1140 +#, python-format +msgid "Formatting %(device)s as FAT32" +msgstr "Đang định dạng %(device)s ở dạng FAT32" + +#: ../liveusb/creator.py:150 +msgid "ISO MD5 checksum passed" +msgstr "ISO MD5 checksum đã được chấp nhận" + +#: ../liveusb/creator.py:148 +msgid "ISO MD5 checksum verification failed" +msgstr "Việc kiểm tra ISO MD5 checksum thất bại" + +#: ../liveusb/dialog.py:156 +msgid "" +"If you do not select an existing Live ISO, the selected release will be " +"downloaded for you." +msgstr "Nếu bạn không chọn một Live ISO hiện có, phiên bản được chọn sẵn sẽ được tải xuống cho bạn" + +#: ../liveusb/dialog.py:165 +msgid "Install Tails" +msgstr "Cài đặt Tails" + +#: ../liveusb/gui.py:645 +msgid "Installation complete!" +msgstr "Cài đặt hoàn tất" + +#: ../liveusb/gui.py:265 +#, python-format +msgid "Installation complete! (%s)" +msgstr "Cài đặt hoàn tất (%s)" + +#: ../liveusb/gui.py:646 +msgid "Installation was completed. Press OK to close this program." +msgstr "Cài đặt đã hoàn tất. Bấm OK để tắt chương trình này" + +#: ../liveusb/creator.py:990 ../liveusb/creator.py:1313 +msgid "Installing bootloader..." +msgstr "Đang cài đặt chương trình khởi động..." + +#: ../liveusb/gui.py:454 +#, python-format +msgid "" +"It is impossible to upgrade the device %(pretty_name)s because it was not " +"created using Tails Installer. You should instead use %(action)s to upgrade " +"Tails on this device." +msgstr "Không thể nâng cấp thiết bị %(pretty_name)s bởi vì nó không được tạo thành bằng Tails Installer. Bạn nên dùng %(action)s để nâng cấp Tails trên thiết bị này." + +#: ../liveusb/gui.py:270 +msgid "LiveUSB creation failed!" +msgstr "Việc tạo LiveUSB thất bại!" + +#: ../liveusb/creator.py:1408 +msgid "" +"Make sure to extract the entire liveusb-creator zip file before running this" +" program." +msgstr "Cần chắc chắn là trích xuất toàn bộ file nén liveusb-creator trước khi chạy chương trình này." + +#: ../liveusb/creator.py:1284 +msgid "" +"Make sure your USB key is plugged in and formatted with the FAT filesystem" +msgstr "Cần đảm bảo USB của bạn được cắm vào và được format với định dạng FAT." + +#: ../liveusb/creator.py:859 +#, python-format +msgid "Mount %s exists after unmounting" +msgstr "Việc gắn %s thoát ra sau khi gỡ bỏ" + +#: ../liveusb/gui.py:588 +#, python-format +msgid "No free space on device %(device)s" +msgstr "Không có khoảng trống trên thiết bị %(device)s" + +#: ../liveusb/creator.py:826 +msgid "No mount points found" +msgstr "Không có ổ đĩa được tìm thấy" + +#: ../liveusb/creator.py:410 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Không đủ khoảng trống trên thiết bị\n%dMB ISO + %dMB overlay > %dMB free space" + +#: ../liveusb/gui.py:569 +msgid "Partition is FAT16; Restricting overlay size to 2G" +msgstr "Phân vùng là FAT16; Dung lượng giới hạn của vùng là 2GB" + +#: ../liveusb/gui.py:565 +msgid "Partition is FAT32; Restricting overlay size to 4G" +msgstr "Phân vùng là FAT32; Dung lượng giới hạn của vùng là 4GB" + +#: ../liveusb/creator.py:236 ../liveusb/creator.py:866 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "Đang phân vùng thiết bị %(device)s" + +#: ../liveusb/gui.py:636 +msgid "Persistent Storage" +msgstr "Dung lượng bền vững" + +#: ../liveusb/dialog.py:161 +msgid "Persistent Storage (0 MB)" +msgstr "Dung lượng bền vững (0 MB)" + +#: ../liveusb/gui.py:698 ../liveusb/gui.py:727 +msgid "Please confirm your device selection" +msgstr "Vui lòng xác nhận lựa chọn thiết bị của bạn" + +#: ../liveusb/gui.py:481 +msgid "Refreshing releases..." +msgstr "Đang làm mới phiên bản" + +#: ../liveusb/gui.py:486 +msgid "Releases updated!" +msgstr "Phiên bản đã được làm mới!" + +#: ../liveusb/creator.py:997 ../liveusb/creator.py:1331 +#, python-format +msgid "Removing %(file)s" +msgstr "Đang loại bỏ %(file)s" + +#: ../liveusb/creator.py:492 +msgid "Removing existing Live OS" +msgstr "Đang loại bỏ Live OS đang tồn tại" + +#: ../liveusb/creator.py:1186 +#, python-format +msgid "Resetting Master Boot Record of %s" +msgstr "Đang thiết lập lại Master Boot Record của %s" + +#: ../liveusb/gui.py:789 +msgid "Select Live ISO" +msgstr "Lựa chọn Live ISO" + +#: ../liveusb/creator.py:192 +msgid "Setting up OLPC boot file..." +msgstr "Đang cài đặt tập tin khởi động OLPC" + +#: ../liveusb/creator.py:742 +#, python-format +msgid "" +"Some partitions of the target device %(device)s are mounted. They will be " +"unmounted before starting the installation process." +msgstr "Một vài phân vùng của thiết bị %(device)s đã được gắn lên. Chũng sẽ bị gỡ ra trước khi bắt đầu quá trình cài đặt." + +#: ../liveusb/creator.py:141 +msgid "" +"Source type does not support verification of ISO MD5 checksum, skipping" +msgstr "Loại hình của nguồn không hỗ trợ việc xác minh của ISO MD5 checksum, đang bỏ qua" + +#: ../liveusb/creator.py:1220 +msgid "Synchronizing data on disk..." +msgstr "Đang đồng bộ hóa dữ liệu trên ổ đĩa..." + +#: ../liveusb/dialog.py:159 +msgid "Target Device" +msgstr "Thiết bị đích" + +#: ../liveusb/gui.py:438 +#, python-format +msgid "" +"The device \"%(pretty_name)s\" is too small to install Tails (at least " +"%(size)s GB is required)." +msgstr "Thiết bị \"%(pretty_name)s\" quá nhỏ để cài đặt Tails (yêu cầu ít nhất %(size)s GB)." + +#: ../liveusb/gui.py:792 +msgid "" +"The selected file is unreadable. Please fix its permissions or select " +"another file." +msgstr "Những tập tin được chọn không thể đọc được. Vui lòng sửa quyền của nó hoặc chọn một tập tin khác." + +#: ../liveusb/creator.py:354 +#, python-format +msgid "" +"There was a problem executing the following command: `%(command)s`.\n" +"A more detailed error log has been written to '%(filename)s'." +msgstr "Có vấn đề xảy ra khi thực thi lệnh dưới đây: `%(command)s`.\nMột nhật ký chi tiết hơn của lỗi đã được ghi vào '%(filename)s'." + +#: ../liveusb/dialog.py:151 +msgid "" +"This button allows you to browse for an existing Live system ISO that you " +"have previously downloaded. If you do not select one, a release will be " +"downloaded for you automatically." +msgstr "Nút này cho phép bạn duyệt một Live system ISO mà bạn đã tải về trước đó. Nếu bạn không lựa chọn một cái, một phiên bản sẽ được tự động tải về cho bạn." + +#: ../liveusb/dialog.py:164 +msgid "" +"This button will begin the LiveUSB creation process. This entails " +"optionally downloading a release (if an existing one wasn't selected), " +"extracting the ISO to the USB device, creating the persistent overlay, and " +"installing the bootloader." +msgstr "Nút này sẽ bắt đầu quá trình tạo LiveUSB. Việc này đòi hỏi việc tải về một cách tùy chọn một phiên bản (nếu một phiên bản đang có chưa được chọn), trích xuất ISO sang thiết bị USB, tạo một vùng bền vững, và cài đặt bootloader." + +#: ../liveusb/dialog.py:158 +msgid "" +"This is the USB stick that you want to install your Live system on. This " +"device must be formatted with the FAT filesystem." +msgstr "Đây là thanh USB mà bạn muốn cài lên hệ thống Live. Thiết bị này phải được định dạng file hệ thống FAT." + +#: ../liveusb/dialog.py:163 +msgid "" +"This is the progress bar that will indicate how far along in the LiveUSB " +"creation process you are" +msgstr "Đây là thanh tiến độ sẽ chỉ ra quá trình tạo LiveUSB đã được bao lâu rồi." + +#: ../liveusb/dialog.py:162 +msgid "This is the status console, where all messages get written to." +msgstr "Đây là tình trạng của bàn điều khiển, nơi mọi thông điệp được viết vào." + +#: ../liveusb/creator.py:952 +msgid "Trying to continue anyway." +msgstr "Cứ tiếp tục." + +#: ../liveusb/gui.py:464 +msgid "USB drive found" +msgstr "Ổ đĩa USB được tìm thấy" + +#: ../liveusb/creator.py:985 +#, python-format +msgid "Unable to change volume label: %(message)s" +msgstr "Không thể đổi tên ổ đĩa: %(message)s" + +#: ../liveusb/creator.py:501 ../liveusb/creator.py:512 +#, python-format +msgid "Unable to chmod %(file)s: %(message)s" +msgstr "Không thể chmod %(file)s: %(message)s" + +#: ../liveusb/creator.py:478 +#, python-format +msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" +msgstr "Không thể chép %(infile)s tới %(outfile)s: %(message)s" + +#: ../liveusb/gui.py:403 +msgid "Unable to find any USB drive" +msgstr "Không thể tìm thấy bất kỳ ổ USB nào" + +#: ../liveusb/creator.py:1274 +msgid "Unable to find any supported device" +msgstr "Không thể tìm thấy bất kỳ thiết bị được hỗ trợ nào" + +#: ../liveusb/creator.py:1117 +msgid "Unable to find partition" +msgstr "Không thể tìm thấy phân vùng" + +#: ../liveusb/creator.py:1354 +msgid "" +"Unable to get Win32_LogicalDisk; win32com query did not return any results" +msgstr "Không thể lấy Win32_LogicalDisk; truy vấn win32com không trả bất kỳ kết quả nào" + +#: ../liveusb/gui.py:691 +msgid "Unable to mount device" +msgstr "Không thể gắn thiết bị" + +#: ../liveusb/creator.py:814 +#, python-format +msgid "Unable to mount device: %(message)s" +msgstr "Không thể gắn thiết bị: %(message)s" + +#: ../liveusb/creator.py:517 +#, python-format +msgid "Unable to remove directory from previous LiveOS: %(message)s" +msgstr "Không thể gỡ bỏ thư mục từ LiveOS trước: %(message)s" + +#: ../liveusb/creator.py:505 +#, python-format +msgid "Unable to remove file from previous LiveOS: %(message)s" +msgstr "Không thể gỡ bỏ tập tin từ LiveOS trước: %(message)s" + +#: ../liveusb/creator.py:1189 +msgid "" +"Unable to reset MBR. You may not have the `syslinux` package installed." +msgstr "Không thể thiết lập lại MBR. Bạn có thể không có gói `syslinux` đã cài." + +#: ../liveusb/gui.py:798 +msgid "" +"Unable to use the selected file. You may have better luck if you move your " +"ISO to the root of your drive (ie: C:\\)" +msgstr "Không thể sử dụng tập tin được chọn. Bạn có thể may mắn hơn nếu bạn di duyển ISO của bạn tới nền của thiết bị của bạn (ví dụ: C:\\)" + +#: ../liveusb/creator.py:723 +#, python-format +msgid "Unable to write on %(device)s, skipping." +msgstr "Không thể viết lên %(device)s, đang bỏ qua." + +#: ../liveusb/creator.py:399 +msgid "Unknown ISO, skipping checksum verification" +msgstr "ISO không xác định, bỏ qua việc kiểm tra checksum" + +#: ../liveusb/creator.py:810 +#, python-format +msgid "Unknown dbus exception while trying to mount device: %(message)s" +msgstr "Có sự loại dbus không xác định trong khi đang gắn thiết bị: %(message)s" + +#: ../liveusb/creator.py:791 ../liveusb/creator.py:964 +msgid "Unknown filesystem. Your device may need to be reformatted." +msgstr "Định dạng không xác định. Thiết bị của bạn có thể cần được định dạng lại." + +#: ../liveusb/gui.py:85 +#, python-format +msgid "Unknown release: %s" +msgstr "Phiên bản không xác định: %s" + +#: ../liveusb/creator.py:851 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "Đang gỡ '%(udi)s' trên '%(device)s'" + +#: ../liveusb/creator.py:847 +#, python-format +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "Đang gỡ tập tin hệ thống đã được gắn trên '%(device)s'" + +#: ../liveusb/creator.py:949 +#, python-format +msgid "Unsupported device '%(device)s', please report a bug." +msgstr "Thiết bị không được hỗ trợ '%(device)s', vui lòng báo lỗi." + +#: ../liveusb/creator.py:794 ../liveusb/creator.py:967 +#, python-format +msgid "Unsupported filesystem: %s" +msgstr "Tập tin hệ thống không được hỗ trợ: %s" + +#: ../liveusb/creator.py:1287 +#, python-format +msgid "" +"Unsupported filesystem: %s\n" +"Please backup and format your USB key with the FAT filesystem." +msgstr "Tập tin hệ thống không được hỗ trợ: %s\nVui lòng sao lưu và định dạng lại USB của bạn với file hệ thống định dạng FAT." + +#: ../liveusb/creator.py:892 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "Đang cập nhật thuộc tính của phân vùng hệ thống %(system_partition)s" + +#: ../liveusb/launcher_ui.py:154 +msgid "Upgrade from ISO" +msgstr "Nâng cấp từ ISO" + +#: ../liveusb/dialog.py:152 +msgid "Use existing Live system ISO" +msgstr "Sử dụng Live system ISO đang tồn tại" + +#: ../liveusb/creator.py:143 +msgid "Verifying ISO MD5 checksum" +msgstr "Đang xác minh ISO MD5 checksum" + +#: ../liveusb/creator.py:373 +msgid "Verifying SHA1 checksum of LiveCD image..." +msgstr "Đang xác minh SHA1 checksum của hình ảnh LiveCD..." + +#: ../liveusb/creator.py:377 +msgid "Verifying SHA256 checksum of LiveCD image..." +msgstr "Đang xác minh SHA256 checksum của hình ảnh LiveCD" + +#: ../liveusb/creator.py:961 ../liveusb/creator.py:1280 +msgid "Verifying filesystem..." +msgstr "Đang xác minh tập tin hệ thống..." + +#: ../liveusb/gui.py:725 +msgid "" +"Warning: Creating a new persistent overlay will delete your existing one." +msgstr "Cảnh báo: Việc tạo phân vùng bền vững sẽ xóa phân vùng đang tồn tại của bạn." + +#: ../liveusb/gui.py:377 +msgid "" +"Warning: This tool needs to be run as an Administrator. To do this, right " +"click on the icon and open the Properties. Under the Compatibility tab, " +"check the \"Run this program as an administrator\" box." +msgstr "Cảnh báo: Công cụ này cần phải chạy với quyền quản trị. Để làm được điều này, bấm chuột phải vào biểu tượng và mở Thuộc tính. Ở thẻ Tương thích, chọn hộp \"Chạy chương trình với quyền quản trị\"." + +#: ../liveusb/creator.py:162 +#, python-format +msgid "Wrote to device at %(speed)d MB/sec" +msgstr "Đã được viết vào thiết bị ở %(speed)d MB/giây" + +#: ../liveusb/gui.py:699 +#, python-format +msgid "" +"You are going to install Tails on the %(size)s %(vendor)s %(model)s device " +"(%(device)s). All data on the selected device will be lost. Continue?" +msgstr "Bạn đang cài đặt Tails trên %(size)s %(vendor)s %(model)s thiết bị\n(%(device)s). Tất cả dữ liệu trên thiết bị sẽ bị xóa. Bạn muốn tiếp tục?" + +#: ../liveusb/gui.py:715 +#, python-format +msgid "" +"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " +"device (%(device)s). Any persistent volume on this device will remain " +"unchanged. Continue?" +msgstr "Bạn đang nâng cấp Tails trên %(parent_size)s %(vendor)s %(model)s thiết bị\n(%(device)s). Tất cả các ổ lưu trữ thường trực\nsẽ được giữ nguyên. Bạn muốn tiếp tục?" + +#: ../liveusb/creator.py:622 +msgid "" +"You are using an old version of syslinux-extlinux that does not support the " +"ext4 filesystem" +msgstr "Bạn đang sử dụng phiên bản cũ của syslinux-extlinux, không hỗ trợ định dạng ext4" + +#: ../liveusb/gui.py:783 +msgid "You can try again to resume your download" +msgstr "Bạn có thể thử lại để tiếp tục việc tải xuống" + +#: ../liveusb/creator.py:95 +msgid "You must run this application as root" +msgstr "Bạn phải chạy ứng dụng này với quyền root" + +#: ../liveusb/dialog.py:155 +msgid "or" +msgstr "Hoặc"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 07 Oct '15

07 Oct '15

commit 5449c47b598a184a3cebe2f39b4856e3c1b4d4de Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:45:18 2015 +0000 Update translations for liveusb-creator --- vi/vi.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index 4119836..11a6395 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -5,13 +5,14 @@ # Translators: # Hoang Thu Giang <hoanggiang0811(a)yahoo.com>, 2014 # Khanh Nguyen <nguyenduykhanh85(a)gmail.com>, 2015 +# Tho Nguyen <tho.nguyen(a)savoirfairelinux.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-10 16:01+0200\n" -"PO-Revision-Date: 2015-08-22 08:10+0000\n" -"Last-Translator: Khanh Nguyen <nguyenduykhanh85(a)gmail.com>\n" +"PO-Revision-Date: 2015-10-07 18:42+0000\n" +"Last-Translator: Tho Nguyen <tho.nguyen(a)savoirfairelinux.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -570,7 +571,7 @@ msgstr "Đã được viết vào thiết bị ở %(speed)d MB/giây" msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Bạn đang cài đặt Tails trên %(size)s %(vendor)s %(model)s thiết bị\n(%(device)s). Tất cả dữ liệu trên thiết bị sẽ bị xóa. Bạn muốn tiếp tục?" #: ../liveusb/gui.py:715 #, python-format

1 0

[tor/master] Fix 32-bit case of rend_cache/entry_allocation
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit aeb9373158df00d77d26245c7524db3d5f1e515c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 14:31:21 2015 -0400 Fix 32-bit case of rend_cache/entry_allocation --- src/test/test_rendcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 6075d39..01eeecb 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1138,7 +1138,7 @@ test_rend_cache_entry_allocation(void *data) // Handles a non-null argument e = tor_malloc_zero(sizeof(rend_cache_entry_t)); ret = rend_cache_entry_allocation(e); - tt_int_op(ret, OP_EQ, 88); + tt_int_op(ret, OP_GT, sizeof(rend_cache_entry_t)); done: (void)0;

1 0

[tor/master] Fix implicit overflow in rendcache tests
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit b23a0465f107dee0a78b544536396f09fa89ab27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 14:29:14 2015 -0400 Fix implicit overflow in rendcache tests --- src/test/test_rendcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index f21c7c4..6075d39 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -659,11 +659,11 @@ test_rend_cache_increment_allocation(void *data) // Test when there are too many allocations rend_cache_total_allocation = SIZE_MAX-1; rend_cache_increment_allocation(2); - tt_int_op(rend_cache_total_allocation, OP_EQ, SIZE_MAX); + tt_u64_op(rend_cache_total_allocation, OP_EQ, SIZE_MAX); // And again rend_cache_increment_allocation(2); - tt_int_op(rend_cache_total_allocation, OP_EQ, SIZE_MAX); + tt_u64_op(rend_cache_total_allocation, OP_EQ, SIZE_MAX); done: (void)0;

1 0

[doctor/master] Start of a check for IPv6 ORPort reachability
by atagar＠torproject.org 07 Oct '15

07 Oct '15

commit a50f3e0ad51b82f9523963bce19aab883f310a96 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 7 09:57:43 2015 -0700 Start of a check for IPv6 ORPort reachability Jake and other authority operators have asked for a DocTor check that their IPv6 endpoint (if configured) is reachable. Honestly I'm green to ipv6 so unsure how to do this. Suspect it's gonna require a config change on cappadocicum so checking with weasel... --- consensus_health_checker.py | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 82c21c7..d762f74 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -9,6 +9,7 @@ Performs a variety of checks against the present votes and consensus. import collections import datetime import os +import socket import time import traceback @@ -275,7 +276,7 @@ def main(): log.debug('Sending notification for issues (%s)' % ', '.join(destination_labels)) if TEST_RUN: - print '\n'.join(map(str, issues)) + print('\n'.join(map(str, issues))) else: body = '\n'.join(map(str, issues)) cc = [d.address for d in destinations.values() if d and not d.bcc] @@ -700,6 +701,41 @@ def bandwidth_authorities_in_sync(latest_consensus, consensuses, votes): return Issue(Runlevel.NOTICE, 'BANDWIDTH_AUTHORITIES_OUT_OF_SYNC', authorities = ', '.join(entries), to = measurement_counts.keys()) +def is_ipv6_orport_reachable(latest_consensus, consensuses, votes): + """ + Simple check to see if we can reach the authority's IPv6 ORPort when it has + one. + """ + + issues = [] + + for authority in DIRECTORY_AUTHORITIES.values(): + desc = latest_consensus.routers.get(authority.fingerprint) + + if not desc: + continue # authority isn't in the consensus + + for address, port, is_ipv6 in desc.or_addresses: + if is_ipv6: + # TODO: Ok, now for the bit I'm unfamiliar with. How do we ping + # this endpoint? On cappadocicum seems we're missing something... + # + # % ping6 2001:858:2:2:aabb:0:563b:1526 + # connect: Network is unreachable + # + # Do we need a tunnel? 6to4 configuration? + # + # https://wiki.debian.org/DebianIPv6#IPv6_6to4_Configuration + # + # Green to this space so lets ask... + + orport_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) + orport_socket.connect((address, port)) + # ??? + + return issues + + def get_consensuses(): """ Provides a mapping of directory authority nicknames to their present consensus. @@ -773,6 +809,6 @@ if __name__ == '__main__': log.error(msg) if TEST_RUN: - print "Error: %s" % msg + print("Error: %s" % msg) else: util.send("Script Error", body = msg, to = [util.ERROR_ADDRESS])

1 0

[doctor/master] Provide a '[DocTor]' prefix for all emails
by atagar＠torproject.org 07 Oct '15

07 Oct '15

commit ecaea9ab16bd371e9b2a66794eef01fd287bd2de Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 7 08:01:42 2015 -0700 Provide a '[DocTor]' prefix for all emails Request from dgoulet to make the emails easier to filter. --- util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util.py b/util.py index 9440d4c..7d5878f 100644 --- a/util.py +++ b/util.py @@ -89,7 +89,7 @@ def send(subject, body, to = TO_ADDRESSES, cc = None, bcc = None): """ msg = MIMEMultipart('alternative') - msg['Subject'] = subject + msg['Subject'] = '[DocTor] ' + subject msg['From'] = FROM_ADDRESS msg['To'] = ','.join(to)

1 0