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

[translation/gettor] Update translations for gettor
by translation＠torproject.org 27 Oct '13

27 Oct '13

commit 00c41a1c9ecb77698fa13a98b6b4b82d11ccbda1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 27 08:15:04 2013 +0000 Update translations for gettor --- ca/gettor.po | 504 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 504 insertions(+) diff --git a/ca/gettor.po b/ca/gettor.po new file mode 100644 index 0000000..8643a5b --- /dev/null +++ b/ca/gettor.po @@ -0,0 +1,504 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Illenc <provisionalib(a)hotmail.com>, 2013 +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-01-19 13:40+0100\n" +"PO-Revision-Date: 2013-10-27 08:10+0000\n" +"Last-Translator: Illenc <provisionalib(a)hotmail.com>\n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "Només s'accepten peticions de serveis de correu que suporten \"DKIM\",\nuna característica de correu que permet de verificar que l'adreça al camp \"De\"\nés realment des d'on sha enviat el correu." + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" obfs-windows\n" +" obfs-macos-i386\n" +" obfs-macos-x86_64\n" +" obfs-linux-i386\n" +" obfs-linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:61 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:64 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:72 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:76 +msgid " List of supported locales:" +msgstr "Llista de localitzacions actuals:" + +#: lib/gettor/i18n.py:78 +msgid "Here is a list of all available languages:" +msgstr "Llistat de totes les llengües disponibles:" + +#: lib/gettor/i18n.py:80 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "gettor+ar(a)torproject.org: Àrab⏎\ngettor+de(a)torproject.org: Alemany⏎\ngettor+en(a)torproject.org: Anglès⏎\ngettor+es(a)torproject.org: Castellà⏎\ngettor+fa(a)torproject.org: Farsi (Iran)⏎\ngettor+fr(a)torproject.org: Francès⏎\ngettor+it(a)torproject.org: Italià⏎\ngettor+nl(a)torproject.org: Holandès⏎\ngettor+pl(a)torproject.org: Polonès⏎\ngettor+ru(a)torproject.org: Rus⏎\ngettor+zh(a)torproject.org: Xinès" + +#: lib/gettor/i18n.py:92 +msgid "If you select no language, you will receive the English version." +msgstr "Si no es tria llengua, s'aplicarà l'anglès." + +#: lib/gettor/i18n.py:94 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:97 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:101 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:107 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "Enviant aquest text al correu GetTo, rebràs\n el navegador Tor Bundle en forma d'adjunt de 1,4 MB." + +#: lib/gettor/i18n.py:110 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "Després de rebre totes les parts, les heu d'unir en un\npaquet. Això és fa així:" + +#: lib/gettor/i18n.py:113 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "1.) Desau tots els fitxers adjunts en una carpeta o al disc." + +#: lib/gettor/i18n.py:115 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:119 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "3.) Verifiqueu tots els fitxers com \nes descriu al correu. (gpg--verify)" + +#: lib/gettor/i18n.py:122 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:126 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "5.) Un cop descomprimits, hauríeu e trobar un nou arxiu \".exe\" \nal directori destí. Clicau-lo i el navegador Tor Bundle \ns'iniciarà passats uns segons." + +#: lib/gettor/i18n.py:130 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "6.) Procès complet. Gràcies per usar Tor." + +#: lib/gettor/i18n.py:132 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:138 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:141 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:148 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:157 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:160 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "Si el vostre navegador bloqueka l'accés a la xarxa Tor, \nnecessitareu crear un pont. Els Ponts (Bridge Relay)\nno apareixen als llistats del directori principal. \nCom que no existeix un llistat publicat complet, encara que\n el vostre proveïdor filtri conexions conegudes de Tor, \nprobablement no bloquegi tots els ponts." + +#: lib/gettor/i18n.py:167 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:172 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "Tambe podeu trobar més ponts a \nurl: https://bridges.torproject.org/" + +#: lib/gettor/i18n.py:175 +msgid "" +"Another censorship circumvention tool you can request from GetTor is\n" +"the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n" +"which package you should request to receive this." +msgstr "" + +#: lib/gettor/i18n.py:179 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:188 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:191 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:194 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:197 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:211 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:214 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:219 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:227 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:231 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:244 +msgid "" +"obfs-windows:\n" +"The Tor Obfsproxy Browser Bundle for Windows operating systems. If you need\n" +"strong censorship circumvention and you are running some version of the \n" +"Windows, like Windows XP, Windows Vista or Windows 7, this is the package\n" +"you should get." +msgstr "" + +#: lib/gettor/i18n.py:250 +msgid "" +"obfs-macos-i386:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:254 +msgid "" +"obfs-macos-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:258 +msgid "" +"obfs-linux-i386:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:262 +msgid "" +"obfs-linux-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:266 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:269 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:274 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:276 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:286 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:288 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:292 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:294 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:299 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:301 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:303 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:305 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 27 Oct '13

