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

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 6c0fa21dbaaa8b298f524e47aaa6aac6a207dd38 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 20:45:47 2016 +0000 Update translations for tor-launcher-network-settings --- nl/network-settings.dtd | 2 +- nn/network-settings.dtd | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd index af1ea16..488f358 100644 --- a/nl/network-settings.dtd +++ b/nl/network-settings.dtd @@ -38,7 +38,7 @@ <!ENTITY torsettings.reconfigTor "Herconfigureer"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Instellingen Verwijderen en Verbinden"> <!ENTITY torsettings.optional "Facultatief"> diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd index c2b7372..9023565 100644 --- a/nn/network-settings.dtd +++ b/nn/network-settings.dtd @@ -12,30 +12,30 @@ <!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Kva trur du passar best?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve"> +<!ENTITY torSettings.configurePrompt1 "Internett-sambandet til denne maskina er anten sensurert eller går gjennom ein proxy-tenar."> +<!ENTITY torSettings.configurePrompt2 "Eg må konfigurera bru- eller lokale proxyinnstillingar før eg koplar til Tor-nettverket."> +<!ENTITY torSettings.configure "Konfigurer"> +<!ENTITY torSettings.connectPrompt2 "Eg vil kopla til Tor-nettverket direkte."> +<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve."> <!ENTITY torSettings.connect "Kopla til"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "Konfigurasjon av lokal proxy"> +<!ENTITY torSettings.proxyQuestion "For å kopla til internett, treng denne maskina å nytta ein lokal proxy?">  <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> <!ENTITY torSettings.enterProxy "Skriv inn mellomtenarinnstillingane."> <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Sensurerer eller blokkerer internettleverandøren din (ISP) på noko vis tilgang til Tor-nettverket?"> +<!ENTITY torSettings.bridgeExplanation1 "Viss du ikkje er viss på dette, så vel Nei (viss du ikkje klarer å kopla til Tor-nettverket utan ei bru, kan du sete opp dette seinare)."> +<!ENTITY torSettings.bridgeExplanation2 "Viss du vel Ja, vert du spurt om du vil konfigurere bruer med Tor. Bruer er ulista relear som gjer det vanskelegare å blokkere samband til Tor-nettverket."> +<!ENTITY torSettings.bridgeSettingsPrompt "Du kan nytta bruene som følgjer med eller skaffa og skriva inn dine eigne.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.startingTor "Ventar på at Tor startar..."> <!ENTITY torsettings.restartTor "Start Tor på nytt"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Konfigurer på nytt."> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> <!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> @@ -67,7 +67,7 @@ <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "Nytt ein nettlesar for å vitja https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 01dbda47ee5e586486b0c5a7b50832638da98d60 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 20:15:44 2016 +0000 Update translations for tor-launcher-network-settings --- nn/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd index 4bd82f0..c2b7372 100644 --- a/nn/network-settings.dtd +++ b/nn/network-settings.dtd @@ -2,16 +2,16 @@  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.prompt "Vel eit språk.">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Før du koplar til Tor-nettverket må du oppgje korleis maskina di koplar til internett."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nei"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Kva trur du passar best?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Configure">

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit d5798de3b0f79351483715d503d3857d9d49e72a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 20:15:35 2016 +0000 Update translations for mat-gui_completed --- nn.po | 101 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 48 deletions(-) diff --git a/nn.po b/nn.po index 47ad1f3..7baae1c 100644 --- a/nn.po +++ b/nn.po @@ -4,181 +4,186 @@ # # Translators: # Bjørn I. <bjorn.svindseth(a)online.no>, 2014 +# Øystein Alværvik <oystein.alver(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-02-23 08:18+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" +"POT-Creation-Date: 2016-01-03 20:54+0100\n" +"PO-Revision-Date: 2016-01-26 19:46+0000\n" +"Last-Translator: Øystein Alværvik <oystein.alver(a)gmail.com>\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" "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:62 mat-gui:407 mat-gui:430 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "Klar" -#: mat-gui:129 +#: mat-gui:136 msgid "Choose files" msgstr "Vel filer" -#: mat-gui:137 -msgid "All files" -msgstr "Alle filer" - -#: mat-gui:143 +#: mat-gui:144 msgid "Supported files" msgstr "Støtta filer" -#: mat-gui:160 mat-gui:353 mat-gui:402 mat-gui:426 mat-gui:428 -#: data/mat.glade:172 +#: mat-gui:151 +msgid "All files" +msgstr "Alle filer" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "Rein" -#: mat-gui:161 +#: mat-gui:168 msgid "No metadata found" msgstr "Ingen metadata funne" -#: mat-gui:163 mat-gui:404 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "Ikkje rein" -#: mat-gui:168 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr "%s metadata" -#: mat-gui:179 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "Kast meta, behald dine data" -#: mat-gui:184 +#: mat-gui:192 msgid "Website" msgstr "Vevside" -#: mat-gui:210 +#: mat-gui:219 msgid "Preferences" msgstr "Innstillingar" -#: mat-gui:223 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "Reduser PDF-kvalitet" -#: mat-gui:226 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "Reduser storleik til produsert PDF og kvalitet" -#: mat-gui:229 +#: mat-gui:238 msgid "Add unsupported file to archives" msgstr "Legg til ustøtta filer i arkiva" -#: mat-gui:232 +#: mat-gui:241 msgid "Add non-supported (and so non-anonymised) file to output archive" msgstr "Legg til ikkje-støtta (og med det ikkje-anonymiserte) filer i utdata-arkivet" -#: mat-gui:271 +#: mat-gui:280 msgid "Unknown" msgstr "Ukjend" -#: mat-gui:314 +#: mat-gui:325 msgid "Not-supported" msgstr "Ikkje-støtta" -#: mat-gui:328 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "Harmlaust filformat" -#: mat-gui:330 +#: mat-gui:341 +msgid "Cant read file" +msgstr "Kan ikkje lese fila." + +#: mat-gui:343 msgid "Fileformat not supported" msgstr "Filformat ikkje støtta" -#: mat-gui:333 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "Desse filene kan ikkje handsamast:" -#: mat-gui:338 mat-gui:367 data/mat.glade:211 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "Filnamn" -#: mat-gui:340 +#: mat-gui:353 msgid "Reason" msgstr "Årsak" -#: mat-gui:352 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "Ikkje-støtta filer i arkivet" -#: mat-gui:366 +#: mat-gui:379 msgid "Include" msgstr "Inkluder" -#: mat-gui:382 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "MAT kan ikkje rydde opp i følgjande filer funne i %s-arkivet" -#: mat-gui:398 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "Kontrollerer %s" -#: mat-gui:413 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "Ryddar opp %s" -#: data/mat.glade:33 +#: data/mat.glade:46 msgid "_File" msgstr "_Arkiv" -#: data/mat.glade:82 +#: data/mat.glade:95 msgid "_Edit" msgstr "_Rediger" -#: data/mat.glade:115 +#: data/mat.glade:141 msgid "_Help" msgstr "_Hjelp" -#: data/mat.glade:159 +#: data/mat.glade:187 msgid "Add" msgstr "Legg til" -#: data/mat.glade:228 +#: data/mat.glade:256 msgid "State" msgstr "Tilstand" -#: data/mat.glade:274 data/mat.glade:417 +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "Metadata" -#: data/mat.glade:306 +#: data/mat.glade:354 msgid "Name" msgstr "Namn" -#: data/mat.glade:320 +#: data/mat.glade:368 msgid "Content" msgstr "Innhald" -#: data/mat.glade:374 +#: data/mat.glade:398 msgid "Supported formats" msgstr "Støtta format" -#: data/mat.glade:406 +#: data/mat.glade:456 msgid "Support" msgstr "Støtte" -#: data/mat.glade:428 +#: data/mat.glade:478 msgid "Method" msgstr "Metode" -#: data/mat.glade:439 +#: data/mat.glade:489 msgid "Remaining" msgstr "Står att" -#: data/mat.glade:468 +#: data/mat.glade:518 msgid "Fileformat" msgstr "Filformat"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 685f2f0aeb5245c3264b2301f6c47d10cf2fa9a5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 20:15:30 2016 +0000 Update translations for mat-gui --- nn.po | 129 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/nn.po b/nn.po index 5cc485a..7baae1c 100644 --- a/nn.po +++ b/nn.po @@ -4,13 +4,14 @@ # # Translators: # Bjørn I. <bjorn.svindseth(a)online.no>, 2014 +# Øystein Alværvik <oystein.alver(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 15:03+0100\n" -"PO-Revision-Date: 2015-12-17 09:29+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-01-03 20:54+0100\n" +"PO-Revision-Date: 2016-01-26 19:46+0000\n" +"Last-Translator: Øystein Alværvik <oystein.alver(a)gmail.com>\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" @@ -18,171 +19,171 @@ msgstr "" "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:64 mat-gui:415 mat-gui:438 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "Klar" -#: mat-gui:133 +#: mat-gui:136 msgid "Choose files" msgstr "Vel filer" -#: mat-gui:141 -msgid "All files" -msgstr "Alle filer" - -#: mat-gui:147 +#: mat-gui:144 msgid "Supported files" msgstr "Støtta filer" -#: mat-gui:164 mat-gui:359 mat-gui:410 mat-gui:434 mat-gui:436 -#: data/mat.glade:480 +#: mat-gui:151 +msgid "All files" +msgstr "Alle filer" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "Rein" -#: mat-gui:165 +#: mat-gui:168 msgid "No metadata found" msgstr "Ingen metadata funne" -#: mat-gui:167 mat-gui:412 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "Ikkje rein" -#: mat-gui:172 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr "%s metadata" -#: mat-gui:183 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "Kast meta, behald dine data" -#: mat-gui:188 +#: mat-gui:192 msgid "Website" msgstr "Vevside" -#: mat-gui:214 +#: mat-gui:219 msgid "Preferences" msgstr "Innstillingar" -#: mat-gui:227 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "Reduser PDF-kvalitet" -#: mat-gui:230 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "Reduser storleik til produsert PDF og kvalitet" -#: mat-gui:233 +#: mat-gui:238 msgid "Add unsupported file to archives" msgstr "Legg til ustøtta filer i arkiva" -#: mat-gui:236 +#: mat-gui:241 msgid "Add non-supported (and so non-anonymised) file to output archive" msgstr "Legg til ikkje-støtta (og med det ikkje-anonymiserte) filer i utdata-arkivet" -#: mat-gui:275 +#: mat-gui:280 msgid "Unknown" msgstr "Ukjend" -#: mat-gui:318 +#: mat-gui:325 msgid "Not-supported" msgstr "Ikkje-støtta" -#: mat-gui:332 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "Harmlaust filformat" -#: mat-gui:334 +#: mat-gui:341 msgid "Cant read file" -msgstr "" +msgstr "Kan ikkje lese fila." -#: mat-gui:336 +#: mat-gui:343 msgid "Fileformat not supported" msgstr "Filformat ikkje støtta" -#: mat-gui:339 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "Desse filene kan ikkje handsamast:" -#: mat-gui:344 mat-gui:373 data/mat.glade:519 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "Filnamn" -#: mat-gui:346 +#: mat-gui:353 msgid "Reason" msgstr "Årsak" -#: mat-gui:358 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "Ikkje-støtta filer i arkivet" -#: mat-gui:372 +#: mat-gui:379 msgid "Include" msgstr "Inkluder" -#: mat-gui:390 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "MAT kan ikkje rydde opp i følgjande filer funne i %s-arkivet" -#: mat-gui:406 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "Kontrollerer %s" -#: mat-gui:421 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "Ryddar opp %s" -#: data/mat.glade:26 data/mat.glade:196 +#: data/mat.glade:46 +msgid "_File" +msgstr "_Arkiv" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "_Rediger" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "_Hjelp" + +#: data/mat.glade:187 +msgid "Add" +msgstr "Legg til" + +#: data/mat.glade:256 +msgid "State" +msgstr "Tilstand" + +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "Metadata" -#: data/mat.glade:85 +#: data/mat.glade:354 msgid "Name" msgstr "Namn" -#: data/mat.glade:99 +#: data/mat.glade:368 msgid "Content" msgstr "Innhald" -#: data/mat.glade:129 +#: data/mat.glade:398 msgid "Supported formats" msgstr "Støtta format" -#: data/mat.glade:185 +#: data/mat.glade:456 msgid "Support" msgstr "Støtte" -#: data/mat.glade:207 +#: data/mat.glade:478 msgid "Method" msgstr "Metode" -#: data/mat.glade:218 +#: data/mat.glade:489 msgid "Remaining" msgstr "Står att" -#: data/mat.glade:247 +#: data/mat.glade:518 msgid "Fileformat" msgstr "Filformat" - -#: data/mat.glade:326 -msgid "_File" -msgstr "_Arkiv" - -#: data/mat.glade:375 -msgid "_Edit" -msgstr "_Rediger" - -#: data/mat.glade:421 -msgid "_Help" -msgstr "_Hjelp" - -#: data/mat.glade:467 -msgid "Add" -msgstr "Legg til" - -#: data/mat.glade:536 -msgid "State" -msgstr "Tilstand"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit b269a42db2720332276d83e66f54a52fe3d94a7d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 19:15:03 2016 +0000 Update translations for bridgedb --- hy_AM/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po index ec851b6..b76d811 100644 --- a/hy_AM/LC_MESSAGES/bridgedb.po +++ b/hy_AM/LC_MESSAGES/bridgedb.po @@ -10,7 +10,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: 2016-01-26 17:47+0000\n" +"PO-Revision-Date: 2016-01-26 19:12+0000\n" "Last-Translator: Sergei <serjsafarian(a)gmail.com>\n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/otf/torproject/language/hy_AM/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ 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" @@ -49,15 +49,15 @@ msgstr "" #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "Կապորդներ" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "Ընտրել բոլորը" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "Ցույց տալ QR ծածկագիրը" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 546412ff0db3c370568e4a1a6bc394c3f5222600 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 18:15:03 2016 +0000 Update translations for bridgedb --- hy_AM/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po index 3145ed9..ec851b6 100644 --- a/hy_AM/LC_MESSAGES/bridgedb.po +++ b/hy_AM/LC_MESSAGES/bridgedb.po @@ -10,7 +10,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: 2016-01-26 17:45+0000\n" +"PO-Revision-Date: 2016-01-26 17:47+0000\n" "Last-Translator: Sergei <serjsafarian(a)gmail.com>\n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/otf/torproject/language/hy_AM/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr "" #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "Հայտնել սխալի մասին" #: bridgedb/https/templates/base.html:82 msgid "Source Code"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 40c7532e3b305ed16479dfbdbf8bc788966d2036 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 17:45:04 2016 +0000 Update translations for bridgedb --- hy_AM/LC_MESSAGES/bridgedb.po | 340 +++++++++++++++++++++-------------------- 1 file changed, 171 insertions(+), 169 deletions(-) diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po index a16d2ea..3145ed9 100644 --- a/hy_AM/LC_MESSAGES/bridgedb.po +++ b/hy_AM/LC_MESSAGES/bridgedb.po @@ -4,17 +4,19 @@ # # Translators: # mhrach87 <mhrach87(a)gmail.com>, 2014 +# Sergei <serjsafarian(a)gmail.com>, 2016 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: Armenian (Armenia) (http://www.transifex.com/projects/p/torproject/language/hy_AM/)\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-01-26 17:45+0000\n" +"Last-Translator: Sergei <serjsafarian(a)gmail.com>\n" +"Language-Team: Armenian (Armenia) (http://www.transifex.com/otf/torproject/language/hy_AM/)\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: hy_AM\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,57 +31,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 "" -#: lib/bridgedb/strings.py:18 +#: 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 "Քայլ %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Ներբեռնել %s Tor Browser %s-ը" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Քայլ %s2%s" + +#: 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 "Քայլ %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 "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Ոչ" + +#: 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 "%sԱ%sյո!" + +#. 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 "" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "" -#: 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 "Բարի գալուստ 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 "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Ողջույն ընկեր!" +msgstr "Ողջո՛ւյն, ընկեր։" -#: 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 "" #. 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 +217,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 +228,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 +240,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 +249,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" @@ -143,12 +270,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 "" @@ -156,48 +283,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" @@ -206,21 +333,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 +355,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 "Քայլ %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Ներբեռնել %s Tor Browser %s-ը" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Քայլ %s2%s" - -#: 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 "Քայլ %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 "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Ոչ" - -#: 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 "%sԱ%sյո!" - -#. 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

