tor-commits June 2014

tor-commits@lists.torproject.org

21 participants
1212 discussions

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Jun '14

23 Jun '14

commit 7317ef31f842ebd359038d295279937efcb5ec5e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 23 20:15:14 2014 +0000 Update translations for https_everywhere --- hu/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/ssl-observatory.dtd b/hu/ssl-observatory.dtd index bde070a..1aab147 100644 --- a/hu/ssl-observatory.dtd +++ b/hu/ssl-observatory.dtd @@ -48,7 +48,7 @@ Tehát hagyja kikapcsolva alapértelmezetten. "Figyelmeztessen, ha az Observatory a böngésző által el nem kapott, visszavont tanúsítványokat talál."> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> +"...Sajnos nem tudjuk garantálni hogy megzászlózunk minden visszavont igazolást, "> <!ENTITY ssl-observatory.prefs.done "Kész">

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 23 Jun '14

23 Jun '14

commit 426a70cf3bc4df01f61e9c9150459d0f2918192a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 23 17:15:58 2014 +0000 Update translations for tor-and-https_completed --- da.po | 82 +++++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/da.po b/da.po index fdaf857..00619e0 100644 --- a/da.po +++ b/da.po @@ -1,12 +1,13 @@ # # Translators: -# autofunk78 <villum(a)autofunk.dk>, 2014 +# christianflintrup <chr(a)agge.net>, 2014 +# Christian Villum <villum(a)autofunk.dk>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-21 09:17+0200\n" -"PO-Revision-Date: 2014-05-23 00:59+0000\n" -"Last-Translator: autofunk78 <villum(a)autofunk.dk>\n" +"POT-Creation-Date: 2014-05-24 18:11+0000\n" +"PO-Revision-Date: 2014-06-23 17:11+0000\n" +"Last-Translator: christianflintrup <chr(a)agge.net>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14,82 +15,123 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: C/tor-and-https.svg223(svg/title) +#. (itstool) path: C/tor-and-https.svg/svg@direction +#. (itstool) comment: C/tor-and-https.svg/svg@direction +#. Specify "ltr" for left-to-right languages or "rtl" for right-to-left +#. languages (e.g. Arabic or Hebrew). +#: C/tor-and-https.svg:3 +msgid "ltr" +msgstr "ltr" + +#. (itstool) path: svg/title +#: C/tor-and-https.svg:14 #, no-wrap msgid "Tor and HTTPS" msgstr "Tor og HTTPS" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:346 #, no-wrap msgid "Site.com" msgstr "Website" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:346 #, no-wrap msgid "user / pw" msgstr "user / kode" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:346 #, no-wrap msgid "data" msgstr "data" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:346 #, no-wrap msgid "location" msgstr "lokation" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 3em max. +#: C/tor-and-https.svg:346 +#, no-wrap +msgid "WiFi" +msgstr "WiFi" + +#. (itstool) path: defs/text +#. Keep it short: 4em max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "ISP" msgstr "Udbyder" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Hacker" msgstr "Hacker" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Lawyer" msgstr "Advokat" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Sysadmin" msgstr "Sysadmin" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Police" msgstr "Politi" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "NSA" msgstr "NSA" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Tor relay" msgstr "Tor relay" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "Key" msgstr "Nøgle" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "Internet connection" msgstr "Internetforbindelse" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "Eavesdropping" msgstr "Aflytning" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "Data sharing" msgstr "Dataoverførsel"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 23 Jun '14

23 Jun '14