27 Oct '13

commit c7caa96d15d1f9e9141d77d09b5c15ec0695f44b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 27 06:16:02 2013 +0000 Update translations for mat-gui --- hi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hi.po b/hi.po index b073e09..a6e8c4c 100644 --- a/hi.po +++ b/hi.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-10-27 05:44+0000\n" +"PO-Revision-Date: 2013-10-27 05:50+0000\n" "Last-Translator: meghana <meghana.cse11(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 27 Oct '13

27 Oct '13

commit 91171eb7f7e39b61dde67b5dcc8d7d9dba6ff6a7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 27 05:46:05 2013 +0000 Update translations for mat-gui --- hi.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hi.po b/hi.po index ff697e2..b073e09 100644 --- a/hi.po +++ b/hi.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# meghana <meghana.cse11(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-09-17 13:13+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-27 05:44+0000\n" +"Last-Translator: meghana <meghana.cse11(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +20,15 @@ msgstr "" #: mat-gui:65 mat-gui:375 mat-gui:387 msgid "Ready" -msgstr "" +msgstr "तय्यार" #: mat-gui:134 msgid "Choose files" -msgstr "" +msgstr "फ़ैल को चुने" #: mat-gui:141 msgid "All files" -msgstr "" +msgstr " सारे फ़ैल" #: mat-gui:148 msgid "Supported files" @@ -39,7 +40,7 @@ msgstr "" #: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 msgid "Clean" -msgstr "" +msgstr "साफ़ करो" #: mat-gui:167 mat-gui:372 msgid "Dirty" @@ -60,7 +61,7 @@ msgstr "" #: mat-gui:214 data/mat.ui:107 msgid "Preferences" -msgstr "" +msgstr "पसंद " #: mat-gui:228 msgid "Reduce PDF quality" @@ -92,7 +93,7 @@ msgstr "" #: mat-gui:354 data/mat.ui:291 msgid "Filename" -msgstr "" +msgstr " फ़ैल का नाम" #: mat-gui:356 msgid "Mimetype" @@ -130,15 +131,15 @@ msgstr "" #: data/mat.ui:214 msgid "Add" -msgstr "" +msgstr "डालो" #: data/mat.ui:240 msgid "Check" -msgstr "" +msgstr "जाँचना" #: data/mat.ui:308 msgid "State" -msgstr "" +msgstr "स्थिति" #: data/mat.ui:346 data/mat.ui:495 msgid "Metadata" @@ -154,7 +155,7 @@ msgstr "" #: data/mat.ui:448 msgid "Supported formats" -msgstr "" +msgstr "सहयोगित बाह्य रूप" #: data/mat.ui:482 msgid "Support"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Oct '13

27 Oct '13

commit 99446fa03256844e11bc1657cf6895fade66b184 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 27 05:45:51 2013 +0000 Update translations for https_everywhere --- hi/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd index b73224d..50abcbb 100644 --- a/hi/https-everywhere.dtd +++ b/hi/https-everywhere.dtd @@ -31,7 +31,7 @@ <!ENTITY https-everywhere.prefs.view_xml_source ""> <!ENTITY https-everywhere.source.downloading ""> -<!ENTITY https-everywhere.source.filename ""> +<!ENTITY https-everywhere.source.filename " फ़ैल का नाम"> <!ENTITY https-everywhere.source.unable_to_download ""> <!ENTITY https-everywhere.popup.title "">

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Oct '13

27 Oct '13

commit d6bfe0e31f2a4e9868fac7bbefe604daacce726f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 27 05:45:08 2013 +0000 Update translations for orbot --- values-hi/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/values-hi/strings.xml b/values-hi/strings.xml index 730f408..68013a5 100644 --- a/values-hi/strings.xml +++ b/values-hi/strings.xml @@ -5,6 +5,7 @@ <string name="menu_info">मदद</string> <string name="button_help">मदद</string> <string name="button_close">बंद करें </string> + <string name="menu_verify">जाँचना</string> <string name="btn_back">वापस</string> <string name="btn_cancel">रद्द करें </string>

1 0

[stem/master] Testing interpretor-style examples in our pydocs
by atagar＠torproject.org 27 Oct '13

27 Oct '13

commit 10d1423d93bc68114ed22d909e17e96aca621bbe Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 26 20:18:59 2013 -0700 Testing interpretor-style examples in our pydocs Using python's doctest module to test interpretor examples (those with '>>>'). Unfortunately this doesn't include sphinx code blocks (those started with a '::') nor some of our examples that aren't easy to mock. --- stem/descriptor/router_status_entry.py | 3 ++- stem/exit_policy.py | 4 +-- stem/util/connection.py | 5 ++-- stem/util/str_tools.py | 6 +++++ stem/version.py | 2 +- test/settings.cfg | 1 + test/unit/doctest.py | 43 ++++++++++++++++++++++++++++++++ 7 files changed, 58 insertions(+), 6 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 4018b22..6622b72 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -699,7 +699,8 @@ def _base64_to_hex(identity, validate, check_if_fingerprint = True): :: - >>> _base64_to_hex('p1aag7VwarGxqctS7/fS0y5FU+s') + >>> from stem.descriptor.router_status_entry import _base64_to_hex + >>> _base64_to_hex('p1aag7VwarGxqctS7/fS0y5FU+s', True) 'A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB' :param str identity: encoded fingerprint from the consensus diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 0f033de..4664c57 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -228,11 +228,11 @@ class ExitPolicy(object): >>> policy = ExitPolicy('accept *:80', 'accept *:443', 'reject *:*') >>> policy.summary() - "accept 80, 443" + 'accept 80, 443' >>> policy = ExitPolicy('accept *:443', 'reject *:1-1024', 'accept *:*') >>> policy.summary() - "reject 1-442, 444-1024" + 'reject 1-442, 444-1024' :returns: **str** with a concise summary for our policy """ diff --git a/stem/util/connection.py b/stem/util/connection.py index d21ab0d..6e87f94 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -403,11 +403,12 @@ def expand_ipv6_address(address): :: + >>> from stem.util.connection import expand_ipv6_address >>> expand_ipv6_address("2001:db8::ff00:42:8329") - "2001:0db8:0000:0000:0000:ff00:0042:8329" + '2001:0db8:0000:0000:0000:ff00:0042:8329' >>> expand_ipv6_address("::") - "0000:0000:0000:0000:0000:0000:0000:0000" + '0000:0000:0000:0000:0000:0000:0000:0000' :param str address: IPv6 address to be expanded diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 33d5e1b..100bd0c 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -109,6 +109,7 @@ def _to_camel_case(label, divider = "_", joiner = " "): :: + >>> from stem.util.str_tools import _to_camel_case >>> _to_camel_case("I_LIKE_PEPPERJACK!") 'I Like Pepperjack!' @@ -141,6 +142,7 @@ def get_size_label(byte_count, decimal = 0, is_long = False, is_bytes = True): :: + >>> from stem.util.str_tools import get_size_label >>> get_size_label(2000000) '1 MB' @@ -176,6 +178,7 @@ def get_time_label(seconds, decimal = 0, is_long = False): :: + >>> from stem.util.str_tools import get_time_label >>> get_time_label(10000) '2h' @@ -203,6 +206,7 @@ def get_time_labels(seconds, is_long = False): :: + >>> from stem.util.str_tools import get_time_labels >>> get_time_labels(400) ['6m', '40s'] @@ -232,6 +236,7 @@ def get_short_time_label(seconds): :: + >>> from stem.util.str_tools import get_short_time_label >>> get_short_time_label(111) '01:51' @@ -273,6 +278,7 @@ def parse_short_time_label(label): :: + >>> from stem.util.str_tools import parse_short_time_label >>> parse_short_time_label('01:51') 111 diff --git a/stem/version.py b/stem/version.py index 44f1d02..5efc1e0 100644 --- a/stem/version.py +++ b/stem/version.py @@ -11,7 +11,7 @@ easily parsed and compared, for instance... >>> my_version = get_system_tor_version() >>> print my_version 0.2.1.30 - >>> my_version >= Requirement.CONTROL_SOCKET + >>> my_version >= Requirement.TORRC_CONTROL_SOCKET True **Module Overview:** diff --git a/test/settings.cfg b/test/settings.cfg index 222a7a4..9717d24 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -184,6 +184,7 @@ test.unit_tests |test.unit.response.mapaddress.TestMapAddressResponse |test.unit.connection.authentication.TestAuthenticate |test.unit.control.controller.TestControl +|test.unit.doctest.TestDocumentation test.integ_tests |test.integ.util.conf.TestConf diff --git a/test/unit/doctest.py b/test/unit/doctest.py new file mode 100644 index 0000000..cae58a7 --- /dev/null +++ b/test/unit/doctest.py @@ -0,0 +1,43 @@ +""" +Tests examples from our documentation. +""" + +from __future__ import absolute_import + +import doctest +import os +import unittest + +import stem.version + +import test.util + +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + + +class TestDocumentation(unittest.TestCase): + def test_examples(self): + cwd = os.getcwd() + + for path in test.util._get_files_with_suffix(os.path.join(test.util.STEM_BASE, 'stem')): + path = '../../' + path[len(cwd) + 1:] + test_run = None + + if path.endswith('/stem/util/conf.py'): + pass # too much context to easily test + elif path.endswith('/stem/response/__init__.py'): + pass # the escaped slashes seem to be confusing doctest + elif path.endswith('/stem/control.py'): + pass # examples refrence a control instance + elif path.endswith('/stem/version.py'): + with patch('stem.version.get_system_tor_version', Mock(return_value = stem.version.Version('0.2.1.30'))): + test_run = doctest.testfile(path) + else: + test_run = doctest.testfile(path) + + if test_run and test_run.failed > 0: + self.fail()

1 0

[flashproxy/master] Don't rebuild man pages with "make dist".
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit 51be3973efb1fbdf2614fb70e00ec3e63ad3656d Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 18:17:32 2013 -0700 Don't rebuild man pages with "make dist". This often caused a problem when making bundles, when unpredictable timestamps after cloning would sometimes cause the man pages to appear to be out of date. Then the whole build would stop, failing to find the necessary a2x binary. kpdyer reported this problem in #9940. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 86176d5..f8950aa 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ install: DISTNAME = flashproxy-client-$(VERSION) DISTDIR = dist/$(DISTNAME) -dist: $(CLIENT_MAN) +dist: rm -rf dist mkdir -p $(DISTDIR) mkdir $(DISTDIR)/doc @@ -50,7 +50,6 @@ $(PY2EXE_TMPDIR)/dist: $(CLIENT_BIN) dist-exe: DISTNAME := $(DISTNAME)-win32 dist-exe: CLIENT_BIN := $(PY2EXE_TMPDIR)/dist/* -dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) # Delegate to the "dist" target using the substitutions above. dist-exe: $(PY2EXE_TMPDIR)/dist setup.py dist

1 0

[flashproxy/master] Remove ":" command.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit 417007963ca52ca0ba0bc8f56e4ad1632accc3d6 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 18:32:12 2013 -0700 Remove ":" command. Not sure why it was like this. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index f8950aa..19e6005 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,6 @@ CLIENT_DIST_FILES = $(CLIENT_BIN) Makefile README LICENSE ChangeLog torrc CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) all: $(CLIENT_DIST_FILES) $(CLIENT_MAN) - : %.1: %.1.txt rm -f $@

