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

[tor/master] Compilation was off by one character
by nickm＠torproject.org 22 Oct '15

22 Oct '15

commit 8acaac4622c67ce88938a8eacf99feb9f593291b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 22 18:47:26 2015 -0400 Compilation was off by one character --- src/test/test_util_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util_process.c b/src/test/test_util_process.c index 876a625..cb1d5b2 100644 --- a/src/test/test_util_process.c +++ b/src/test/test_util_process.c @@ -70,7 +70,7 @@ test_util_process_clear_waitpid_callback(void *ignored) } #endif /* _WIN32 */ -#ifdef _WIN32 +#ifndef _WIN32 #define TEST(name) { #name, test_util_process_##name, 0, NULL, NULL } #else #define TEST(name) { #name, NULL, TT_SKIP, NULL, NULL }

1 0

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

22 Oct '15

commit 1476d1d4a439fec329b17ceab20ab2438a1e9bfe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 21:45:04 2015 +0000 Update translations for bridgedb --- nn/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index 1566a81..70184bd 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ 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: 2015-10-22 18:33+0000\n" +"PO-Revision-Date: 2015-10-22 21:34+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -177,7 +177,7 @@ msgstr "Du har gått over fartsavgrensinga. Ver snill og ta det med ro! Minste t #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "KOMMANDOar: (kombiner KOMMANDOar for å spesifisera fleire val samstundes)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53

1 0

[tor-messenger-build/master] var/build_id_txt: use the input_files_id option
by boklm＠torproject.org 22 Oct '15

22 Oct '15

commit f421ea73464aa32042d283d441b2ed9203a27c0d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 22 22:34:30 2015 +0200 var/build_id_txt: use the input_files_id option --- rbm | 2 +- rbm.conf | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/rbm b/rbm index ac1c9fa..178d871 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit ac1c9fad8540fb76dbd206292b66bf95c07475b7 +Subproject commit 178d8713004e36a4fd74c45914c243432f8afc64 diff --git a/rbm.conf b/rbm.conf index a4d202a..4c93634 100644 --- a/rbm.conf +++ b/rbm.conf @@ -14,19 +14,7 @@ var: [% IF c("remote_docker") -%] [% c("distribution") %] [% END -%] - input_files: - [% - files = []; - FOREACH file IN c("input_files_by_name").keys.sort; - CALL files.push(c("input_files_by_name/" _ file)); - END; - SET projdir = c('projects_dir'); - FOREACH file IN files.sort; - GET file _ "\n"; - SET path = projdir _ '/' _ project _ '/' _ file; - GET sha256file(path) _ "\n"; - END; - %] + input_files: [% c("input_files_id") %] build: [% c("build", { filename => 'f', output_dir => '/out' }) %] input_files_list: |

1 0

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

22 Oct '15

commit 6f28f8bd21bb5777015ea6872bb660c122c504ed Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 18:45:04 2015 +0000 Update translations for bridgedb --- nn/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index 8ec07de..1566a81 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ 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: 2015-10-22 18:07+0000\n" +"PO-Revision-Date: 2015-10-22 18:33+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -90,7 +90,7 @@ msgstr "Ingen bruer er for tida tilgjengelege " msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Kanskje du skulle freista å %s gå tilbake %s og velja ei anna brutype!" #: bridgedb/https/templates/index.html:11 #, python-format @@ -120,7 +120,7 @@ msgstr "Steg %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "No kan du %s leggja til bruene i Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -172,7 +172,7 @@ msgstr "Her er bruene dine:" 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 "Du har gått over fartsavgrensinga. Ver snill og ta det med ro! Minste tillaten tid mellom e-postar er %s timar. E-postar utover dette vert ignorerte." #: bridgedb/strings.py:50 msgid ""

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 22 Oct '15

22 Oct '15

commit 0842670bedbaee9400d042cf52c1b661e10545aa Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 18:15:24 2015 +0000 Update translations for https_everywhere_completed --- nn/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index 4ea6c3b..b41c310 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -17,6 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "Slå av HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "Blokker alle HTTP-førespurnadar"> <!ENTITY https-everywhere.menu.showCounter "Vis teljar"> +<!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillingar"> <!ENTITY https-everywhere.prefs.enable_all "Slå på alle">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 22 Oct '15