commit 9ea3d5307ad1e4aafb8c681088c47e28ea7ab451 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 23 17:15:56 2014 +0000 Update translations for tor-and-https --- da.po | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/da.po b/da.po index 36da7bd..00619e0 100644 --- a/da.po +++ b/da.po @@ -1,12 +1,13 @@ # # Translators: -# autofunk78 <villum(a)autofunk.dk>, 2014 +# christianflintrup <chr(a)agge.net>, 2014 +# Christian Villum <villum(a)autofunk.dk>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-24 16:09+0000\n" -"PO-Revision-Date: 2014-05-25 09:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-05-24 18:11+0000\n" +"PO-Revision-Date: 2014-06-23 17:11+0000\n" +"Last-Translator: christianflintrup <chr(a)agge.net>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "" +msgstr "ltr" #. (itstool) path: svg/title #: C/tor-and-https.svg:14 @@ -30,107 +31,107 @@ msgstr "Tor og HTTPS" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Site.com" msgstr "Website" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "user / pw" msgstr "user / kode" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "data" msgstr "data" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "location" msgstr "lokation" #. (itstool) path: defs/text #. Keep it short: 3em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "WiFi" -msgstr "" +msgstr "WiFi" #. (itstool) path: defs/text #. Keep it short: 4em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "ISP" msgstr "Udbyder" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Hacker" msgstr "Hacker" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Lawyer" msgstr "Advokat" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Sysadmin" msgstr "Sysadmin" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Police" msgstr "Politi" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "NSA" msgstr "NSA" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Tor relay" msgstr "Tor relay" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Key" msgstr "Nøgle" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Internet connection" msgstr "Internetforbindelse" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Eavesdropping" msgstr "Aflytning" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Data sharing" msgstr "Dataoverførsel"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 23 Jun '14

23 Jun '14

commit f8da6d57ac4697789063024a642eb9e43159e0d4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 23 17:15:41 2014 +0000 Update translations for tails-misc_completed --- da.po | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/da.po b/da.po index 8797d8a..2aa7b50 100644 --- a/da.po +++ b/da.po @@ -3,18 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# andersd <andersd(a)riseup.net>, 2013 +# Anders Damsgaard <andersd(a)riseup.net>, 2013 # bna1605 <bna1605(a)gmail.com>, 2014 -# autofunk78 <villum(a)autofunk.dk>, 2014 -# DavidNielsen <gnomeuser(a)gmail.com>, 2014 -# litr, 2013 +# christianflintrup <chr(a)agge.net>, 2014 +# Christian Villum <villum(a)autofunk.dk>, 2014 +# David Nielsen <gnomeuser(a)gmail.com>, 2014 +# Niels, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-27 19:29+0200\n" -"PO-Revision-Date: 2014-04-30 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-08 19:08+0200\n" +"PO-Revision-Date: 2014-06-23 17:11+0000\n" +"Last-Translator: christianflintrup <chr(a)agge.net>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -225,10 +226,6 @@ msgstr "Luk ned med det samme" msgid "Reboot Immediately" msgstr "Genstart med det samme" -#: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 -msgid "Shutdown Helper" -msgstr "Slukkehjælper" - #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" msgstr "ikke tilgængelig" @@ -250,6 +247,7 @@ msgid "" msgstr "Information om denne udgave:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 +#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" msgstr "Om Tails" @@ -486,6 +484,10 @@ msgstr "i2p" msgid "Anonymous overlay network" msgstr "Anonymt overlejringsnetværk" +#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 +msgid "Learn more about Tails" +msgstr "Lær mere om Tails" + #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot" msgstr "Genstart"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Jun '14

23 Jun '14

commit ece463e4fa32a1ef5c5c0c519354fc9b3d907ba7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 23 17:15:39 2014 +0000 Update translations for tails-misc --- da.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/da.po b/da.po index 02500bb..2aa7b50 100644 --- a/da.po +++ b/da.po @@ -3,18 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# andersd <andersd(a)riseup.net>, 2013 +# Anders Damsgaard <andersd(a)riseup.net>, 2013 # bna1605 <bna1605(a)gmail.com>, 2014 -# autofunk78 <villum(a)autofunk.dk>, 2014 -# DavidNielsen <gnomeuser(a)gmail.com>, 2014 -# litr, 2013 +# christianflintrup <chr(a)agge.net>, 2014 +# Christian Villum <villum(a)autofunk.dk>, 2014 +# David Nielsen <gnomeuser(a)gmail.com>, 2014 +# Niels, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-08 19:08+0200\n" +"PO-Revision-Date: 2014-06-23 17:11+0000\n" +"Last-Translator: christianflintrup <chr(a)agge.net>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -485,7 +486,7 @@ msgstr "Anonymt overlejringsnetværk" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" -msgstr "" +msgstr "Lær mere om Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 23 Jun '14

