March 2012 - tor-commits - lists.torproject.org

[ooni-probe/master] Fix ascii art
by art＠torproject.org 05 Mar '12

05 Mar '12

commit fc0ee975d85aa486649bddb6d5c6aca894c36283 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sun Mar 4 15:15:46 2012 -0800 Fix ascii art --- logo.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/logo.py b/logo.py index 3b47775..8924462 100644 --- a/logo.py +++ b/logo.py @@ -121,7 +121,7 @@ o O o O O o O o O O o O o O O logo.append(""" .-. ( ) .--. .--. ___ .-. ( __) .-.. ___ .-. .--. | |.-. .--. - / \ / \ ( ) \ (''") / \ ( ) \ / \ | / \ / \ + / \ / \ ( ) \ (''") / \ ( ) \ / \ | / \ / \\ | .-. ; | .-. ; | .-. . | | ' .-, ; | ' .-. ; | .-. ; | .-. | | .-. ; | | | | | | | | | | | | | | | | . | | / (___) | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ |

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 04 Mar '12

04 Mar '12

commit f6b94a04d0a71d85de845eb3f4bbdd526d3d079f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 4 04:15:31 2012 +0000 Update translations for vidalia_help --- zh_CN/config.po | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/zh_CN/config.po b/zh_CN/config.po index 5bf6e4a..e897119 100644 --- a/zh_CN/config.po +++ b/zh_CN/config.po @@ -1,12 +1,13 @@ # # Translators: +# Christopher Meng <cickumqt(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2010-12-21 22:40+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-03-04 04:08+0000\n" +"Last-Translator: Christopher Meng <cickumqt(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/config.html:16 msgid "Configuring Vidalia and Tor" -msgstr "" +msgstr "设置 Vidalia 和 Tor" #. type: Content of: <html><body><p> #: en/config.html:20 @@ -69,7 +70,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/config.html:47 msgid "Network Settings" -msgstr "" +msgstr "网络设置" #. type: Content of: <html><body><p> #: en/config.html:49 @@ -120,7 +121,7 @@ msgstr "" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:80 msgid "128.213.48.13:8080" -msgstr "" +msgstr "128.213.48.13:8080" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:83 @@ -135,14 +136,10 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" #. type: Content of: <html><body> @@ -170,7 +167,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/config.html:110 msgid "Appearance Settings" -msgstr "" +msgstr "显示设置" #. type: Content of: <html><body><p> #: en/config.html:112 @@ -206,7 +203,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/config.html:132 msgid "Advanced Settings" -msgstr "" +msgstr "高级设置" #. type: Content of: <html><body><p> #: en/config.html:134 @@ -302,5 +299,3 @@ msgid "" "Hidden services allow you to provide any kind of TCP-based service, e.g. an" " HTTP service, to others without revealing your IP address." msgstr "" - -

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Mar '12

04 Mar '12

commit 5e12e36966f4d750ff5b2ff3734cd5c67077de03 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 4 03:45:05 2012 +0000 Update translations for orbot --- values-fr/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 775bc1a..8be6a38 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -201,5 +201,5 @@ <string name="set_locale_title">Fixer le Lieu</string> <string name="set_locale_summary">Choisir le lieu and la langue pour Orbot</string> <string name="wizard_locale_title">Choisir la langue</string> - <string name="wizard_locale_msg">Laisse défaut ou change la langue actuel</string> + <string name="wizard_locale_msg">Laisser aux défaut ou changer la langue actuel</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Mar '12

04 Mar '12

commit 3b1ce782f5dfd5424d7a166018e9b07972ebe762 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 4 03:15:04 2012 +0000 Update translations for orbot --- values-fr/strings.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 4ec275c..775bc1a 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -150,9 +150,9 @@ <string name="use_only_these_specified_nodes">Utiliser * uniquement * les nœuds spécifiés</string> <string name="bridges">Ponts</string> <string name="use_bridges">Utiliser des ponts</string> - <string name="bridges_obfuscated">Obfuscated Bridges</string> + <string name="bridges_obfuscated">Ponts Obscurci</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activer des nœuds alternatifs d\'entrée dans le réseau Tor</string> - <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts obscurcies</string> <string name="ip_address_and_port_of_bridges">Adresse IP et port des ponts</string> <string name="enter_bridge_addresses">Entrez les adresses de passerelle</string> <string name="relays">Relais</string> @@ -196,10 +196,10 @@ <string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installé ou mis à jour.</string> <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string> <string name="pref_use_persistent_notifications_title">Toujours activé les Notifications</string> - <string name="notification_using_bridges">Bridges enabled!</string> + <string name="notification_using_bridges">Les ponts sont activés!</string> <string name="default_bridges"></string> - <string name="set_locale_title">Set Locale</string> - <string name="set_locale_summary">Choose the locale and language for Orbot</string> + <string name="set_locale_title">Fixer le Lieu</string> + <string name="set_locale_summary">Choisir le lieu and la langue pour Orbot</string> <string name="wizard_locale_title">Choisir la langue</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> + <string name="wizard_locale_msg">Laisse défaut ou change la langue actuel</string> </resources>

1 0

[ooni-probe/master] Display help if no command line options are specified
by art＠torproject.org 03 Mar '12

03 Mar '12

commit b98ad9b11b90eacf08b962cef5391cc69fdfaedf Author: Arturo Filastò <hellais(a)gmail.com> Date: Sat Mar 3 15:08:38 2012 -0800 Display help if no command line options are specified --- ooniprobe.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ooniprobe.py b/ooniprobe.py index 958c9b1..6da2608 100755 --- a/ooniprobe.py +++ b/ooniprobe.py @@ -179,3 +179,6 @@ if __name__ == "__main__": elif args.runall: o.run_tests() + elif len(sys.argv) < 2: + parser.print_help() +

1 0

[ooni-probe/master] check out that stegosaurus, like wut yo'
by art＠torproject.org 03 Mar '12

03 Mar '12

commit e346a4f15956694ef3e850ebf8b740c387a4500a Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Sat Mar 3 15:04:07 2012 -0800 check out that stegosaurus, like wut yo' --- logo.py | 42 ++++++++++++++++++++++++++++++++++++++++++ ooniprobe.py | 2 +- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/logo.py b/logo.py index dcdf119..b9849b1 100644 --- a/logo.py +++ b/logo.py @@ -139,4 +139,46 @@ o O o O O o O o O O o O o O O `---'`---'` '`|---'` `---'`---'`---' | """) + logo.append(""" + ________________________________________ +/ OONI-PROBE -- WE FIGHT CENSORSHIP LIKE \ +\ DRAGONS EAT KNIGHTS! / + ---------------------------------------- + \ ^ /^ + \ / \ // \ + \ |\___/| / \// .\ + \ /O O \__ / // | \ \ *----* + / / \/_/ // | \ \ \ | + @___@` \/_ // | \ \ \/\ \ + 0/0/| \/_ // | \ \ \ \ + 0/0/0/0/| \/// | \ \ | | + 0/0/0/0/0/_|_ / ( // | \ _\ | / + 0/0/0/0/0/0/`/,_ _ _/ ) ; -. | _ _\.-~ / / + ,-} _ *-.|.-~-. .~ ~ + \ \__/ `/\ / ~-. _ .-~ / + \____(oo) *. } { / + ( (--) .----~-.\ \-` .~ + //__\\ \__ Ack! ///.----..< \ _ -~ + // \\ ///-._ _ _ _ _ _ _{^ - - - - ~ +""") + logo.append(""" + _________________ +| OONI-PROBE | +| DON'T CENSOR ME | +|_________________| +\ . . + \ / `. .' " + \ .---. < > < > .---. + \ | \ \ - ~ ~ - / / | + _____ ..-~ ~-..-~ + | (A)| \~~~\.' `./~~~/ + --------- \__/ \__/ + .' O \ / / \ " + (_____, `._.' | } \/~~~/ + `----. / } | / \__/ + `-. | / | / `. ,~~| + ~-.__| /_ - ~ ^| /- _ `..-' + | / | / ~-. `-. _ _ _ + |_____| |_____| ~ - . _ _ _ _ _> +""") return random.choice(logo) diff --git a/ooniprobe.py b/ooniprobe.py index 958c9b1..1639445 100755 --- a/ooniprobe.py +++ b/ooniprobe.py @@ -86,7 +86,7 @@ class ooni(object): def load_tests(self): """ - Iterate through the plugoos insite the folder specified by the + Iterate through the plugoos inside the folder specified by the config file and instantiate them. """ pluginfiles = [fname[:-3] for fname in os.listdir(self.config.main.testdir)\

1 0

[ooni-probe/master] Merge branches 'isis' and 'master' into isis
by art＠torproject.org 03 Mar '12

03 Mar '12

commit 0705e9a5cd364d1f235f365913792fa40c87e99a Merge: e346a4f b98ad9b Author: Arturo Filastò <hellais(a)gmail.com> Date: Sat Mar 3 15:13:11 2012 -0800 Merge branches 'isis' and 'master' into isis ooniprobe.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

1 0

r25501: {website} Linking GSoC landing page to the EFF's HTTPS Everywhere idea (website/trunk/about/en)
by Damian Johnson 03 Mar '12

03 Mar '12

Author: atagar Date: 2012-03-03 19:47:35 +0000 (Sat, 03 Mar 2012) New Revision: 25501 Modified: website/trunk/about/en/gsoc.wml Log: Linking GSoC landing page to the EFF's HTTPS Everywhere ideas Peter didn't reply about if he wants to incorporate the EFF project ideas with our page so I'm assuming that he just wants the listing on trac. Linking it from the landing page so students can find it. Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2012-03-03 12:25:15 UTC (rev 25500) +++ website/trunk/about/en/gsoc.wml 2012-03-03 19:47:35 UTC (rev 25501) @@ -94,9 +94,11 @@ <h2><a class="anchor" href="#Ideas">Ideas List</a></h2> <p> - To start with, please see our <b><a href="<page + To start with, please see Tor's <b><a href="<page getinvolved/volunteer>#Projects">projects page</a></b> and its following - ideas. + ideas. There are also <b><a + href="https://trac.torproject.org/projects/tor/wiki/doc/HTTPSEverywhere/GSOC-2012">projects + available</a></b> for the EFF's HTTPS Everywhere plugin. </p> <p>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 03 Mar '12

03 Mar '12

commit 0a7ce86ddd9da1f51b2f3b1b4fbb5d49f297ec12 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 3 17:45:05 2012 +0000 Update translations for orbot --- values-fr/strings.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index e28dcce..4ec275c 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -69,7 +69,7 @@ <string name="wizard_configure_all">Toutes les applications par Tor</string> <string name="wizard_configure_select_apps">Choisir les applications utilisant Tor</string> <string name="wizard_tips_tricks">Applications avec Orbot</string> - <string name="wizard_tips_msg">Nous vous encouragons à télécharger &amp; utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string> + <string name="wizard_tips_msg">Nous vous encouragons à télécharger & utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string> <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string> <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> @@ -97,7 +97,7 @@ <string name="wizard_tips_title">Applications Orbot</string> <string name="wizard_tips_gibberbot">Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string> + <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> <string name="wizard_transproxy_title">Proxy transparent</string> <string name="wizard_transproxy_msg">Cela permet à vos applications d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string> @@ -200,6 +200,6 @@ <string name="default_bridges"></string> <string name="set_locale_title">Set Locale</string> <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> + <string name="wizard_locale_title">Choisir la langue</string> <string name="wizard_locale_msg">Leave default or switch the current language</string> </resources>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 03 Mar '12

03 Mar '12

commit 8706140744b9ef8356dc118fb0117e366035f0c0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 3 13:15:09 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index 3e973b7..128383a 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-03 12:43+0000\n" +"PO-Revision-Date: 2012-03-03 13:07+0000\n" "Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3124,23 +3124,23 @@ msgstr "" msgctxt "ServicePage" msgid "Virtual Port may only contain valid port numbers [1..65535]." -msgstr "" +msgstr "Virtuálny port môže obsahovať iba povole čísla portov [1..65535]." msgctxt "ServicePage" msgid "Target may only contain address:port, address, or port." -msgstr "" +msgstr "Cieľ môže obsahovať iba adresu:port, adresu alebo port." msgctxt "ServicePage" msgid "Directory already in use by another service." -msgstr "" +msgstr "Adresár už používa iná služba." msgctxt "ServicePage" msgid "Form" -msgstr "" +msgstr "Formulár" msgctxt "ServicePage" msgid "Provided Hidden Services" -msgstr "" +msgstr "Poskytované skryté služby" msgctxt "ServicePage" msgid "Onion Address" @@ -3156,7 +3156,7 @@ msgstr "Cieľ" msgctxt "ServicePage" msgid "Directory Path" -msgstr "" +msgstr "Cesta k adresáru" msgctxt "ServicePage" msgid "Enabled" @@ -3172,11 +3172,11 @@ msgstr "Odstrániť vybranú službu zo zoznamu" msgctxt "ServicePage" msgid "Copy onion address of selected service to clipboard" -msgstr "" +msgstr "Kopírovať onion adresu vybranej služby do schránky" msgctxt "ServicePage" msgid "Browse in local file system and choose directory for selected service" -msgstr "" +msgstr "Prehľadajte lokálny súborový systém a vyberte adresár pre vybratú službu" msgctxt "ServicePage" msgid "Created by Tor" @@ -3233,7 +3233,7 @@ msgctxt "StatusEventWidget" msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." -msgstr "" +msgstr "Úspešne sa podarilo pripojiť k sieti Tor. " msgctxt "StatusEventWidget" msgid "Tor Software Error" @@ -3433,7 +3433,7 @@ msgstr "Nový" msgctxt "Stream" msgid "Resolving" -msgstr "" +msgstr "Resolving" msgctxt "Stream" msgid "Connecting" @@ -3453,11 +3453,11 @@ msgstr "Zatvoriť" msgctxt "Stream" msgid "Retrying" -msgstr "" +msgstr "Opakovať" msgctxt "Stream" msgid "Remapped" -msgstr "" +msgstr "Remapped" msgctxt "Stream" msgid "Unknown" @@ -3735,7 +3735,7 @@ msgstr "" msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's pidfile." -msgstr "" +msgstr "Nastaviť názov a umiestnenie pre Vidalia pidfile." msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's logfile." @@ -3782,7 +3782,7 @@ msgid "" "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n" "\n" "Would you like to continue starting Vidalia?" -msgstr "" +msgstr "Pravdepodobne beží ďalší proces Vidalia. Pokiaľ ďalší proces Vidalia nebeží, tak môžete pokračovať ďalej.\n\nPrajete si aj tak spustiť Vidalia?" msgctxt "stringutil.h" msgid "%1 secs"

1 0