1 0

[websocket/master] fmt.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit c5532ce7dd04a800063e1723e60fe123f6d5b985 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 17:21:01 2013 -0700 fmt. --- src/pt/pt_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pt/pt_test.go b/src/pt/pt_test.go index baece70..3cf5ed5 100644 --- a/src/pt/pt_test.go +++ b/src/pt/pt_test.go @@ -12,7 +12,7 @@ func stringIsSafe(s string) bool { } func TestEscape(t *testing.T) { - tests := [...]string { + tests := [...]string{ "", "abc", "a\nb", @@ -22,7 +22,7 @@ func TestEscape(t *testing.T) { "ab\n\\", } - check := func (input string) { + check := func(input string) { output := escape(input) if !stringIsSafe(output) { t.Errorf("escape(%q) → %q", input, output)

1 0

[websocket/master] Fix typos in server example.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit cf2bb29d664de3aa45dd679607056a94cb43ed91 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 16:54:37 2013 -0700 Fix typos in server example. --- src/pt/pt.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pt/pt.go b/src/pt/pt.go index 0994131..9ff9437 100644 --- a/src/pt/pt.go +++ b/src/pt/pt.go @@ -15,9 +15,9 @@ // // import "git.torproject.org/pluggable-transports/websocket.git/src/pt" // var ptInfo pt.ServerInfo -// info = pt.ServerSetup([]string{"foo", "bar"}) -// for _, bindAddr := range info.BindAddrs { -// ln, err := startListener(bindAddr.Addr) +// ptInfo = pt.ServerSetup([]string{"foo", "bar"}) +// for _, bindAddr := range ptInfo.BindAddrs { +// ln, err := startListener(bindAddr.Addr, bindAddr.MethodName) // if err != nil { // pt.SmethodError(bindAddr.MethodName, err.Error()) // continue @@ -25,7 +25,7 @@ // pt.Smethod(bindAddr.MethodName, ln.Addr()) // } // pt.SmethodsDone() -// func handler(conn net.Conn, methodName) { +// func handler(conn net.Conn, methodName string) { // or, err := pt.ConnectOr(&ptInfo, conn, methodName) // if err != nil { // return

1 0