23 Jun '14

commit 06e1c64abce43ae77d9c77b05a875b2698c35660 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 23 17:15:25 2014 +0000 Update translations for tails-greeter_completed --- da/da.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/da/da.po b/da/da.po index 0ad4e3b..4e0bb0f 100644 --- a/da/da.po +++ b/da/da.po @@ -3,17 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# autofunk78 <villum(a)autofunk.dk>, 2014 +# christianflintrup <chr(a)agge.net>, 2014 +# Christian Villum <villum(a)autofunk.dk>, 2014 # mort3n <nalholm(a)yahoo.dk>, 2013 # cookiefox <neoleo(a)gmail.com>, 2014 -# torebjornson <tore.bjornson(a)gmail.com>, 2013 +# Tore Bjørnson <tore.bjornson(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-14 13:14+0200\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" -"Last-Translator: autofunk78 <villum(a)autofunk.dk>\n" +"POT-Creation-Date: 2014-06-11 16:20+0200\n" +"PO-Revision-Date: 2014-06-23 17:11+0000\n" +"Last-Translator: christianflintrup <chr(a)agge.net>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,13 +106,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">D #: ../glade/optionswindow.glade.h:12 msgid "" -"This option makes Tails look more like Microsoft Windows XP. This may be " +"This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "Denne indstilling lader Tails ligne Microsoft Windows XP. Dette kan være brugbart ved offentlige lokationer for at minimere mistanke." +msgstr "Dette får Tails til at ligne Microsoft Windows 8 mere. Dette kan være nyttigt på offentlige steder for at undgå at vække mistanke." #: ../glade/optionswindow.glade.h:13 -msgid "Activate Microsoft Windows XP Camouflage" -msgstr "Aktivér Microsoft Windows XP Camouflage" +msgid "Activate Microsoft Windows 8 Camouflage" +msgstr "Aktiver “Microsoft Windows 8”-camouflage" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -200,7 +201,7 @@ msgid "" "%(stderr)s" msgstr "live-persist fejlede med return code %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "Anden..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 23 Jun '14

23 Jun '14

commit 5691a1bae4567e61bd0fdbf1b1eb387b3e36d554 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 23 17:15:23 2014 +0000 Update translations for tails-greeter --- da/da.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/da/da.po b/da/da.po index 9b24b40..4e0bb0f 100644 --- a/da/da.po +++ b/da/da.po @@ -3,17 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# autofunk78 <villum(a)autofunk.dk>, 2014 +# christianflintrup <chr(a)agge.net>, 2014 +# Christian Villum <villum(a)autofunk.dk>, 2014 # mort3n <nalholm(a)yahoo.dk>, 2013 # cookiefox <neoleo(a)gmail.com>, 2014 -# torebjornson <tore.bjornson(a)gmail.com>, 2013 +# Tore Bjørnson <tore.bjornson(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-11 16:20+0200\n" +"PO-Revision-Date: 2014-06-23 17:11+0000\n" +"Last-Translator: christianflintrup <chr(a)agge.net>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,11 +108,11 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">D msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "Dette får Tails til at ligne Microsoft Windows 8 mere. Dette kan være nyttigt på offentlige steder for at undgå at vække mistanke." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "" +msgstr "Aktiver “Microsoft Windows 8”-camouflage" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -200,7 +201,7 @@ msgid "" "%(stderr)s" msgstr "live-persist fejlede med return code %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "Anden..."

1 0