[stem/master] Proc connections skipped due to incorrect file mode
by atagar＠torproject.org 26 Jan '16

26 Jan '16

commit e04f453314f015ef994f798d1418670f62003386 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 26 09:36:52 2016 -0800 Proc connections skipped due to incorrect file mode toralf reports that proc connection resolution no longer works and think I see the issue. Under python3 we read the contents as unicode but our checks all expect bytes, causing us to skip all the lines. --- stem/util/proc.py | 4 ++-- test/unit/util/proc.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index 2b16ccb..7fdd70f 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -393,7 +393,7 @@ def connections(pid): continue try: - with open(proc_file_path) as proc_file: + with open(proc_file_path, 'rb') as proc_file: proc_file.readline() # skip the first line for line in proc_file: @@ -458,7 +458,7 @@ def _decode_proc_address_encoding(addr, is_ipv6): grouping = ip[8 * i:8 * (i + 1)] inverted += [grouping[2 * i:2 * (i + 1)] for i in range(4)][::-1] - ip = ''.join(inverted) + ip = b''.join(inverted) ip = socket.inet_ntop(socket.AF_INET6, base64.b16decode(ip)) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index f852820..ee52d21 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -220,7 +220,7 @@ class TestProc(unittest.TestCase): '/proc/net/udp6': False }[param] - open_mock.side_effect = lambda param: { + open_mock.side_effect = lambda param, mode: { '/proc/net/tcp': io.BytesIO(tcp), '/proc/net/udp': io.BytesIO(udp) }[param] @@ -262,7 +262,7 @@ class TestProc(unittest.TestCase): '/proc/net/udp6': False }[param] - open_mock.side_effect = lambda param: { + open_mock.side_effect = lambda param, mode: { '/proc/net/tcp6': io.BytesIO(TCP6_CONTENT), }[param]