22 Oct '15

commit 8b718488598b41e8dc60d1b91ecee94f70b554d8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 18:15:19 2015 +0000 Update translations for https_everywhere --- nn/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index 14f2eae..b41c310 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -17,7 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "Slå av HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "Blokker alle HTTP-førespurnadar"> <!ENTITY https-everywhere.menu.showCounter "Vis teljar"> -<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> +<!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillingar"> <!ENTITY https-everywhere.prefs.enable_all "Slå på alle">

1 0

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

22 Oct '15

commit 8f022fc85a5eab4796530b8a425350bb3ad9ad49 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 18:15:03 2015 +0000 Update translations for bridgedb --- nn/LC_MESSAGES/bridgedb.po | 339 ++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 169 deletions(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index 4616a2f..8ec07de 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -3,18 +3,19 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014-2015 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: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\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-22 18:07+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\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: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,57 +30,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 "Orsak! Noko gjekk gale med førespurnaden din." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Rapporter feil" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Kjeldekode" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Endringslogg" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Kontakt" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Vel alle" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Vis QR-kode" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QR-for brulinjene dine" + +#. 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 "Ojsann!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Det oppstod ein feil under henting av QR-koden din." + +#: 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 "Denne QR-koden inneheld brulinjene dine. Skann han med ein QR-lesar for å kopiera brulinjene dine over på mobilen og andre einingar." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "Ingen bruer er for tida tilgjengelege " + +#: 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 "Steg %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Last ned %s Tor-nettlesaren %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Steg %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Hent %s bruer %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Steg %s3%s" + +#: 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 "%sB%serre gje meg nokre bruer!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Avanserte innstillingar" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Nei" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "ingen" + +#. 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 "%sJ%sa!" + +#. 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 "%sK%snyt til bruer" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Dette er ei automatisk melding; gjer vel og ikkje svar.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Her er bruene dine:" -#: 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 "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Velkomen til 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 "Gjeldande støtta transport-TYPEs:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Hei, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Hallo, ven!" -#: 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 "Offentlege nøklar" #. 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" @@ -90,7 +216,7 @@ msgstr "" #. 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" @@ -101,7 +227,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" @@ -113,7 +239,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" @@ -122,20 +248,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Kva er bruer?" -#: 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 "Eg treng ein alternativ måte å få bruer på!" -#: 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" @@ -143,12 +269,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 "Brua mi verkar ikkje! Eg treng hjelp!" #. 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 "Om Tor ikkje fungerer, skriv ein e-post til %s." @@ -156,48 +282,48 @@ msgstr "Om Tor ikkje fungerer, skriv ein e-post til %s." #. 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 "Her er bru-linene dine:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Få bruer!" -#: 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 "Treng du IPv6-adresser?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Treng du %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Nettlesaren din viser ikkje bilete skikeleg." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Skriv inn teikn frå biletet nedanfor " -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Korleis starta å bruka bruer" #. 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" @@ -206,21 +332,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" @@ -228,153 +354,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 "Viser denne meldinga." #. 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 "Be om bruer med fabrikkoppsett." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Be om IPv6-bruer." #. 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 "Rapporter feil" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Kjeldekode" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Endringslogg" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Kontakt" - -#: 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 "Ingen bruer er for tida tilgjengelege " - -#: 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 "Steg %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Last ned %s Tor-nettlesaren %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Steg %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Hent %s bruer %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Steg %s3%s" - -#: 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 "%sB%serre gje meg nokre bruer!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Avanserte innstillingar" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Nei" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "ingen" - -#. 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 "%sJ%sa!" - -#. 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 "%sK%snyt til bruer"

1 0

[torspec/master] Update dir-spec.txt with HSDir flag requirements
by dgoulet＠torproject.org 22 Oct '15

22 Oct '15

commit 35c87554c30bbaaf9641b56bdf4e61a1e636a70b Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Oct 22 11:14:36 2015 -0400 Update dir-spec.txt with HSDir flag requirements Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- dir-spec.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 9af8933..1030c72 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2119,9 +2119,9 @@ protocol that supports the functionality clients need. (Currently, this is 0.1.1.9-alpha or later.) - "HSDir" -- A router is a v2 hidden service directory if it stores - and serves v2 hidden service descriptors, and the authority - believes that it's been up for at least 96 hours (or the current + "HSDir" -- A router is a v2 hidden service directory if it stores and + serves v2 hidden service descriptors, has the Stable and Fast flag, and the + authority believes that it's been up for at least 96 hours (or the current value of MinUptimeHidServDirectoryV2). Directory server administrators may label some relays or IPs as

1 0

[tor/master] Actually add HowToReview.txt
by nickm＠torproject.org 22 Oct '15

22 Oct '15

commit 2929986049780bd28fb39ae8d0a67e703e5193ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 22 10:03:04 2015 -0400 Actually add HowToReview.txt --- doc/HACKING/HowToReview.txt | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/doc/HACKING/HowToReview.txt b/doc/HACKING/HowToReview.txt new file mode 100644 index 0000000..1380411 --- /dev/null +++ b/doc/HACKING/HowToReview.txt @@ -0,0 +1,85 @@ +How to review a patch +===================== + +Some folks have said that they'd like to review patches more often, but they +don't know how. + +So, here are a bunch of things to check for when reviewing a patch! + +Note that if you can't do every one of these, that doesn't mean you can't do +a good review! Just make it clear what you checked for and what you didn't. + + +Top-level smell-checks +---------------------- + +(Difficulty: easy) + +Does it compile with --enable-gcc-warnings? + +Does 'make check-spaces' pass? + +Does it have a reasonable amount of tests? Do they pass? Do they leak +memory? + +Do all the new functions, global variables, types, and structure members have +documentation? + +Do all the the functions, global variables, types, and structure members with +modified behavior have modified documentation? + +Do all the new torrc options have documentation? + +If this changes Tor's behavior on the wire, is there a design proposal? + + + +Let's look at the code! +----------------------- + +Does the code conform to CodingStandards.txt? + +Does the code leak memory? + +If two or more pointers ever point to the same object, is it clear which +pointer "owns" the object? + +Are all allocated resources freed? + +Are all pointers that should be const, const? + +Are #defines used for 'magic' numbers? + +Can you understand what the code is trying to do? + +Can you convince yourself that the code really does that? + +Is there duplicated code that could be turned into a function? + + +Let's look at the documentation! +-------------------------------- + +Does the documentation confirm to CodingStandards.txt? + +Does it make sense? + +Can you predict what the function will do from its documentation? + + +Let's think about security! +--------------------------- + +If there are any arrays, buffers, are you 100% sure that they cannot +overflow? + +If there is any integer math, can it overflow or underflow? + +If there are any allocations, are you sure there are corresponding +deallocations? + +Is there a safer pattern that could be used in any case? + +Have they used one of the Forbidden Functions? + +(Also see your favorite secure C programming guides.)

1 0

[tor/master] Start writing a how to review doc
by nickm＠torproject.org 22 Oct '15

22 Oct '15

commit 609c1e88701dd483343af3e5a1276916ffcb68d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 22 10:01:13 2015 -0400 Start writing a how to review doc --- doc/HACKING/CodingStandards.txt | 3 +++ doc/include.am | 1 + 2 files changed, 4 insertions(+) diff --git a/doc/HACKING/CodingStandards.txt b/doc/HACKING/CodingStandards.txt index 2d03b8e..f135fd1 100644 --- a/doc/HACKING/CodingStandards.txt +++ b/doc/HACKING/CodingStandards.txt @@ -141,6 +141,9 @@ sure that we worked on MSVC6. We don't use strcat or strcpy or sprintf of any of those notoriously broken old C functions. Use strlcat, strlcpy, or tor_snprintf/tor_asprintf instead. +We don't call memcmp() directly. Use fast_memeq(), fast_memneq(), +tor_memeq(), or tor_memneq() for most purposes. + Functions not to write ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/include.am b/doc/include.am index 9b9e20b..b235211 100644 --- a/doc/include.am +++ b/doc/include.am @@ -43,6 +43,7 @@ EXTRA_DIST+= doc/asciidoc-helper.sh \ doc/HACKING/CodingStandards.txt \ doc/HACKING/GettingStarted.txt \ doc/HACKING/HelpfulTools.txt \ + doc/HACKING/HowToReview.txt \ doc/HACKING/ReleasingTor.txt \ doc/HACKING/WritingTests.txt

1 0