[arm/master] Moving our stem.connection.connect() call into init_controller()
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit 7539cca058a4b1795ac5a9fc92f192c7fbbd1c29 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 21 12:38:59 2014 -0700 Moving our stem.connection.connect() call into init_controller() Might as well move our connect() call in. They're separate for legacy reasons that no longer exist. Also a bit of other minor util cleanup. --- arm/starter.py | 4 +--- arm/util/__init__.py | 26 ++++++++++++-------------- run_tests.py | 3 +-- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/arm/starter.py b/arm/starter.py index 8d27024..1f6692f 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -22,7 +22,6 @@ import arm.util.tracker import arm.util.ui_tools import stem -import stem.connection import stem.util.conf import stem.util.log import stem.util.system @@ -63,7 +62,7 @@ def main(): control_port = None if args.user_provided_socket else (args.control_address, args.control_port) control_socket = None if args.user_provided_port else args.control_socket - controller = stem.connection.connect( + controller = init_controller( control_port = control_port, control_socket = control_socket, password = CONFIG.get('tor.password', None), @@ -74,7 +73,6 @@ def main(): if controller is None: exit(1) - init_controller(controller) _warn_if_root(controller) _warn_if_unable_to_get_pid(controller) _setup_freebsd_chroot(controller) diff --git a/arm/util/__init__.py b/arm/util/__init__.py index 3d3f725..3853b3d 100644 --- a/arm/util/__init__.py +++ b/arm/util/__init__.py @@ -1,7 +1,6 @@ """ -General purpose utilities for a variety of tasks including logging the -application's status, making cross platform system calls, parsing tor data, -and safely working with curses (hiding some of the gory details). +General purpose utilities for a variety of tasks supporting arm features and +safely working with curses (hiding some of the gory details). """ __all__ = [ @@ -15,9 +14,7 @@ __all__ = [ import os import sys -import stem import stem.connection -import stem.control import stem.util.conf import stem.util.log @@ -27,7 +24,7 @@ BASE_DIR = os.path.sep.join(__file__.split(os.path.sep)[:-2]) try: uses_settings = stem.util.conf.uses_settings('arm', os.path.join(BASE_DIR, 'config'), lazy_load = False) except IOError as exc: - print "Unable to load arm's internal configurations: {error}".format(error = exc) + print "Unable to load arm's internal configurations: %s" % exc sys.exit(1) @@ -41,18 +38,21 @@ def tor_controller(): return TOR_CONTROLLER -def init_controller(controller): +def init_controller(*args, **kwargs): """ - Sets the Controller used by arm. + Sets the Controller used by arm. This is a passthrough for Stem's + :func:`~stem.connection.connect` function. - :param Controller controller: control connection to be used by arm + :returns: :class:`~stem.control.Controller` arm is using """ global TOR_CONTROLLER - TOR_CONTROLLER = controller + TOR_CONTROLLER = stem.connection.connect(*args, **kwargs) + return TOR_CONTROLLER -def msg(message, **attr): +@uses_settings +def msg(message, config, **attr): """ Provides the given message. @@ -62,12 +62,10 @@ def msg(message, **attr): :returns: **str** that was requested """ - config = stem.util.conf.get_config('arm') - try: return config.get('msg.%s' % message).format(**attr) except: - stem.util.log.notice('BUG: We attempted to use an undefined string resource (%s)' % message) + notice('BUG: We attempted to use an undefined string resource (%s)' % message) return '' diff --git a/run_tests.py b/run_tests.py index 63de9be..c7482d3 100755 --- a/run_tests.py +++ b/run_tests.py @@ -70,8 +70,7 @@ def main(): print '* %s' % file_path for line_number, msg in static_check_issues[file_path]: - line_count = '%-4s' % line_number - print ' line %s - %s' % (line_count, msg) + print ' line %-4s - %s' % (line_number, msg) print

1 0