1 0

[stem/master] Correct ipv6 little-endian conversion
by atagar＠torproject.org 26 Jan '16

26 Jan '16

commit 88ecc4270799d65a64ec8d52be16297ec932b705 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 26 09:07:48 2016 -0800 Correct ipv6 little-endian conversion Fixing how we convert little-endian ipv6 addresses, thanks to yawning and cypherpunks... https://trac.torproject.org/projects/tor/ticket/18079#comment:24 --- stem/util/proc.py | 31 ++++++++++++++++++++----------- test/unit/util/proc.py | 12 +++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index d519e6f..2b16ccb 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -431,8 +431,10 @@ def _decode_proc_address_encoding(addr, is_ipv6): :: "0500000A:0016" -> ("10.0.0.5", 22) + "F804012A4A5190010000000002000000:01BB" -> ("2a01:4f8:190:514a::2", 443) :param str addr: proc address entry to be decoded + :param bool is_ipv6: if we should treat the address as ipv6 :returns: **tuple** of the form **(addr, port)**, with addr as a string and port an int """ @@ -441,17 +443,24 @@ def _decode_proc_address_encoding(addr, is_ipv6): port = int(port, 16) # the port is represented as a two-byte hexadecimal number - # The IP address portion is a little-endian four-byte hexadecimal number. - # That is, the least significant byte is listed first, so we need to reverse - # the order of the bytes to convert it to an IP address. - # - # This needs to account for the endian ordering as per... - # - # http://code.google.com/p/psutil/issues/detail?id=201 - # https://trac.torproject.org/projects/tor/ticket/4777 - - ip_encoded = base64.b16decode(ip)[::-1] if sys.byteorder == 'little' else base64.b16decode(ip) - ip = socket.inet_ntop(socket.AF_INET6 if is_ipv6 else socket.AF_INET, ip_encoded) + if not is_ipv6: + ip_encoded = base64.b16decode(ip)[::-1] if sys.byteorder == 'little' else base64.b16decode(ip) + ip = socket.inet_ntop(socket.AF_INET, ip_encoded) + else: + if sys.byteorder == 'little': + # Group into eight characters, then invert in pairs... + # + # https://trac.torproject.org/projects/tor/ticket/18079#comment:24 + + inverted = [] + + for i in range(4): + grouping = ip[8 * i:8 * (i + 1)] + inverted += [grouping[2 * i:2 * (i + 1)] for i in range(4)][::-1] + + ip = ''.join(inverted) + + ip = socket.inet_ntop(socket.AF_INET6, base64.b16decode(ip)) return (ip, port) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 4b7d37f..f852820 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -247,16 +247,12 @@ class TestProc(unittest.TestCase): pid = 1111 listdir_mock.side_effect = lambda param: { - '/proc/%s/fd' % pid: ['1', '2', '3', '4'], + '/proc/%s/fd' % pid: ['1', '2'], }[param] readlink_mock.side_effect = lambda param: { '/proc/%s/fd/1' % pid: 'socket:[42088802]', '/proc/%s/fd/2' % pid: 'socket:[41691357]', - '/proc/%s/fd/3' % pid: 'socket:[41878761]', - '/proc/%s/fd/4' % pid: 'socket:[41825895]', - '/proc/%s/fd/5' % pid: 'socket:[41512577]', - '/proc/%s/fd/6' % pid: 'socket:[14347030]', # this shouldn't be present due to being unestablished }[param] path_exists_mock.side_effect = lambda param: { @@ -271,10 +267,8 @@ class TestProc(unittest.TestCase): }[param] expected_results = [ - ('0:2::190:514a:2a01:4f8', 443, 'ffff:189::a000:4140:2001:638', 40435, 'tcp', True), - ('0:2::190:514a:2a01:4f8', 443, '563b:1526:aabb:0:2:2:2001:858', 44469, 'tcp', True), - ('509:9e4b:0:ffff::', 5222, '4e36:8621:0:ffff::', 38330, 'tcp', True), - ('0:2::190:514a:2a01:4f8', 5269, '0:26::126f:11:2001:6f8', 50594, 'tcp', True), + ('2a01:4f8:190:514a::2', 443, '2001:638:a000:4140::ffff:189', 40435, 'tcp', True), + ('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 44469, 'tcp', True), ] self.assertEqual(expected_results, proc.connections(pid))

1 0

[metrics-web/master] squash! Remove one country code, add four.
by karsten＠torproject.org 26 Jan '16

26 Jan '16

commit 1fea9125e1fa38b25254c27dd75719dc96bff376 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 26 17:51:34 2016 +0100 squash! Remove one country code, add four. Fix trivial bug in displaying Curacao on the website. --- website/src/org/torproject/metrics/web/graphs/Countries.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/org/torproject/metrics/web/graphs/Countries.java b/website/src/org/torproject/metrics/web/graphs/Countries.java index 7982a8f..574fd0c 100644 --- a/website/src/org/torproject/metrics/web/graphs/Countries.java +++ b/website/src/org/torproject/metrics/web/graphs/Countries.java @@ -80,7 +80,7 @@ public class Countries { this.knownCountries.add("ci:Côte d'Ivoire".split(":")); this.knownCountries.add("hr;Croatia".split(";")); this.knownCountries.add("cu;Cuba".split(";")); - this.knownCountries.add("cw;Curaçao".split(";")); + this.knownCountries.add("cw:Curaçao".split(":")); this.knownCountries.add("cy;Cyprus".split(";")); this.knownCountries.add("cz;Czech Republic".split(";")); this.knownCountries.add("dk;Denmark".split(";"));

1 0