[arm/master] Update __init__.py manifests
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit 636817003ca6962df7ec69e787fda5bdeaffd689 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 21 13:07:48 2014 -0700 Update __init__.py manifests Updating our __all__ entries to reflect the current contents. Also changing them to be alphabetical and have each entry on its own line. --- arm/__init__.py | 13 +++++++++++-- arm/connections/__init__.py | 11 +++++++++-- arm/graphing/__init__.py | 7 ++++++- arm/menu/__init__.py | 6 +++++- test/__init__.py | 7 +++++++ test/util/__init__.py | 5 +++++ test/util/tracker/__init__.py | 10 ++++++++++ 7 files changed, 53 insertions(+), 6 deletions(-) diff --git a/arm/__init__.py b/arm/__init__.py index 25e322f..b81c0fb 100644 --- a/arm/__init__.py +++ b/arm/__init__.py @@ -1,8 +1,17 @@ """ -Scripts involved in validating user input, system state, and initializing arm. +Tor curses monitoring application. """ -__all__ = ["starter", "arguments", "prereq", "version", "config_panel", "controller", "header_panel", "log_panel", "popups", "torrc_panel"] +__all__ = [ + 'arguments', + 'config_panel', + 'controller', + 'header_panel', + 'log_panel', + 'popups', + 'starter', + 'torrc_panel', +] __version__ = '1.4.6_dev' __release_date__ = 'April 28, 2011' diff --git a/arm/connections/__init__.py b/arm/connections/__init__.py index bf4cf89..447adf6 100644 --- a/arm/connections/__init__.py +++ b/arm/connections/__init__.py @@ -1,5 +1,12 @@ """ -Connection panel related resources. +Resources related to our connection panel. """ -__all__ = ["circ_entry", "conn_entry", "conn_panel", "count_popup", "descriptor_popup", "entries"] +__all__ = [ + 'circ_entry', + 'conn_entry', + 'conn_panel', + 'count_popup', + 'descriptor_popup', + 'entries', +] diff --git a/arm/graphing/__init__.py b/arm/graphing/__init__.py index aebef5d..74f7e07 100644 --- a/arm/graphing/__init__.py +++ b/arm/graphing/__init__.py @@ -2,4 +2,9 @@ Graphing panel resources. """ -__all__ = ["graph_panel", "bandwidth_stats", "conn_stats", "resource_stats"] +__all__ = [ + 'bandwidth_stats', + 'conn_stats', + 'graph_panel', + 'resource_stats', +] diff --git a/arm/menu/__init__.py b/arm/menu/__init__.py index 4cc12de..54644fe 100644 --- a/arm/menu/__init__.py +++ b/arm/menu/__init__.py @@ -2,4 +2,8 @@ Resources for displaying the menu. """ -__all__ = ["actions", "item", "menu"] +__all__ = [ + 'actions', + 'item', + 'menu', +] diff --git a/test/__init__.py b/test/__init__.py index e69de29..20963bc 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -0,0 +1,7 @@ +""" +Unit tests for arm. +""" + +__all__ = [ + 'arguments', +] diff --git a/test/util/__init__.py b/test/util/__init__.py index e69de29..3795845 100644 --- a/test/util/__init__.py +++ b/test/util/__init__.py @@ -0,0 +1,5 @@ +""" +Unit tests for arm's utilities. +""" + +__all__ = [] diff --git a/test/util/tracker/__init__.py b/test/util/tracker/__init__.py index e69de29..1d7d5de 100644 --- a/test/util/tracker/__init__.py +++ b/test/util/tracker/__init__.py @@ -0,0 +1,10 @@ +""" +Unit tests for arm's tracker utilities. +""" + +__all__ = [ + 'connection_tracker', + 'daemon', + 'port_usage_tracker', + 'resource_tracker', +]

1 0

[arm/master] Dropping CONFIG global from starter
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit fb1e63d5e80cee8c3b9ca71d75c824c471d83986 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 21 12:56:15 2014 -0700 Dropping CONFIG global from starter Now that we have our nice @uses_settings annotation there's no longer any point to have a CONFIG global. I only had it there because I hated passing the config around by hand all the time. :) --- arm/starter.py | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/arm/starter.py b/arm/starter.py index 1f6692f..e6db5cf 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -22,22 +22,19 @@ import arm.util.tracker import arm.util.ui_tools import stem -import stem.util.conf import stem.util.log import stem.util.system from arm.util import BASE_DIR, init_controller, msg, trace, info, notice, warn, uses_settings -CONFIG = stem.util.conf.get_config('arm') - @uses_settings -def main(): - CONFIG.set('start_time', str(int(time.time()))) +def main(config): + config.set('start_time', str(int(time.time()))) try: args = arm.arguments.parse(sys.argv[1:]) - CONFIG.set('startup.events', args.logged_events) + config.set('startup.events', args.logged_events) except ValueError as exc: print exc sys.exit(1) @@ -65,9 +62,9 @@ def main(): controller = init_controller( control_port = control_port, control_socket = control_socket, - password = CONFIG.get('tor.password', None), + password = config.get('tor.password', None), password_prompt = True, - chroot_path = CONFIG.get('tor.chroot', ''), + chroot_path = config.get('tor.chroot', ''), ) if controller is None: @@ -139,25 +136,26 @@ def _setup_debug_logging(args): ) -def _load_user_armrc(path): +@uses_settings +def _load_user_armrc(path, config): """ Loads user's personal armrc if it's available. """ if os.path.exists(path): try: - CONFIG.load(path) + config.load(path) # If the user provided us with a chroot then validate and normalize the # path. - chroot = CONFIG.get('tor.chroot', '').strip().rstrip(os.path.sep) + chroot = config.get('tor.chroot', '').strip().rstrip(os.path.sep) if chroot and not os.path.exists(chroot): notice('setup.chroot_doesnt_exist', path = chroot) - CONFIG.set('tor.chroot', '') + config.set('tor.chroot', '') else: - CONFIG.set('tor.chroot', chroot) # use the normalized path + config.set('tor.chroot', chroot) # use the normalized path except IOError as exc: warn('config.unable_to_read_file', error = exc.strerror) else: @@ -190,17 +188,18 @@ def _warn_if_unable_to_get_pid(controller): warn('setup.unable_to_determine_pid') -def _setup_freebsd_chroot(controller): +@uses_settings +def _setup_freebsd_chroot(controller, config): """ If we're running under FreeBSD then check the system for a chroot path. """ - if not CONFIG.get('tor.chroot', None) and platform.system() == 'FreeBSD': + if not config.get('tor.chroot', None) and platform.system() == 'FreeBSD': jail_chroot = stem.util.system.get_bsd_jail_path(controller.get_pid(0)) if jail_chroot and os.path.exists(jail_chroot): info('setup.set_freebsd_chroot', path = jail_chroot) - CONFIG.set('tor.chroot', jail_chroot) + config.set('tor.chroot', jail_chroot) def _notify_of_unknown_events(): @@ -214,13 +213,14 @@ def _notify_of_unknown_events(): info('setup.unknown_event_types', event_types = ', '.join(missing_events)) -def _clear_password(): +@uses_settings +def _clear_password(config): """ Removing the reference to our controller password so the memory can be freed. Without direct memory access this is about the best we can do to clear it. """ - CONFIG.set('tor.password', '') + config.set('tor.password', '') def _load_tor_config_descriptions(): @@ -240,14 +240,15 @@ def _use_english_subcommands(): os.putenv('LANG', 'C') -def _use_unicode(): +@uses_settings +def _use_unicode(config): """ If using our LANG variable for rendering multi-byte characters lets us get unicode support then then use it. This needs to be done before initializing curses. """ - if not CONFIG.get('features.printUnicode', True): + if not config.get('features.printUnicode', True): return is_lang_unicode = "utf-" in os.getenv("LANG", "").lower()

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2014