Author: runa Date: 2011-09-21 19:10:46 +0000 (Wed, 21 Sep 2011) New Revision: 25094 Modified: translation/trunk/projects/website/po/templates/about/3-low.contact.pot translation/trunk/projects/website/po/templates/about/3-low.financials.pot translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot translation/trunk/projects/website/po/templates/docs/3-low.rpms.pot translation/trunk/projects/website/po/templates/download/3-low.download.pot Log: updated translation templates for the website Modified: translation/trunk/projects/website/po/templates/about/3-low.contact.pot =================================================================== --- translation/trunk/projects/website/po/templates/about/3-low.contact.pot 2011-09-21 17:23:59 UTC (rev 25093) +++ translation/trunk/projects/website/po/templates/about/3-low.contact.pot 2011-09-21 19:10:46 UTC (rev 25094) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"POT-Creation-Date: 2011-09-21 20:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -44,20 +44,27 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/about/en/contact.wml:24 msgid "" +"<i>community-support at lists.torproject.org</i> is for volunteers helping " +"people with questions about using or configuring Tor." +msgstr "" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/about/en/contact.wml:27 +msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:27 +#: /home/runa/tor/website/about/en/contact.wml:30 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:29 +#: /home/runa/tor/website/about/en/contact.wml:32 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -66,7 +73,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:34 +#: /home/runa/tor/website/about/en/contact.wml:37 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -75,43 +82,43 @@ msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/about/en/contact.wml:40 +#: /home/runa/tor/website/about/en/contact.wml:43 msgid "Identi.ca" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:41 +#: /home/runa/tor/website/about/en/contact.wml:44 msgid "" "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " "at <a href=\"https://identi.ca/torproject\">torproject</a>." msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/about/en/contact.wml:45 +#: /home/runa/tor/website/about/en/contact.wml:48 msgid "IRC" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:46 +#: /home/runa/tor/website/about/en/contact.wml:49 msgid "<a id=\"irc\"></a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:47 +#: /home/runa/tor/website/about/en/contact.wml:50 msgid "" "Tor users and developers can also be found in the following channels on <a " "href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:51 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:54 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " "Discussions about Tor-related coding, protocols, and <a href=\"<page " @@ -119,25 +126,26 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:57 +#: /home/runa/tor/website/about/en/contact.wml:60 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:64 msgid "Telephone" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:62 +#: /home/runa/tor/website/about/en/contact.wml:65 msgid "<a id=\"phone\"></a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:63 +#: /home/runa/tor/website/about/en/contact.wml:66 msgid "" "If none of the above appeal to you, calling +1-781-352-0568 will reach the " -"Tor office. Should there be no answer, please leave a message." +"Tor office. Should there be no answer, please leave a message with a way to " +"reach you." msgstr "" Modified: translation/trunk/projects/website/po/templates/about/3-low.financials.pot =================================================================== --- translation/trunk/projects/website/po/templates/about/3-low.financials.pot 2011-09-21 17:23:59 UTC (rev 25093) +++ translation/trunk/projects/website/po/templates/about/3-low.financials.pot 2011-09-21 19:10:46 UTC (rev 25094) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"POT-Creation-Date: 2011-09-21 20:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,72 +17,84 @@ "Content-Transfer-Encoding: 8bit\n" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/financials.wml:9 +#: /home/runa/tor/website/about/en/financials.wml:9 msgid "" "<a href=\"<page index>\">Home » </a> <a href=\"<page about/overview>" "\">About » </a> <a href=\"<page about/financials>\">Financials</a>" msgstr "" #. type: Content of: <div><div><h1> -#: /home/runa/transifex/website/about/en/financials.wml:14 +#: /home/runa/tor/website/about/en/financials.wml:14 msgid "Tor: Financial Reports" msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/transifex/website/about/en/financials.wml:16 +#: /home/runa/tor/website/about/en/financials.wml:16 +msgid "Fiscal Year 2010" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/financials.wml:17 +msgid "" +"<a href=\"findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf" +"\">2010 IRS Form 990, State of MA Form PC, and Independent Audit Results</a>" +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/financials.wml:18 msgid "Fiscal Year 2009" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/transifex/website/about/en/financials.wml:17 +#: /home/runa/tor/website/about/en/financials.wml:19 msgid "" "<a href=\"findoc/2009-TorProject-Annual-Report.pdf\">2009 Annual Report</a>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/transifex/website/about/en/financials.wml:18 +#: /home/runa/tor/website/about/en/financials.wml:20 msgid "" "<a href=\"findoc/2009-TorProject-Form990andPC.pdf\">2009 IRS Form 990 and " "State of MA Form PC</a>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/transifex/website/about/en/financials.wml:19 +#: /home/runa/tor/website/about/en/financials.wml:21 msgid "" "<a href=\"findoc/2009-TorProject-FinancialStatements.pdf\">2009 Financial " "Statements and Audit results</a>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/transifex/website/about/en/financials.wml:20 +#: /home/runa/tor/website/about/en/financials.wml:22 msgid "" "<a href=\"findoc/2009-TorProject-DCF.pdf\">2009 Dept of Commerce Data " "Collection Form</a>" msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/transifex/website/about/en/financials.wml:21 +#: /home/runa/tor/website/about/en/financials.wml:23 msgid "Fiscal Year 2008" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/transifex/website/about/en/financials.wml:22 +#: /home/runa/tor/website/about/en/financials.wml:24 msgid "<a href=\"findoc/2008-TorProject-Form990.pdf\">2008 IRS Form 990</a>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/transifex/website/about/en/financials.wml:23 +#: /home/runa/tor/website/about/en/financials.wml:25 msgid "" "<a href=\"findoc/2008-TorProject-FinancialStatements.pdf\">2008 Financial " "Statements and Audit Results</a>" msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/transifex/website/about/en/financials.wml:24 +#: /home/runa/tor/website/about/en/financials.wml:26 msgid "Fiscal Year 2007" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/transifex/website/about/en/financials.wml:25 +#: /home/runa/tor/website/about/en/financials.wml:27 msgid "<a href=\"findoc/2007-TorProject-Form990.pdf\">2007 IRS Form 990</a>" msgstr "" Modified: translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot 2011-09-21 17:23:59 UTC (rev 25093) +++ translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot 2011-09-21 19:10:46 UTC (rev 25094) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-08-30 08:50+0200\n" +"POT-Creation-Date: 2011-09-21 20:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,7 +30,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669 +#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670 msgid "<hr>" msgstr "" @@ -1092,17 +1092,18 @@ "Some government or corporate firewalls censor connections to Tor's website. " "In those cases, you have three options. First, get it from a friend — " "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits " -"nicely on a USB key. Second, find the google cache for the <a href=\"<page " -"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies " -"of our website work for you. Third, you can download Tor via email: log in " -"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you " -"include the word 'help' in the body of the email, it will reply with " -"instructions. Note that only a few webmail providers are supported, since " -"they need to be able to receive very large attachments." +"nicely on a USB key. Second, find the <a href=\"https://encrypted.google.com/" +"search?q=tor+mirrors\">google cache</a> for the <a href=\"<page getinvolved/" +"mirrors>\">Tor mirrors</a> page and see if any of those copies of our " +"website work for you. Third, you can download Tor via email: log in to your " +"Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you include " +"the word 'help' in the body of the email, it will reply with instructions. " +"Note that only a few webmail providers are supported, since they need to be " +"able to receive very large attachments." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:669 +#: /home/runa/tor/website/docs/en/faq.wml:670 msgid "" "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the " "signature</a> of any package you download, especially when you get it from " @@ -1110,26 +1111,26 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:674 +#: /home/runa/tor/website/docs/en/faq.wml:675 msgid "<hr> <a id=\"CompileTorWindows\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:677 +#: /home/runa/tor/website/docs/en/faq.wml:678 msgid "" "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under " "Windows?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:680 +#: /home/runa/tor/website/docs/en/faq.wml:681 msgid "" "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-creation." "txt\"> tor-win32-mingw-creation.txt</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:685 +#: /home/runa/tor/website/docs/en/faq.wml:686 msgid "" "(Note that you don't need to compile Tor yourself in order to use it. Most " "people just use the packages available on the <a href=\"<page download/" @@ -1137,19 +1138,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:690 +#: /home/runa/tor/website/docs/en/faq.wml:691 msgid "<hr> <a id=\"VirusFalsePositives\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:693 +#: /home/runa/tor/website/docs/en/faq.wml:694 msgid "" "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable " "appear to have a virus or spyware?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:696 +#: /home/runa/tor/website/docs/en/faq.wml:697 msgid "" "Sometimes, overzealous Windows virus and spyware detectors trigger on some " "parts of the Tor Windows binary. Our best guess is that these are false " @@ -1160,7 +1161,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:704 +#: /home/runa/tor/website/docs/en/faq.wml:705 msgid "" "In the meantime, we encourage you to not just take our word for it. Our job " "is to provide the source; if you're concerned, please do <a href=" @@ -1168,19 +1169,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:709 +#: /home/runa/tor/website/docs/en/faq.wml:710 msgid "<hr> <a id=\"LiveCD\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:712 +#: /home/runa/tor/website/docs/en/faq.wml:713 msgid "" "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that " "includes Tor?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:715 +#: /home/runa/tor/website/docs/en/faq.wml:716 msgid "" "Yes. Use <a href=\"https://tails.boum.org/\">The Amnesic Incognito Live " "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser Bundle</" @@ -1188,19 +1189,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:720 +#: /home/runa/tor/website/docs/en/faq.wml:721 msgid "<hr> <a id=\"torrc\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:723 +#: /home/runa/tor/website/docs/en/faq.wml:724 msgid "" "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What " "does that mean?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:726 +#: /home/runa/tor/website/docs/en/faq.wml:727 msgid "" "Tor installs a text file called torrc that contains configuration " "instructions for how your Tor program should behave. The default " @@ -1210,12 +1211,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:734 +#: /home/runa/tor/website/docs/en/faq.wml:735 msgid "The location of your torrc file depends on the way you installed Tor:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:738 +#: /home/runa/tor/website/docs/en/faq.wml:739 msgid "" "On Windows, if you installed a Tor bundle with Vidalia, you can find your " "torrc file in the Start menu under Programs -> Vidalia Bundle -> Tor, " @@ -1228,14 +1229,14 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:747 +#: /home/runa/tor/website/docs/en/faq.wml:748 msgid "" "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, " "open your favorite text editor and load <code>/Library/Tor/torrc</code>." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:751 +#: /home/runa/tor/website/docs/en/faq.wml:752 msgid "" "On Unix, if you installed a pre-built package, look for <code>/etc/tor/" "torrc</code> or <code>/etc/torrc</code> or consult your package's " @@ -1243,7 +1244,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:755 +#: /home/runa/tor/website/docs/en/faq.wml:756 msgid "" "Finally, if you installed from source, you may not have a torrc installed " "yet: look in <code>/usr/local/etc/</code> and note that you may need to " @@ -1251,14 +1252,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:762 +#: /home/runa/tor/website/docs/en/faq.wml:763 msgid "" "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit " "your torrc file. Otherwise Vidalia might overwrite your changes." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:767 +#: /home/runa/tor/website/docs/en/faq.wml:768 msgid "" "Once you've changed your torrc, you will need to restart Tor for the changes " "to take effect. (For advanced users on OS X and Unix, note that you actually " @@ -1266,7 +1267,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:773 +#: /home/runa/tor/website/docs/en/faq.wml:774 msgid "" "For other configuration options you can use, look at the <a href=\"<page " "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with # " @@ -1274,19 +1275,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:779 +#: /home/runa/tor/website/docs/en/faq.wml:780 msgid "<hr> <a id=\"Logs\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:782 +#: /home/runa/tor/website/docs/en/faq.wml:783 msgid "" "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's " "logs?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:785 +#: /home/runa/tor/website/docs/en/faq.wml:786 msgid "" "If you installed a Tor bundle that includes Vidalia, then Vidalia has a " "window called \"Message Log\" that will show you Tor's log messages. You can " @@ -1295,19 +1296,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:792 +#: /home/runa/tor/website/docs/en/faq.wml:793 msgid "" "If you're not using Vidalia, you'll have to go find the log files by hand. " "Here are some likely places for your logs to be:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:797 +#: /home/runa/tor/website/docs/en/faq.wml:798 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:799 +#: /home/runa/tor/website/docs/en/faq.wml:800 msgid "" "On Windows, there are no default log files currently. If you enable logs in " "your torrc file, they default to <code>\\username\\Application Data\\tor\\log" @@ -1315,7 +1316,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:803 +#: /home/runa/tor/website/docs/en/faq.wml:804 msgid "" "If you compiled Tor from source, by default your Tor logs to <a href=" "\"http://en.wikipedia.org/wiki/Standard_streams\">\"stdout\"</a> at log-" @@ -1324,7 +1325,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:811 +#: /home/runa/tor/website/docs/en/faq.wml:812 msgid "" "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a> " "and find the section (near the top of the file) which contains the following " @@ -1332,7 +1333,7 @@ msgstr "" #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/faq.wml:817 +#: /home/runa/tor/website/docs/en/faq.wml:818 #, no-wrap msgid "" "\\## Logs go to stdout at level \"notice\" unless redirected by something\n" @@ -1340,7 +1341,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:822 +#: /home/runa/tor/website/docs/en/faq.wml:823 msgid "" "For example, if you want Tor to send complete debug, info, notice, warn, and " "err level messages to a file, append the following line to the end of the " @@ -1348,32 +1349,32 @@ msgstr "" #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/faq.wml:828 +#: /home/runa/tor/website/docs/en/faq.wml:829 #, no-wrap msgid "Log debug file c:/program files/tor/debug.log\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:832 +#: /home/runa/tor/website/docs/en/faq.wml:833 msgid "" "Replace <code>c:/program files/tor/debug.log</code> with a directory and " "filename for your Tor log." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:836 +#: /home/runa/tor/website/docs/en/faq.wml:837 msgid "<hr> <a id=\"DoesntWork\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:839 +#: /home/runa/tor/website/docs/en/faq.wml:840 msgid "" "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's " "not working.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:842 +#: /home/runa/tor/website/docs/en/faq.wml:843 msgid "" "Once you've installed the Tor bundle, there are two questions to ask: first, " "is your Tor able to establish a circuit? Second, is your Firefox correctly " @@ -1381,7 +1382,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:847 +#: /home/runa/tor/website/docs/en/faq.wml:848 msgid "" "If Tor can establish a circuit, the onion icon in Vidalia will turn green. " "You can also check in the Vidalia Control Panel to make sure it says " @@ -1391,19 +1392,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:857 +#: /home/runa/tor/website/docs/en/faq.wml:858 msgid "If Tor can't establish a circuit, here are some hints:" msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:861 +#: /home/runa/tor/website/docs/en/faq.wml:862 msgid "" "Are you sure Tor is running? If you're using Vidalia, you may have to click " "on the onion and select \"Start\" to launch Tor." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:863 +#: /home/runa/tor/website/docs/en/faq.wml:864 msgid "" "Check your system clock. If it's more than a few hours off, Tor will refuse " "to build circuits. For XP users, synchronize your clock under the clock -" @@ -1412,7 +1413,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:867 +#: /home/runa/tor/website/docs/en/faq.wml:868 msgid "" "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by port</" "a>, or do you normally need to use a <a href=" @@ -1420,7 +1421,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:872 +#: /home/runa/tor/website/docs/en/faq.wml:873 msgid "" "Are you running programs like Norton Internet Security or SELinux that block " "certain connections, even though you don't realize they do? They could be " @@ -1428,7 +1429,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:875 +#: /home/runa/tor/website/docs/en/faq.wml:876 msgid "" "Are you in China, or behind a restrictive corporate network firewall that " "blocks the public Tor relays? If so, you should learn about <a href=\"<page " @@ -1436,14 +1437,14 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:878 +#: /home/runa/tor/website/docs/en/faq.wml:879 msgid "" "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about " "what's going wrong?" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:883 +#: /home/runa/tor/website/docs/en/faq.wml:884 msgid "" "Step two is to confirm that Firefox is correctly configured to send its " "traffic through Tor. Try the <a href=\"https://check.torproject.org/\">Tor " @@ -1453,12 +1454,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:891 +#: /home/runa/tor/website/docs/en/faq.wml:892 msgid "If it thinks you're not using Tor, here are some hints:" msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:895 +#: /home/runa/tor/website/docs/en/faq.wml:896 msgid "" "Did you install the Torbutton extension for Firefox? The installation " "bundles include it, but sometimes people forget to install it. Make sure it " @@ -1467,7 +1468,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:900 +#: /home/runa/tor/website/docs/en/faq.wml:901 msgid "" "Do you have incompatible Firefox extensions like FoxyProxy installed? If so, " "uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute " @@ -1478,7 +1479,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:907 +#: /home/runa/tor/website/docs/en/faq.wml:908 msgid "" "If your browser says \"The proxy server is refusing connections.\", check " "that Polipo (the http proxy that passes traffic between Firefox and Tor) is " @@ -1488,7 +1489,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:912 +#: /home/runa/tor/website/docs/en/faq.wml:913 msgid "" "If you're upgrading from OS X, some of the earlier OS X installers were " "broken in really unfortunate ways. You may find that <a href=\"<page docs/" @@ -1498,14 +1499,14 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:917 +#: /home/runa/tor/website/docs/en/faq.wml:918 msgid "" "If you're on Linux, make sure Privoxy isn't running, since it will conflict " "with the port that our Polipo configuration file picks." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:919 +#: /home/runa/tor/website/docs/en/faq.wml:920 msgid "" "If you installed Polipo yourself (not from a bundle), did you edit the " "config file as described? Did you restart Polipo after this change? Are you " @@ -1513,7 +1514,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:922 +#: /home/runa/tor/website/docs/en/faq.wml:923 msgid "" "For Red Hat Linux and related systems, do you have SELinux enabled? If so, " "it might be preventing Polipo from talking to Tor. We also run across BSD " @@ -1522,19 +1523,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:928 +#: /home/runa/tor/website/docs/en/faq.wml:929 msgid "<hr /> <a id=\"VidaliaPassword\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:931 +#: /home/runa/tor/website/docs/en/faq.wml:932 msgid "" "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a " "password at start.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:934 +#: /home/runa/tor/website/docs/en/faq.wml:935 msgid "" "Vidalia interacts with the Tor software via Tor's \"control port\". The " "control port lets Vidalia receive status updates from Tor, request a new " @@ -1545,7 +1546,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:943 +#: /home/runa/tor/website/docs/en/faq.wml:944 msgid "" "Usually this process of generating and setting a random control password " "happens in the background. There are three common situations, though, where " @@ -1553,7 +1554,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:949 +#: /home/runa/tor/website/docs/en/faq.wml:950 msgid "" "You're already running Vidalia and Tor. For example, this situation can " "happen if you installed the Vidalia bundle and now you're trying to run the " @@ -1562,7 +1563,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:954 +#: /home/runa/tor/website/docs/en/faq.wml:955 msgid "" "Vidalia crashed, but left Tor running with the last known random password. " "After you restart Vidalia, it generates a new random password, but Vidalia " @@ -1576,7 +1577,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:967 +#: /home/runa/tor/website/docs/en/faq.wml:968 msgid "" "You had previously set Tor to run as a Windows NT service. When Tor is set " "to run as a service, it starts up when the system boots. If you configured " @@ -1591,19 +1592,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:982 +#: /home/runa/tor/website/docs/en/faq.wml:983 msgid "<hr> <a id=\"ChooseEntryExit\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:985 +#: /home/runa/tor/website/docs/en/faq.wml:986 msgid "" "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or " "country) are used for entry/exit?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:988 +#: /home/runa/tor/website/docs/en/faq.wml:989 msgid "" "Yes. You can set preferred entry and exit nodes as well as inform Tor which " "nodes you do not want to use. The following options can be added to your " @@ -1612,53 +1613,53 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:994 +#: /home/runa/tor/website/docs/en/faq.wml:995 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:995 +#: /home/runa/tor/website/docs/en/faq.wml:996 msgid "" "A list of preferred nodes to use for the first hop in the circuit, if " "possible." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:997 +#: /home/runa/tor/website/docs/en/faq.wml:998 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:998 +#: /home/runa/tor/website/docs/en/faq.wml:999 msgid "" "A list of preferred nodes to use for the last hop in the circuit, if " "possible." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:1000 +#: /home/runa/tor/website/docs/en/faq.wml:1001 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:1001 +#: /home/runa/tor/website/docs/en/faq.wml:1002 msgid "A list of nodes to never use when building a circuit." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:1003 +#: /home/runa/tor/website/docs/en/faq.wml:1004 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:1004 +#: /home/runa/tor/website/docs/en/faq.wml:1005 msgid "" "A list of nodes to never use when picking an exit. Nodes listed in " "<tt>ExcludeNodes</tt> are automatically in this list." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1009 +#: /home/runa/tor/website/docs/en/faq.wml:1010 msgid "" "<em>We recommend you do not use these</em> — they are intended for " "testing and may disappear in future versions. You get the best security " @@ -1668,7 +1669,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1016 +#: /home/runa/tor/website/docs/en/faq.wml:1017 msgid "" "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as " "a request, meaning if the nodes are down or seem slow, Tor will still avoid " @@ -1680,7 +1681,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1026 +#: /home/runa/tor/website/docs/en/faq.wml:1027 msgid "" "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 " "country code in curly braces (for example {de}), or an ip address pattern " @@ -1689,7 +1690,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1032 +#: /home/runa/tor/website/docs/en/faq.wml:1033 msgid "" "If you want to access a service directly through Tor's SOCKS interface (eg. " "using ssh via connect.c), another option is to set up an internal mapping in " @@ -1698,26 +1699,26 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1038 +#: /home/runa/tor/website/docs/en/faq.wml:1039 msgid "<hr> <a id=\"GoogleCaptcha\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1041 +#: /home/runa/tor/website/docs/en/faq.wml:1042 msgid "" "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha " "or tells me I have spyware installed.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1044 +#: /home/runa/tor/website/docs/en/faq.wml:1045 msgid "" "This is a known and intermittent problem; it does not mean that Google " "considers Tor to be spyware." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1049 +#: /home/runa/tor/website/docs/en/faq.wml:1050 msgid "" "When you use Tor, you are sending queries through exit relays that are also " "shared by thousands of other users. Tor users typically see this message " @@ -1728,7 +1729,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1057 +#: /home/runa/tor/website/docs/en/faq.wml:1058 msgid "" "An alternate explanation is that Google tries to detect certain kinds of " "spyware or viruses that send distinctive queries to Google Search. It notes " @@ -1738,7 +1739,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1066 +#: /home/runa/tor/website/docs/en/faq.wml:1067 msgid "" "To our knowledge, Google is not doing anything intentionally specifically to " "deter or block Tor use. The error message about an infected machine should " @@ -1746,7 +1747,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1072 +#: /home/runa/tor/website/docs/en/faq.wml:1073 msgid "" "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can " "automatically redirect you to a more Tor-friendly search engine such as " @@ -1754,19 +1755,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1077 +#: /home/runa/tor/website/docs/en/faq.wml:1078 msgid "<hr /> <a id=\"GmailWarning\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1080 +#: /home/runa/tor/website/docs/en/faq.wml:1081 msgid "" "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account " "may have been compromised.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1083 +#: /home/runa/tor/website/docs/en/faq.wml:1084 msgid "" "Sometimes, after you've used Gmail over Tor, Google presents a pop-up " "notification that your account may have been compromised. The notification " @@ -1775,7 +1776,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1090 +#: /home/runa/tor/website/docs/en/faq.wml:1091 msgid "" "In general this is a false alarm: Google saw a bunch of logins from " "different places, as a result of running the service via Tor, and decided it " @@ -1784,7 +1785,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1097 +#: /home/runa/tor/website/docs/en/faq.wml:1098 msgid "" "Even though this may be a biproduct of using the service via tor, that " "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a " @@ -1793,7 +1794,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1104 +#: /home/runa/tor/website/docs/en/faq.wml:1105 msgid "" "Cookie hijacking is possible by either physical access to your computer or " "by watching your network traffic. In theory only physical access should " @@ -1804,7 +1805,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1113 +#: /home/runa/tor/website/docs/en/faq.wml:1114 msgid "" "And if somebody <i>did</i> steal your google cookie, they might end up " "logging in from unusual places (though of course they also might not). So " @@ -1816,19 +1817,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1122 +#: /home/runa/tor/website/docs/en/faq.wml:1123 msgid "<hr> <a id=\"FirewallPorts\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1125 +#: /home/runa/tor/website/docs/en/faq.wml:1126 msgid "" "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few " "outgoing ports.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1128 +#: /home/runa/tor/website/docs/en/faq.wml:1129 msgid "" "If your firewall works by blocking ports, then you can tell Tor to only use " "the ports that your firewall permits by adding \"FascistFirewall 1\" to your " @@ -1838,7 +1839,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1136 +#: /home/runa/tor/website/docs/en/faq.wml:1137 msgid "" "By default, when you set this Tor assumes that your firewall allows only " "port 80 and port 443 (HTTP and HTTPS respectively). You can select a " @@ -1846,14 +1847,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1142 +#: /home/runa/tor/website/docs/en/faq.wml:1143 msgid "" "If you want to be more fine-grained with your controls, you can also use the " "ReachableAddresses config options, e.g.:" msgstr "" #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/faq.wml:1147 +#: /home/runa/tor/website/docs/en/faq.wml:1148 #, no-wrap msgid "" " ReachableDirAddresses *:80\n" @@ -1861,24 +1862,24 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1151 +#: /home/runa/tor/website/docs/en/faq.wml:1152 msgid "<hr> <a id=\"RelayFlexible\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1154 +#: /home/runa/tor/website/docs/en/faq.wml:1155 msgid "" "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to " "be?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1157 +#: /home/runa/tor/website/docs/en/faq.wml:1158 msgid "We aim to make setting up a Tor relay easy and convenient:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1161 +#: /home/runa/tor/website/docs/en/faq.wml:1162 msgid "" "Tor has built-in support for <a href=" "\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate " @@ -1889,7 +1890,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1169 +#: /home/runa/tor/website/docs/en/faq.wml:1170 msgid "" "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that " "specifies what sort of outbound connections are allowed or refused from that " @@ -1898,7 +1899,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1174 +#: /home/runa/tor/website/docs/en/faq.wml:1175 msgid "" "It's fine if the relay goes offline sometimes. The directories notice this " "quickly and stop advertising the relay. Just try to make sure it's not too " @@ -1906,14 +1907,14 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1179 +#: /home/runa/tor/website/docs/en/faq.wml:1180 msgid "" "We can handle relays with dynamic IPs just fine — simply leave the " "Address config option blank, and Tor will try to guess." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1182 +#: /home/runa/tor/website/docs/en/faq.wml:1183 msgid "" "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has " "an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP " @@ -1922,7 +1923,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1188 +#: /home/runa/tor/website/docs/en/faq.wml:1189 msgid "" "Your relay will passively estimate and advertise its recent bandwidth " "capacity, so high-bandwidth relays will attract more users than low-" @@ -1930,24 +1931,24 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1194 +#: /home/runa/tor/website/docs/en/faq.wml:1195 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1198 +#: /home/runa/tor/website/docs/en/faq.wml:1199 msgid "" "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want " "to deal with abuse issues.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1201 +#: /home/runa/tor/website/docs/en/faq.wml:1202 msgid "Great. That's exactly why we implemented exit policies." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1205 +#: /home/runa/tor/website/docs/en/faq.wml:1206 msgid "" "Each Tor relay has an exit policy that specifies what sort of outbound " "connections are allowed or refused from that relay. The exit policies are " @@ -1963,7 +1964,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1219 +#: /home/runa/tor/website/docs/en/faq.wml:1220 msgid "" "The default exit policy allows access to many popular services (e.g. web " "browsing), but <a href=\"<wikifaq>#Istherealistofdefaultexitports" @@ -1978,7 +1979,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1233 +#: /home/runa/tor/website/docs/en/faq.wml:1234 msgid "" "If you do allow any exit connections, make sure name resolution works (that " "is, your computer can resolve Internet addresses correctly). If there are " @@ -1988,19 +1989,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1241 +#: /home/runa/tor/website/docs/en/faq.wml:1242 msgid "<hr> <a id=\"RelayOrBridge\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1244 +#: /home/runa/tor/website/docs/en/faq.wml:1245 msgid "" "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or " "bridge relay?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1246 +#: /home/runa/tor/website/docs/en/faq.wml:1247 msgid "" "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for " "short) are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't " @@ -2010,7 +2011,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1253 +#: /home/runa/tor/website/docs/en/faq.wml:1254 msgid "" "Being a normal relay vs being a bridge relay is almost the same " "configuration: it's just a matter of whether your relay is listed publically " @@ -2018,7 +2019,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1258 +#: /home/runa/tor/website/docs/en/faq.wml:1259 msgid "" "Right now, China is the main place in the world that filters connections to " "the Tor network. So bridges are useful a) for users in China, b) as a backup " @@ -2028,7 +2029,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1266 +#: /home/runa/tor/website/docs/en/faq.wml:1267 msgid "" "So should you run a normal relay or bridge relay? If you have lots of " "bandwidth, you should definitely run a normal relay — the average " @@ -2039,19 +2040,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1275 +#: /home/runa/tor/website/docs/en/faq.wml:1276 msgid "<hr> <a id=\"MultipleRelays\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1278 +#: /home/runa/tor/website/docs/en/faq.wml:1279 msgid "" "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one " "relay.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1281 +#: /home/runa/tor/website/docs/en/faq.wml:1282 msgid "" "Great. If you want to run several relays to donate more to the network, " "we're happy with that. But please don't run more than a few dozen on the " @@ -2060,7 +2061,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1288 +#: /home/runa/tor/website/docs/en/faq.wml:1289 msgid "" "If you do decide to run more than one relay, please set the \"MyFamily\" " "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all " @@ -2068,13 +2069,13 @@ msgstr "" #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/faq.wml:1294 +#: /home/runa/tor/website/docs/en/faq.wml:1295 #, no-wrap msgid " MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1298 +#: /home/runa/tor/website/docs/en/faq.wml:1299 msgid "" "where each fingerprint is the 40 character identity fingerprint (without " "spaces). You can also list them by nickname, but fingerprint is safer. Be " @@ -2083,7 +2084,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1305 +#: /home/runa/tor/website/docs/en/faq.wml:1306 msgid "" "That way clients will know to avoid using more than one of your relays in a " "single circuit. You should set MyFamily if you have administrative control " @@ -2092,26 +2093,26 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1311 +#: /home/runa/tor/website/docs/en/faq.wml:1312 msgid "<hr> <a id=\"RelayMemory\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1314 +#: /home/runa/tor/website/docs/en/faq.wml:1315 msgid "" "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much " "memory?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1316 +#: /home/runa/tor/website/docs/en/faq.wml:1317 msgid "" "If your Tor relay is using more memory than you'd like, here are some tips " "for reducing its footprint:" msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1321 +#: /home/runa/tor/website/docs/en/faq.wml:1322 msgid "" "If you're on Linux, you may be encountering memory fragmentation bugs in " "glibc's malloc implementation. That is, when Tor releases memory back to the " @@ -2123,7 +2124,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1329 +#: /home/runa/tor/website/docs/en/faq.wml:1330 msgid "" "If you're running a fast relay, meaning you have many TLS connections open, " "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+ " @@ -2134,7 +2135,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1337 +#: /home/runa/tor/website/docs/en/faq.wml:1338 msgid "" "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is " "probably forking separate processes rather than using threads. Consider " @@ -2143,7 +2144,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1343 +#: /home/runa/tor/website/docs/en/faq.wml:1344 msgid "" "If you still can't handle the memory load, consider reducing the amount of " "bandwidth your relay advertises. Advertising less bandwidth means you will " @@ -2152,61 +2153,61 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1352 +#: /home/runa/tor/website/docs/en/faq.wml:1353 msgid "" "All of this said, fast Tor relays do use a lot of ram. It is not unusual for " "a fast exit relay to use 500-1000 MB of memory." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1356 +#: /home/runa/tor/website/docs/en/faq.wml:1357 msgid "<hr> <a id=\"WhyNotNamed\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1359 +#: /home/runa/tor/website/docs/en/faq.wml:1360 msgid "" "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1362 +#: /home/runa/tor/website/docs/en/faq.wml:1363 msgid "" "We currently use these metrics to determine if your relay should be named:" "<br>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1365 +#: /home/runa/tor/website/docs/en/faq.wml:1366 msgid "" "The name is not currently mapped to a different key. Existing mappings are " "removed after 6 months of inactivity from a relay." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1367 +#: /home/runa/tor/website/docs/en/faq.wml:1368 msgid "The relay must have been around for at least two weeks." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1368 +#: /home/runa/tor/website/docs/en/faq.wml:1369 msgid "No other router may have wanted the same name in the past month." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1371 +#: /home/runa/tor/website/docs/en/faq.wml:1372 msgid "<hr> <a id=\"KeyManagement\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1374 +#: /home/runa/tor/website/docs/en/faq.wml:1375 msgid "" "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor " "uses.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1377 +#: /home/runa/tor/website/docs/en/faq.wml:1378 msgid "" "Tor uses a variety of different keys, with three goals in mind: 1) " "encryption to ensure privacy of data within the Tor network, 2) " @@ -2216,7 +2217,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1385 +#: /home/runa/tor/website/docs/en/faq.wml:1386 msgid "" "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so " "observers can't look inside to see which circuit a given cell is intended " @@ -2227,7 +2228,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1395 +#: /home/runa/tor/website/docs/en/faq.wml:1396 msgid "" "<b>Authentication</b>: Every Tor relay has a public decryption key called " "the \"onion key\". When the Tor client establishes circuits, at each step " @@ -2238,7 +2239,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1405 +#: /home/runa/tor/website/docs/en/faq.wml:1406 msgid "" "<b>Coordination</b>: How do clients know what the relays are, and how do " "they know that they have the right keys for them? Each relay has a long-term " @@ -2253,7 +2254,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1419 +#: /home/runa/tor/website/docs/en/faq.wml:1420 msgid "" "How do clients know what the directory authorities are? The Tor software " "comes with a built-in list of location and public key for each directory " @@ -2262,7 +2263,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1426 +#: /home/runa/tor/website/docs/en/faq.wml:1427 msgid "" "How do users know they've got the right software? When we distribute the " "source code or a package, we digitally sign it with <a href=\"http://www." @@ -2271,7 +2272,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1434 +#: /home/runa/tor/website/docs/en/faq.wml:1435 msgid "" "In order to be certain that it's really signed by us, you need to have met " "us in person and gotten a copy of our GPG key fingerprint, or you need to " @@ -2281,17 +2282,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1441 +#: /home/runa/tor/website/docs/en/faq.wml:1442 msgid "<hr> <a id=\"EntryGuards\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1444 +#: /home/runa/tor/website/docs/en/faq.wml:1445 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1447 +#: /home/runa/tor/website/docs/en/faq.wml:1448 msgid "" "Tor (like all current practical low-latency anonymity designs) fails when " "the attacker can see both ends of the communications channel. For example, " @@ -2303,7 +2304,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1457 +#: /home/runa/tor/website/docs/en/faq.wml:1458 msgid "" "So, what should we do? Suppose the attacker controls, or can observe, <i>C</" "i> relays. Suppose there are <i>N</i> relays total. If you select new entry " @@ -2317,7 +2318,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1469 +#: /home/runa/tor/website/docs/en/faq.wml:1470 msgid "" "The solution is \"entry guards\": each Tor client selects a few relays at " "random to use as entry points, and uses only those relays for her first hop. " @@ -2330,7 +2331,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1480 +#: /home/runa/tor/website/docs/en/faq.wml:1481 msgid "" "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\">An " "Analysis of the Degradation of Anonymous Protocols</a>, <a href=\"http://" @@ -2340,7 +2341,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1489 +#: /home/runa/tor/website/docs/en/faq.wml:1490 msgid "" "Restricting your entry nodes may also help against attackers who want to run " "a few Tor nodes and easily enumerate all of the Tor user IP addresses. (Even " @@ -2351,19 +2352,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1497 +#: /home/runa/tor/website/docs/en/faq.wml:1498 msgid "<hr> <a id=\"EverybodyARelay\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1500 +#: /home/runa/tor/website/docs/en/faq.wml:1501 msgid "" "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user " "be a relay.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1503 +#: /home/runa/tor/website/docs/en/faq.wml:1504 msgid "" "Requiring every Tor user to be a relay would help with scaling the network " "to handle all our users, and <a href=" @@ -2378,7 +2379,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1516 +#: /home/runa/tor/website/docs/en/faq.wml:1517 msgid "" "That said, we do want to encourage Tor users to run relays, so what we " "really want to do is simplify the process of setting up and maintaining a " @@ -2389,12 +2390,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1525 +#: /home/runa/tor/website/docs/en/faq.wml:1526 msgid "There are five steps we need to address before we can do this though:" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1529 +#: /home/runa/tor/website/docs/en/faq.wml:1530 msgid "" "First, we need to make Tor stable as a relay on all common operating " "systems. The main remaining platform is Windows, and we plan to finally " @@ -2403,7 +2404,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1537 +#: /home/runa/tor/website/docs/en/faq.wml:1538 msgid "" "Second, we still need to get better at automatically estimating the right " "amount of bandwidth to allow. See item #7 on the <a href=\"<page getinvolved/" @@ -2415,7 +2416,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1548 +#: /home/runa/tor/website/docs/en/faq.wml:1549 msgid "" "Third, we need to work on scalability, both of the network (how to stop " "requiring that all Tor relays be able to connect to all Tor relays) and of " @@ -2427,7 +2428,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1558 +#: /home/runa/tor/website/docs/en/faq.wml:1559 msgid "" "Fourth, we need to better understand the risks from letting the attacker " "send traffic through your relay while you're also initiating your own " @@ -2444,7 +2445,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1574 +#: /home/runa/tor/website/docs/en/faq.wml:1575 msgid "" "Fifth, we might need some sort of incentive scheme to encourage people to " "relay traffic for others, and/or to become exit nodes. Here are our <a href=" @@ -2452,24 +2453,24 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1581 +#: /home/runa/tor/website/docs/en/faq.wml:1582 msgid "Please help on all of these!" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1584 +#: /home/runa/tor/website/docs/en/faq.wml:1585 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1587 +#: /home/runa/tor/website/docs/en/faq.wml:1588 msgid "" "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP " "packets, not just TCP packets.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1590 +#: /home/runa/tor/website/docs/en/faq.wml:1591 msgid "" "This would be handy, because it would make Tor better able to handle new " "protocols like VoIP, it could solve the whole need to socksify applications, " @@ -2478,7 +2479,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1597 +#: /home/runa/tor/website/docs/en/faq.wml:1598 msgid "" "We're heading in this direction: see <a href=\"https://trac.torproject.org/" "projects/tor/ticket/1855\">this trac ticket</a> for directions we should " @@ -2486,7 +2487,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1604 +#: /home/runa/tor/website/docs/en/faq.wml:1605 msgid "" "IP packets reveal OS characteristics. We would still need to do IP-level " "packet normalization, to stop things like TCP fingerprinting attacks. Given " @@ -2497,7 +2498,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1611 +#: /home/runa/tor/website/docs/en/faq.wml:1612 msgid "" "Application-level streams still need scrubbing. We will still need user-side " "applications like Torbutton. So it won't become just a matter of capturing " @@ -2505,7 +2506,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1615 +#: /home/runa/tor/website/docs/en/faq.wml:1616 msgid "" "Certain protocols will still leak information. For example, we must rewrite " "DNS requests so they are delivered to an unlinkable DNS server rather than " @@ -2514,7 +2515,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1620 +#: /home/runa/tor/website/docs/en/faq.wml:1621 msgid "" "<a href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html" "\">DTLS</a> (datagram TLS) basically has no users, and IPsec sure is big. " @@ -2524,7 +2525,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1627 +#: /home/runa/tor/website/docs/en/faq.wml:1628 msgid "" "Exit policies for arbitrary IP packets mean building a secure IDS. Our node " "operators tell us that exit policies are one of the main reasons they're " @@ -2542,7 +2543,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1641 +#: /home/runa/tor/website/docs/en/faq.wml:1642 msgid "" "The Tor-internal name spaces would need to be redesigned. We support hidden " "service \".onion\" addresses by intercepting the addresses when they are " @@ -2551,38 +2552,38 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1648 +#: /home/runa/tor/website/docs/en/faq.wml:1649 msgid "<hr> <a id=\"Criminals\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1651 +#: /home/runa/tor/website/docs/en/faq.wml:1652 msgid "" "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do " "bad things?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1654 +#: /home/runa/tor/website/docs/en/faq.wml:1655 msgid "" "For the answer to this question and others, please see our <a href=\"<page " "docs/faq-abuse>\">Tor Abuse FAQ</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1658 +#: /home/runa/tor/website/docs/en/faq.wml:1659 msgid "<hr> <a id=\"RespondISP\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1661 +#: /home/runa/tor/website/docs/en/faq.wml:1662 msgid "" "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my " "exit relay?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1664 +#: /home/runa/tor/website/docs/en/faq.wml:1665 msgid "" "A collection of templates for successfully responding to ISPs is <a href=" "\"<wiki>doc/TorAbuseTemplates\">collected here</a>." Modified: translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot 2011-09-21 17:23:59 UTC (rev 25093) +++ translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot 2011-09-21 19:10:46 UTC (rev 25094) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-06-21 08:19+0200\n" +"POT-Creation-Date: 2011-09-21 20:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,7 +30,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/F5o0tOMw8z.xml:281 +#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/A18i3Pxv3V.xml:282 msgid "<hr>" msgstr "" @@ -66,8 +66,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/F5o0tOMw8z.xml:52 -#: /tmp/F5o0tOMw8z.xml:147 /tmp/F5o0tOMw8z.xml:171 +#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/A18i3Pxv3V.xml:52 +#: /tmp/A18i3Pxv3V.xml:147 /tmp/A18i3Pxv3V.xml:171 msgid "<br>" msgstr "" @@ -401,11 +401,11 @@ "add a line like \"toruser hard nofile 8192\" to your /etc/security/limits." "conf file (where toruser is the user that runs the Tor process), and then " "restart Tor if it's installed as a package (or log out and log back in if " -"you run it yourself)." +"you run it yourself). The Debian/Ubuntu package does this step for you." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266 +#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:267 msgid "" "15. If you installed Tor via some package or installer, it probably starts " "Tor for you automatically on boot. But if you installed from source, you may " @@ -413,7 +413,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:272 +#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:273 msgid "" "When you change your Tor configuration, remember to verify that your relay " "still works correctly after the change. Be sure to set your \"ContactInfo\" " @@ -425,7 +425,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:283 +#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:284 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot 2011-09-21 17:23:59 UTC (rev 25093) +++ translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot 2011-09-21 19:10:46 UTC (rev 25094) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-09-05 00:00+0200\n" +"POT-Creation-Date: 2011-09-21 20:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,165 +30,88 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13 -#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86 -#: /tmp/w7jGkC8yXE.xml:186 +#: /tmp/kzjpFaPDWT.xml:16 /tmp/kzjpFaPDWT.xml:60 /tmp/kzjpFaPDWT.xml:120 +#: /tmp/kzjpFaPDWT.xml:176 msgid "<hr>" msgstr "" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15 -msgid "" -"Each file on <a href=\"<page download/download>\">our download page</a> is " -"accompanied by a file with the same name as the package and the extension \"." -"asc\". These .asc files are GPG signatures. They allow you to verify the " -"file you've downloaded is exactly the one that we intended you to get. For " -"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by " -"tor-browser-<version-torbrowserbundle>_en-US.exe.asc." +msgid "What is a signature and why should I check it?" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:18 msgid "" -"Of course, you'll need to have our GPG keys in your keyring: if you don't " -"know the GPG key, you can't be sure that it was really us who signed it. The " -"signing keys we use are:" +"How do you know that the Tor program you have is really the one we made? " +"Many Tor users have very real adversaries who might try to give them a fake " +"version of Tor — and it doesn't matter how secure and anonymous Tor is " +"if you're not running the real Tor." msgstr "" -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26 -msgid "Roger's (0x28988BF5) typically signs the source code file." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27 -msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28 +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:23 msgid "" -"Andrew's (0x31B0974B) typically signed older packages for windows and mac." +"An attacker could try a variety of attacks to get you to download a fake " +"Tor. For example, he could trick you into thinking some other website is a " +"great place to download Tor. That's why you should always download Tor from " +"<b>https</b>://www.torproject.org/. The https part means there's encryption " +"and authentication between your browser and the website, making it much " +"harder for the attacker to modify your download. But it's not perfect. Some " +"places in the world block the Tor website, making users try <a href=\"<page " +"docs/faq>#GetTor\">somewhere else</a>. Large companies sometimes force " +"employees to use a modified browser, so the company can listen in on all " +"their browsing. We've even <a href=\"https://blog.torproject.org/blog/" +"diginotar-debacle-and-what-you-should-do-about-it\">seen</a> attackers who " +"have the ability to trick your browser into thinking you're talking to the " +"Tor website with https when you're not." msgstr "" -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29 -msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30 -msgid "Tomás's (0x9A753A6B) signs current Vidalia release tarballs and tags." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31 -msgid "Matt's (0x5FA14861) signed older Vidalia release tarballs." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32 -msgid "Damian's (0x9ABBEEC6) signs Arm releases" -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33 -msgid "Jacob's (0xE012B42D)." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34 -msgid "" -"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and " -"most linux packages." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:35 -msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:36 -msgid "Karsten's (0xF7C11265) signs the metrics archives and tools." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37 -msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags." -msgstr "" - -#. type: Content of: <div><div><ul><li> +#. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:38 -msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot." -msgstr "" - -#. type: Content of: <div><div><ul> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38 -msgid "." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39 msgid "" -"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories " -"and archives" +"Some software sites list <a href=\"http://en.wikipedia.org/wiki/" +"Cryptographic_hash_function\">sha1 hashes</a> alongside the software on " +"their website, so users can verify that they downloaded the file without any " +"errors. These \"checksums\" help you answer the question \"Did I download " +"this file correctly from whoever sent it to me?\" They do a good job at " +"making sure you didn't have any random errors in your download, but they " +"don't help you figure out whether you were downloading it from the attacker. " +"The better question to answer is: \"Is this file that I just downloaded the " +"file that Tor intended me to get?\"" msgstr "" -#. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42 -msgid "Step Zero: Install GnuPG" -msgstr "" - #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:44 -msgid "You need to have GnuPG installed before you can verify signatures." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49 msgid "" -"Linux: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/" -"download/</a> or install <i>gnupg</i> from the package management system." +"Each file on <a href=\"<page download/download>\">our download page</a> is " +"accompanied by a file with the same name as the package and the extension \"." +"asc\". These .asc files are GPG signatures. They allow you to verify the " +"file you've downloaded is exactly the one that we intended you to get. For " +"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by " +"tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list of which " +"developer signs which package, see our <a href=\"<page docs/signing-keys>" +"\">signing keys</a> page." msgstr "" -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:51 -msgid "" -"Windows: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/" -"download/</a>. Look for the \"version compiled for MS-Windows\" under " -"\"Binaries\"." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:54 -msgid "" -"Mac: see <a href=\"http://macgpg.sourceforge.net/\">http://macgpg." -"sourceforge.net/</a>." -msgstr "" - #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58 -msgid "Step One: Import the keys" +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59 +msgid "Windows" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62 msgid "" -"The next step is to import the key. This can be done directly from GnuPG. " -"Make sure you import the correct key. For example, if you downloaded a " -"Windows package, you will need to import Erinn's key." +"You need to have GnuPG installed before you can verify signatures. Download " +"it from <a href=\"http://gpg4win.org/download.html\">http://gpg4win.org/" +"download.html</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64 -#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194 -msgid "<b>Windows:</b>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66 msgid "" -"GnuPG for Windows is a command line tool, and you will need to use <i>cmd." +"Once it's installed, use GnuPG to import the key that signed your package. " +"Since GnuPG for Windows is a command-line tool, you will need to use <i>cmd." "exe</i>. Unless you edit your PATH environment variable, you will need to " "tell Windows the full path to the GnuPG program. If you installed GnuPG with " "the default values, the path should be something like this: <i>C:\\Program " @@ -196,233 +119,88 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71 -msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:" -msgstr "" - -#. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:73 -#, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75 -#: /tmp/w7jGkC8yXE.xml:92 -msgid "<b>Mac and Linux</b>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76 msgid "" -"Whether you have a Mac or you run Linux, you will need to use the terminal " -"to run GnuPG. Mac users can find the terminal under \"Applications\". If you " -"run Linux and use Gnome, the terminal should be under \"Applications menu\" " -"and \"Accessories\". KDE users can find the terminal under \"Menu\" and " -"\"System\"." +"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by " +"starting <i>cmd.exe</i> and typing:" msgstr "" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81 -msgid "To import the key 0x28988BF5, start the terminal and type:" -msgstr "" - #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76 #, no-wrap -msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5" +msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659" msgstr "" -#. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85 -msgid "Step Two: Verify the fingerprints" -msgstr "" - #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:87 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78 +#: /tmp/kzjpFaPDWT.xml:134 msgid "" -"After importing the key, you will want to verify that the fingerprint is " -"correct." +"After importing the key, you can verify that the fingerprint is correct:" msgstr "" #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81 #, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)" +msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659" msgstr "" -#. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93 -#, no-wrap -msgid "gpg --fingerprint (insert keyid here)" +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83 +#: /tmp/kzjpFaPDWT.xml:139 +msgid "You should see:" msgstr "" -#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:95 -msgid "The fingerprints for the keys should be:" -msgstr "" - #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85 #, no-wrap msgid "" -" pub 1024D/28988BF5 2000-02-27\n" -" Key fingerprint = B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5\n" -" uid Roger Dingledine <arma@mit.edu>\n" -"\n" -" pub 3072R/165733EA 2004-07-03\n" -" Key fingerprint = B35B F85B F194 89D0 4E28 C33C 2119 4EBB 1657 33EA\n" -" uid Nick Mathewson <nickm@alum.mit.edu>\n" -" uid Nick Mathewson <nickm@wangafu.net>\n" -" uid Nick Mathewson <nickm@freehaven.net>\n" -"\n" -" pub 1024D/31B0974B 2003-07-17\n" -" Key fingerprint = 0295 9AA7 190A B9E9 027E 0736 3B9D 093F 31B0 974B\n" -" uid Andrew Lewman (phobos) <phobos@rootme.org>\n" -" uid Andrew Lewman <andrew@lewman.com>\n" -" uid Andrew Lewman <andrew@torproject.org>\n" -" sub 4096g/B77F95F7 2003-07-17\n" -"\n" -" pub 4096R/C82E0039 2003-03-24\n" -" Key fingerprint = 25FC 1614 B8F8 7B52 FF2F 99B9 62AF 4031 C82E 0039\n" -" uid Peter Palfrader\n" -" uid Peter Palfrader <peter@palfrader.org>\n" -" uid Peter Palfrader <weasel@debian.org>\n" -"\n" -" pub 1024D/9A753A6B 2009-09-11\n" -" Key fingerprint = 553D 7C2C 626E F16F 27F3 30BC 95E3 881D 9A75 3A6B\n" -" uid Tomás Touceda <chiiph@gmail.com>\n" -" sub 1024g/33BE0E5B 2009-09-11\n" -"\n" -" pub 1024D/5FA14861 2005-08-17\n" -" Key fingerprint = 9467 294A 9985 3C9C 65CB 141D AF7E 0E43 5FA1 4861\n" -" uid Matt Edman <edmanm@rpi.edu>\n" -" uid Matt Edman <Matt_Edman@baylor.edu>\n" -" uid Matt Edman <edmanm2@cs.rpi.edu>\n" -" sub 4096g/EA654E59 2005-08-17\n" -"\n" -" pub 1024D/9ABBEEC6 2009-06-17\n" -" Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4 5AD9 0445 B7AB 9ABB EEC6\n" -" uid Damian Johnson (www.atagar.com) <atagar1@gmail.com>\n" -" uid Damian Johnson <atagar@torproject.org>\n" -" sub 2048g/146276B2 2009-06-17\n" -" sub 2048R/87F30690 2010-08-07\n" -"\n" -" pub 4096R/E012B42D 2010-05-07\n" -" Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8 9C9E A34F A745 E012 B42D\n" -" uid Jacob Appelbaum <jacob@appelbaum.net>\n" -" uid Jacob Appelbaum <jacob@torproject.org>\n" -" sub 4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n" -"\n" " pub 2048R/63FEE659 2003-10-16\n" " Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" " uid Erinn Clark <erinn@torproject.org>\n" " uid Erinn Clark <erinn@debian.org>\n" " uid Erinn Clark <erinn@double-helix.org>\n" " sub 2048R/EB399FD7 2003-10-16\n" -"\n" -" pub 1024D/F1F5C9B5 2010-02-03\n" -" Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75 79B5 6B8A AEB1 F1F5 C9B5\n" -" uid Erinn Clark <erinn@torproject.org>\n" -" sub 1024g/7828F26A 2010-02-03\n" -"\n" -" pub 1024D/DDC6C0AD 2006-07-26\n" -" Key fingerprint = BECD 90ED D1EE 8736 7980 ECF8 1B0C A30C DDC6 C0AD\n" -" uid Mike Perry <mikeperry@fscked.org>\n" -" uid Mike Perry <mikepery@fscked.org>\n" -" sub 4096g/AF0A91D7 2006-07-26\n" -"\n" -" pub 1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n" -" Key fingerprint = FC8A EEF1 792E EE71 D721 7D47 D0CF 963D F7C1 1265\n" -" uid Karsten Loesing <karsten.loesing@gmx.net>\n" -" sub 2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n" -"\n" -" pub 1024D/22F6856F 2006-08-19\n" -" Key fingerprint = DDB4 6B5B 7950 CD47 E59B 5189 4C09 25CF 22F6 856F\n" -" uid Robert Hogan <robert@roberthogan.net>\n" -" sub 1024g/FC4A9460 2006-08-19\n" -"\n" -" pub 3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n" -" \t Key fingerprint = B92B CA64 72F7 C6F0 8D47 8503 D2AC D203 B374 CBD2\n" -" uid Nathan of Guardian <nathan@guardianproject.info>\n" -" sub 4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n" -"\n" -" pub 2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n" -" Key fingerprint = A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89\n" -" uid deb.torproject.org archive signing key\n" -" sub 2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n" -" " msgstr "" -#. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185 -msgid "Step Three: Verify the downloaded package" -msgstr "" - #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93 +#: /tmp/kzjpFaPDWT.xml:149 msgid "" "To verify the signature of the package you downloaded, you will need to " -"download the \".asc\" file as well." +"download the \".asc\" file as well. Assuming you downloaded the package and " +"its signature to your Desktop, run:" msgstr "" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190 -msgid "" -"In the following examples, the user Alice downloads packages for Windows, " -"Mac OS X and Linux and also verifies the signature of each package. All " -"files are saved on the desktop." -msgstr "" - #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97 #, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>" +msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>.asc" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197 -msgid "<b>Mac:</b>" +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:99 +#: /tmp/kzjpFaPDWT.xml:155 +msgid "The output should say \"Good signature\":" msgstr "" #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:102 +#: /tmp/kzjpFaPDWT.xml:158 #, no-wrap -msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice/<file-osx-x86-bundle-stable>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200 -msgid "<b>Linux</b>" -msgstr "" - -#. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201 -#, no-wrap -msgid "gpg --verify /home/Alice/Desktop/<file-source-stable>.asc /home/Alice/Desktop/<file-source-stable>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204 msgid "" -"After verifying, GnuPG will come back saying something like \"Good signature" -"\" or \"BAD signature\". The output should look something like this:" -msgstr "" - -#. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209 -#, no-wrap -msgid "" -" gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n" -" gpg: Good signature from \"Roger Dingledine <arma@mit.edu>\"\n" +" gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n" +" gpg: Good signature from \"Erinn Clark <erinn@torproject.org>\"\n" +" gpg: aka \"Erinn Clark <erinn@debian.org>\"\n" +" gpg: aka \"Erinn Clark <erinn@double-helix.org>\"\n" " gpg: WARNING: This key is not certified with a trusted signature!\n" " gpg: There is no indication that the signature belongs to the owner.\n" -" Primary key fingerprint: B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5\n" +" Primary key fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" " " msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:217 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:112 +#: /tmp/kzjpFaPDWT.xml:168 msgid "" "Notice that there is a warning because you haven't assigned a trust index to " "this person. This means that GnuPG verified that the key made that " @@ -431,56 +209,94 @@ "key fingerprints." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:119 +msgid "Mac OS X" +msgstr "" + #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:122 msgid "" -"For your reference, this is an example of a <em>BAD</em> verification. It " -"means that the signature and file contents do not match. In this case, you " -"should not trust the file contents:" +"You need to have GnuPG installed before you can verify signatures. You can " +"install it from <a href=\"http://macgpg.sourceforge.net/\">http://macgpg." +"sourceforge.net/</a>." msgstr "" +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:127 +msgid "" +"Once it's installed, use GnuPG to import the key that signed your package. " +"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by " +"starting the terminal (under \"Applications\") and typing:" +msgstr "" + #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:132 #, no-wrap -msgid "" -" gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n" -" gpg: BAD signature from \"Roger Dingledine <arma@mit.edu>\"\n" -" " +msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659" msgstr "" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233 -msgid "<b>RPM-based distributions :</b>" +#. type: Content of: <div><div><pre> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:137 +#, no-wrap +msgid "gpg --fingerprint 0x63FEE659" msgstr "" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234 +#. type: Content of: <div><div><pre> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:141 +#, no-wrap msgid "" -"In order to manually verify the signatures on the RPM packages, you must use " -"the <code>rpm</code> tool like so: <br />" +" pub 2048R/63FEE659 2003-10-16\n" +" Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +" uid Erinn Clark <erinn@torproject.org>\n" +" uid Erinn Clark <erinn@debian.org>\n" +" uid Erinn Clark <erinn@double-helix.org>\n" +" sub 2048R/EB399FD7 2003-10-16\n" +" " msgstr "" -#. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237 +#. type: Content of: <div><div><pre> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:153 #, no-wrap -msgid "rpm -K filename.rpm" +msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc" msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:175 +msgid "Linux" +msgstr "" + #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:240 -msgid "<b>Debian:</b>" +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178 +msgid "" +"Most Linux distributions come with gpg preinstalled, so users who want to " +"verify the Tor Browser Bundle for Linux (or the source tarball) can just " +"follow along with the instructions above for \"Mac OS X\"." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:183 msgid "" -"If you are running Tor on Debian you should read the instructions on <a href=" -"\"<page docs/debian>#packages\">importing these keys to apt</a>." +"If you're using the <b>Debian</b> packages, you should read the instructions " +"on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:244 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187 msgid "" -"If you wish to learn more about GPG, see <a href=\"http://www.gnupg.org/" -"documentation/\">http://www.gnupg.org/documentation/</a>." +"If you're using the <b>RPMs</b>, you can manually verify the signatures on " +"the RPM packages by" msgstr "" + +#. type: Content of: <div><div><p><pre> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:188 +#, no-wrap +msgid "rpm -K filename.rpm" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190 +msgid "" +"See <a href=\"http://www.gnupg.org/documentation/\">http://www.gnupg.org/" +"documentation/</a> to learn more about GPG." +msgstr "" Modified: translation/trunk/projects/website/po/templates/docs/3-low.rpms.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/3-low.rpms.pot 2011-09-21 17:23:59 UTC (rev 25093) +++ translation/trunk/projects/website/po/templates/docs/3-low.rpms.pot 2011-09-21 19:10:46 UTC (rev 25094) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-08-10 08:19+0200\n" +"POT-Creation-Date: 2011-09-21 20:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -37,7 +37,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/Xp_xTVMYLa.xml:70 +#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/qK7cG0J74c.xml:71 msgid "<br>" msgstr "" @@ -75,11 +75,12 @@ #: /home/runa/tor/website/docs/en/rpms.wml:36 msgid "" "If you wish to track the stable releases of Tor, you should substitute " -"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse" +"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, fc15, " +"suse" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/rpms.wml:39 +#: /home/runa/tor/website/docs/en/rpms.wml:40 msgid "" "To track experimental releases, substitute DISTRIBUTION with one of these: " "centos4-experimental, centos5-experimental, fc13-experimental, fc14-" @@ -87,25 +88,25 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/rpms.wml:44 +#: /home/runa/tor/website/docs/en/rpms.wml:45 msgid "Then install Tor by running:" msgstr "" #. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/rpms.wml:46 +#: /home/runa/tor/website/docs/en/rpms.wml:47 #, no-wrap msgid "yum install tor" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/rpms.wml:49 +#: /home/runa/tor/website/docs/en/rpms.wml:50 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#using\">step two</a> of the \"Tor on Linux/Unix\" instructions." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/rpms.wml:55 +#: /home/runa/tor/website/docs/en/rpms.wml:56 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round-robin configuration. If for some reason " @@ -115,29 +116,29 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/rpms.wml:64 +#: /home/runa/tor/website/docs/en/rpms.wml:65 msgid "<hr> <hr> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/rpms.wml:69 +#: /home/runa/tor/website/docs/en/rpms.wml:70 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/rpms.wml:73 +#: /home/runa/tor/website/docs/en/rpms.wml:74 msgid "" "If you'd like to build from source, please follow the <a href=\"<gitblob>doc/" "tor-rpm-creation.txt\">RPM creation instructions</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/rpms.wml:77 +#: /home/runa/tor/website/docs/en/rpms.wml:78 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/rpms.wml:79 +#: /home/runa/tor/website/docs/en/rpms.wml:80 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/templates/download/3-low.download.pot =================================================================== --- translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-09-21 17:23:59 UTC (rev 25093) +++ translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-09-21 19:10:46 UTC (rev 25094) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-09-05 00:00+0200\n" +"POT-Creation-Date: 2011-09-21 20:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,32 +17,65 @@ "Content-Transfer-Encoding: 8bit\n" #. PO4ASHARPBEGIN# translation metadataPO4ASHARPEND -#. PO4ASHARPBEGIN Revision: $Revision: 25014 $PO4ASHARPEND +#. PO4ASHARPBEGIN Revision: $Revision: 25085 $PO4ASHARPEND #. PO4ASHARPBEGIN Translation-Priority: 3-lowPO4ASHARPEND -#. PO4ASHARPBEGINinclude "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"PO4ASHARPEND #. PO4ASHARPBEGIN<!-- ATTENTION TRANSLATOR -#. PO4ASHARPBEGIN<!-- You MUST copy 'dlhead.wmi' and 'lang.wmi' along with this file! +#. PO4ASHARPBEGIN<!-- You MUST copy '/include/lang.wmi' along with this file! #. PO4ASHARPBEGIN<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists) #. PO4ASHARPBEGIN<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' +#. type: Content of: outside any tag (error?) +#: /home/runa/tor/website/download/en/download.wml:5 +msgid " " +msgstr "" + #. type: Content of: <define-tag> -#: /home/runa/tor/website/download/en/download.wml:11 +#: /home/runa/tor/website/download/en/download.wml:10 msgid "en-US" msgstr "" +#. TOR BROWSER BUNDLE +#. PO4ASHARPBEGIN<!-- NOTE - change language enabled button text at the top of this page +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:12 /tmp/oQ2fCfaif9.xml:40 +#: /tmp/oQ2fCfaif9.xml:135 /tmp/oQ2fCfaif9.xml:185 +msgid "" +msgstr "" + +#. type: Content of: <div><div><div><div><div><div><div><form><a><h2> +#: /home/runa/tor/website/download/en/download.wml:13 /tmp/oQ2fCfaif9.xml:53 +#: /tmp/oQ2fCfaif9.xml:155 /tmp/oQ2fCfaif9.xml:206 +msgid "Tor Browser Bundle" +msgstr "" + +#. type: Content of: <define-tag> +#: /home/runa/tor/website/download/en/download.wml:14 +msgid "Currently Unused" +msgstr "" + +#. type: Content of: <define-tag> +#: /home/runa/tor/website/download/en/download.wml:15 /tmp/oQ2fCfaif9.xml:17 +msgid "Tor Browser Bundle (Beta)" +msgstr "" + +#. type: Content of: <define-tag> +#: /home/runa/tor/website/download/en/download.wml:16 /tmp/oQ2fCfaif9.xml:18 +msgid "64-bit (Beta)" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/download/en/download.wml:14 +#: /home/runa/tor/website/download/en/download.wml:23 msgid "" "<a href=\"<page index>\">Home » </a><a href=\"<page download/download>" "\">Download</a>" msgstr "" #. type: Content of: <div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:18 +#: /home/runa/tor/website/download/en/download.wml:27 msgid "Want Tor to really work?" msgstr "" #. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:19 +#: /home/runa/tor/website/download/en/download.wml:28 msgid "" "...then please don't just install it and go on. You need to change some of " "your habits, and reconfigure your software! Tor by itself is <em>NOT</em> " @@ -51,90 +84,88 @@ msgstr "" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:26 +#: /home/runa/tor/website/download/en/download.wml:35 msgid "<span class=\"windows24\">Microsoft Windows</span>" msgstr "" -#. PO4ASHARPBEGINinclude <lang.wmi> -#. PO4ASHARPEND -#. type: Content of: <div><div><div><div><form> -#: /home/runa/tor/website/download/en/download.wml:33 +#. type: Content of: <div><div><div><div><form><a><span> +#: /home/runa/tor/website/download/en/download.wml:43 msgid "" "<a class=\"button win-tbb\" href=\"../dist/torbrowser/tor-browser-<version-" "torbrowserbundle>_<lang>.exe\"><span class=\"strong\">Download</span><span " -"class=\"normal\">Tor Browser Bundle</span></a> <select name=\"language\" id=" -"\"win-tbb\" class=\"lang\"> </select>" +"class=\"normal\">" msgstr "" -#. type: Content of: <div><div><div><div><form><div> -#: /home/runa/tor/website/download/en/download.wml:38 +#. PO4ASHARPBEGINinclude <lang.wmi> +#. PO4ASHARPEND +#. type: Content of: <div><div><div><div><form><a> +#: /home/runa/tor/website/download/en/download.wml:43 +msgid "</a> <select name=\"language\" id=\"win-tbb\" class=\"lang\"> </select>" +msgstr "" + +#. type: Content of: <div><div><div><div><form><a><div> +#: /home/runa/tor/website/download/en/download.wml:48 msgid "" "(<a class=\"win-tbb-sig\" href=\"../dist/torbrowser/tor-browser-<version-" "torbrowserbundle>_<lang>.exe.asc\">sig</a>) <a class=\"siginfo\" href=" "\"<page docs/verifying-signatures>\">What's This?</a>" msgstr "" -#. type: Content of: <div><div><div><div><form> -#: /home/runa/tor/website/download/en/download.wml:40 /tmp/9274UDVCYT.xml:188 +#. type: Content of: <div><div><div><div><div><div><div><form><a> +#: /home/runa/tor/website/download/en/download.wml:50 /tmp/oQ2fCfaif9.xml:203 msgid "" "<a class=\"additional\" href=\"<page projects/torbrowser-details>#build" -"\">Source Code</a>" +"\">Source Code</a> </form>" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:43 /tmp/9274UDVCYT.xml:141 -#: /tmp/9274UDVCYT.xml:191 -msgid "Tor Browser Bundle" -msgstr "" - -#. type: Content of: <div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:44 +#. type: Content of: <div><div><div><div><form> +#: /home/runa/tor/website/download/en/download.wml:54 msgid "<em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em>" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:45 /tmp/9274UDVCYT.xml:143 -#: /tmp/9274UDVCYT.xml:193 +#. type: Content of: <div><div><div><div><div><div><div><form><a><p> +#: /home/runa/tor/website/download/en/download.wml:55 /tmp/oQ2fCfaif9.xml:157 +#: /tmp/oQ2fCfaif9.xml:208 msgid "" "Everything you need to safely browse the Internet. This package requires no " "installation. Just extract it and run. <a href=\"<page projects/torbrowser>" "\">Learn more »</a>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:50 +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:60 msgid "" "<a class=\"button\" href=\"<package-win32-bundle-stable>\"><span class=" "\"strong\">Download</span><span class=\"normal\">Vidalia Bundle</span></a>" msgstr "" -#. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:52 +#. type: Content of: <div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:62 msgid "" "(<a href=\"<package-win32-bundle-stable>.asc\">sig</a>) <a class=\"siginfo\" " "href=\"<page docs/verifying-signatures>\">What's This?</a>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:54 +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:64 msgid "" "<a class=\"additional\" href=\"<package-win32-bundle-alpha>\">Download " "Unstable</a> (<a href=\"<package-win32-bundle-alpha>.asc\">sig</a>)" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:57 /tmp/9274UDVCYT.xml:159 +#. type: Content of: <div><div><div><div><div><form><div><h2> +#: /home/runa/tor/website/download/en/download.wml:67 /tmp/oQ2fCfaif9.xml:173 msgid "Vidalia Bundle" msgstr "" -#. type: Content of: <div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:58 /tmp/9274UDVCYT.xml:71 -#: /tmp/9274UDVCYT.xml:84 /tmp/9274UDVCYT.xml:97 +#. type: Content of: <div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:68 /tmp/oQ2fCfaif9.xml:82 +#: /tmp/oQ2fCfaif9.xml:96 /tmp/oQ2fCfaif9.xml:110 msgid "<em>Windows 7, Vista, and XP</em>" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:59 +#. type: Content of: <div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:69 msgid "" "Contains Tor, <a href=\"<page projects/vidalia>\">Vidalia</a>, Polipo, and " "Torbutton for installation on your system. You need your own Firefox, and " @@ -142,89 +173,104 @@ "href=\"<page docs/tor-doc-windows>\">Installation Guide »</a>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:64 +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:74 msgid "" -"<a class=\"button\" href=\"../dist/vidalia-bundles/vidalia-bridge-bundle-" -"<version-win32-bridge-bundle-stable>.exe\"><span class=\"strong\">Download</" -"span><span class=\"normal\">Vidalia Bridge Bundle (Beta)</span></a>" +"<a class=\"button\" href=\"<package-win32-bridge-bundle-stable>\"><span " +"class=\"strong\">Download</span><span class=\"normal\">Vidalia Bridge Bundle " +"(Beta)</span></a>" msgstr "" +#. type: Content of: <div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:76 +msgid "" +"(<a href=\"<package-win32-bridge-bundle-stable>.asc\">sig</a>) <a class=" +"\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>" +msgstr "" + #. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:66 +#: /home/runa/tor/website/download/en/download.wml:78 msgid "" -"(<a href=\"../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-" -"bridge-bundle-stable>.exe.asc\">sig</a>) <a class=\"siginfo\" href=\"<page " -"docs/verifying-signatures>\">What's This?</a>" +"<a class=\"additional\" href=\"<package-win32-bridge-bundle-alpha>" +"\">Download Unstable</a> (<a href=\"<package-win32-bridge-bundle-alpha>.asc" +"\">sig</a>)" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:70 +#. type: Content of: <div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:81 msgid "Vidalia Bridge Bundle" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:72 +#. type: Content of: <div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:83 msgid "" "A Vidalia Bundle which is configured to be a <a href=\"<page docs/bridges>" "\">bridge</a> by default. This helps censored users reach the Tor network." msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:77 +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:88 msgid "" -"<a class=\"button\" href=\"https://archive.torproject.org/tor-package-" -"archive/technology-preview/vidalia-relay-bundle-<version-win32-relay-bundle-" -"stable>.exe\"><span class=\"strong\">Download</span><span class=\"normal" -"\">Vidalia Relay Bundle (Beta)</span></a>" +"<a class=\"button\" href=\"<package-win32-relay-bundle-stable>\"><span class=" +"\"strong\">Download</span><span class=\"normal\">Vidalia Relay Bundle (Beta)" +"</span></a>" msgstr "" +#. type: Content of: <div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:90 +msgid "" +"(<a href=\"<package-win32-relay-bundle-stable>.asc\">sig</a>) <a class=" +"\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>" +msgstr "" + #. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:79 +#: /home/runa/tor/website/download/en/download.wml:92 msgid "" -"(<a href=\"https://archive.torproject.org/tor-package-archive/technology-" -"preview/vidalia-relay-bundle-<version-win32-relay-bundle-stable>.exe.asc" -"\">sig</a>) <a class=\"siginfo\" href=\"<page docs/verifying-signatures>" -"\">What's This?</a>" +"<a class=\"additional\" href=\"<package-win32-relay-bundle-alpha>\">Download " +"Unstable</a> (<a href=\"<package-win32-relay-bundle-alpha>.asc\">sig</a>)" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:83 +#. type: Content of: <div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:95 msgid "Vidalia Relay Bundle" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:85 +#. type: Content of: <div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:97 msgid "" "A Vidalia Bundle which is configured to be a non-exit <a href=\"<page docs/" "tor-doc-relay>\">relay</a> by default. This helps grow the Tor network." msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:90 +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:102 msgid "" -"<a class=\"button\" href=\"https://archive.torproject.org/tor-package-" -"archive/technology-preview/vidalia-exit-bundle-<version-win32-exit-bundle-" -"stable>.exe\"><span class=\"strong\">Download</span><span class=\"normal" -"\">Vidalia Exit Bundle (Beta)</span></a>" +"<a class=\"button\" href=\"<package-win32-exit-bundle-stable>\"><span class=" +"\"strong\">Download</span><span class=\"normal\">Vidalia Exit Bundle (Beta)</" +"span></a>" msgstr "" +#. type: Content of: <div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:104 +msgid "" +"(<a href=\"<package-win32-exit-bundle-stable>.asc\">sig</a>) <a class=" +"\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>" +msgstr "" + #. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:92 +#: /home/runa/tor/website/download/en/download.wml:106 msgid "" -"(<a href=\"https://archive.torproject.org/tor-package-archive/technology-" -"preview/vidalia-exit-bundle-<version-win32-exit-bundle-stable>.exe.asc" -"\">sig</a>) <a class=\"siginfo\" href=\"<page docs/verifying-signatures>" -"\">What's This?</a>" +"<a class=\"additional\" href=\"<package-win32-exit-bundle-alpha>\">Download " +"Unstable</a> (<a href=\"<package-win32-exit-bundle-alpha>.asc\">sig</a>)" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:96 +#. type: Content of: <div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:109 msgid "Vidalia Exit Bundle" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:98 +#. type: Content of: <div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:111 msgid "" "A Vidalia Bundle which is configured to be an <a href=\"<page docs/tor-doc-" "relay>\">exit relay</a> by default. <strong>Please read these <a href=" @@ -232,131 +278,145 @@ "node with minimal harassment</a> before you get started!</strong>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:103 +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:116 msgid "" "<a class=\"button\" href=\"../dist/win32/tor-<version-win32-stable>-win32.exe" "\"><span class=\"strong\">Download</span><span class=\"normal\">Expert " "Bundle</span></a>" msgstr "" -#. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:105 +#. type: Content of: <div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:118 msgid "" "(<a href=\"../dist/win32/tor-<version-win32-stable>-win32.exe.asc\">sig</a>) " "<a class=\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</" "a>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:107 +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:120 msgid "" "<a class=\"additional\" href=\"../dist/win32/tor-<version-win32-alpha>-win32." "exe\">Download Unstable</a> (<a href=\"../dist/win32/tor-<version-win32-" "alpha>-win32.exe.asc\">sig</a>)" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:110 +#. type: Content of: <div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:123 msgid "Expert Bundle" msgstr "" -#. type: Content of: <div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:111 +#. type: Content of: <div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:124 msgid "<em>Windows 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:112 +#. type: Content of: <div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:125 msgid "" "Contains just Tor and nothing else. You'll need to configure Tor and all of " "your applications manually." msgstr "" -#. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:118 +#. type: Content of: <div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:131 msgid "<span class=\"mac24\">Apple OS X</span>" msgstr "" -#. PO4ASHARPBEGINinclude <lang.wmi> -#. PO4ASHARPEND -#. type: Content of: <div><div><div><div><form> -#: /home/runa/tor/website/download/en/download.wml:124 +#. type: Content of: <div><div><div><div><div><form><a><span> +#: /home/runa/tor/website/download/en/download.wml:138 msgid "" "<a class=\"button osx-tbb\" href=\"../dist/torbrowser/osx/TorBrowser-" "<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip\"><span class=\"strong" -"\">Download</span><span class=\"normal\">Tor Browser Bundle (32-bit Beta)</" -"span></a> <select name=\"language\" id=\"osx-tbb\" class=\"lang\"> </select>" +"\">Download</span><span class=\"normal\">" msgstr "" -#. type: Content of: <div><div><div><div><form><div> -#: /home/runa/tor/website/download/en/download.wml:129 +#. PO4ASHARPBEGINinclude <lang.wmi> +#. PO4ASHARPEND +#. type: Content of: <div><div><div><div><div><form><a> +#: /home/runa/tor/website/download/en/download.wml:138 +msgid "</a> <select name=\"language\" id=\"osx-tbb\" class=\"lang\"> </select>" +msgstr "" + +#. type: Content of: <div><div><div><div><div><form><a><div> +#: /home/runa/tor/website/download/en/download.wml:143 msgid "" "(<a class=\"osx-tbb-sig\" href=\"../dist/torbrowser/osx/TorBrowser-<version-" "torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc\">sig</a>) <a class=" "\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>" msgstr "" +#. type: Content of: <div><div><div><div><div><form><a><a><span> +#: /home/runa/tor/website/download/en/download.wml:145 +msgid "" +"<a class=\"button osx-tbb64\" href=\"../dist/torbrowser/osx/TorBrowser-" +"<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip\"><span class=" +"\"strong\">Download</span><span class=\"normal\">" +msgstr "" + #. PO4ASHARPBEGINinclude <lang.wmi> #. PO4ASHARPEND -#. type: Content of: <div><div><div><div><form> -#: /home/runa/tor/website/download/en/download.wml:131 +#. type: Content of: <div><div><div><div><div><form><a><a> +#: /home/runa/tor/website/download/en/download.wml:145 msgid "" -"<a class=\"button osx-tbb\" href=\"../dist/torbrowser/osx/TorBrowser-" -"<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip\"><span class=" -"\"strong\">Download</span><span class=\"normal\">Tor Browser Bundle (64-bit " -"Beta)</span></a> <select name=\"language\" id=\"osx-tbb\" class=\"lang\"> </" -"select>" +"</a> <select name=\"language\" id=\"osx-tbb64\" class=\"lang\"> </select>" msgstr "" -#. type: Content of: <div><div><div><div><form><div> -#: /home/runa/tor/website/download/en/download.wml:136 +#. type: Content of: <div><div><div><div><div><form><a><a><div> +#: /home/runa/tor/website/download/en/download.wml:150 msgid "" -"(<a class=\"osx-tbb-sig\" href=\"../dist/torbrowser/osx/TorBrowser-<version-" -"torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc\">sig</a>) <a class=" -"\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>" +"(<a class=\"osx-tbb64-sig\" href=\"../dist/torbrowser/osx/TorBrowser-" +"<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc\">sig</a>) <a " +"class=\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>" msgstr "" -#. type: Content of: <div><div><div><div><form> -#: /home/runa/tor/website/download/en/download.wml:138 -msgid "<a href=\"<page projects/torbrowser-details>#build\">Source Code</a>" +#. type: Content of: <div><div><div><div><div><form><a> +#: /home/runa/tor/website/download/en/download.wml:152 +msgid "" +"<a href=\"<page projects/torbrowser-details>#build\">Source Code</a> </form>" msgstr "" -#. type: Content of: <div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:142 +#. type: Content of: <div><div><div><div><div><form><a> +#: /home/runa/tor/website/download/en/download.wml:156 msgid "<em>Version <version-torbrowserbundleosx> - OS X Intel</em>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:148 +#. type: Content of: <div><div><div><div><div><div><div><form> +#: /home/runa/tor/website/download/en/download.wml:158 /tmp/oQ2fCfaif9.xml:210 +msgid "</div>" +msgstr "" + +#. type: Content of: <div><div><div><div><div><form><div><div> +#: /home/runa/tor/website/download/en/download.wml:162 msgid "" "<a class=\"button\" href=\"<package-osx-x86-bundle-stable>\"><span class=" "\"strong\">Download</span><span class=\"normal\">OS X Intel</span></a>" msgstr "" -#. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:150 +#. type: Content of: <div><div><div><div><div><form><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:164 msgid "" "(<a href=\"<package-osx-x86-bundle-stable>.asc\">sig</a>) <a class=\"siginfo" "\" href=\"<page docs/verifying-signatures>\">What's This?</a>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:152 +#. type: Content of: <div><div><div><div><div><form><div><div> +#: /home/runa/tor/website/download/en/download.wml:166 msgid "" "<a class=\"button\" href=\"<package-osx-ppc-bundle-stable>\"><span class=" "\"strong\">Download</span><span class=\"normal\">OS X Power PC</span></a>" msgstr "" -#. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:154 +#. type: Content of: <div><div><div><div><div><form><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:168 msgid "" "(<a href=\"<package-osx-ppc-bundle-stable>.asc\">sig</a>) <a class=\"siginfo" "\" href=\"<page docs/verifying-signatures>\">What's This?</a>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:156 +#. type: Content of: <div><div><div><div><div><form><div><div> +#: /home/runa/tor/website/download/en/download.wml:170 msgid "" "Download Unstable<br /><a class=\"additional\" href=\"<package-osx-x86-" "bundle-alpha>\">OS X Intel</a> (<a href=\"<package-osx-x86-bundle-alpha>.asc" @@ -365,13 +425,13 @@ "\">sig</a>)" msgstr "" -#. type: Content of: <div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:160 +#. type: Content of: <div><div><div><div><div><form><div> +#: /home/runa/tor/website/download/en/download.wml:174 msgid "<em>OS X Intel, OS X Power PC</em>" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:161 +#. type: Content of: <div><div><div><div><div><form><div><p> +#: /home/runa/tor/website/download/en/download.wml:175 msgid "" "Contains Tor, <a href=\"<page projects/vidalia>\">Vidalia</a>, Polipo, and " "Torbutton for installation on your system. You need your own Firefox, and " @@ -379,73 +439,81 @@ "href=\"<page docs/tor-doc-osx>\">Installation Guide »</a>" msgstr "" -#. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:167 +#. type: Content of: <div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:181 msgid "<span class=\"linux24\">Linux, BSD, & Unix</span>" msgstr "" -#. PO4ASHARPBEGINinclude <lang.wmi> -#. PO4ASHARPEND -#. type: Content of: <div><div><div><div><form> -#: /home/runa/tor/website/download/en/download.wml:173 +#. type: Content of: <div><div><div><div><div><div><div><form><a><span> +#: /home/runa/tor/website/download/en/download.wml:188 msgid "" "<a class=\"button lin-tbb32\" href=\"../dist/torbrowser/linux/tor-browser-" "gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz\"><span " -"class=\"strong\">Download</span><span class=\"normal\">i686 / 32-bit (Beta)</" -"span></a> <select name=\"language\" id=\"lin-tbb32\" class=\"lang\"> </" -"select>" +"class=\"strong\">Download</span><span class=\"normal\">" msgstr "" -#. type: Content of: <div><div><div><div><form><div> -#: /home/runa/tor/website/download/en/download.wml:178 +#. PO4ASHARPBEGINinclude <lang.wmi> +#. PO4ASHARPEND +#. type: Content of: <div><div><div><div><div><div><div><form><a> +#: /home/runa/tor/website/download/en/download.wml:188 msgid "" +"</a> <select name=\"language\" id=\"lin-tbb32\" class=\"lang\"> </select>" +msgstr "" + +#. type: Content of: <div><div><div><div><div><div><div><form><a><div> +#: /home/runa/tor/website/download/en/download.wml:193 +msgid "" "(<a class=\"lin-tbb32-sig\" href=\"../dist/torbrowser/linux/tor-browser-gnu-" "linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc\">sig</" "a>) <a class=\"siginfo\" href=\"<page docs/verifying-signatures>\">What's " "This?</a>" msgstr "" -#. PO4ASHARPBEGINinclude <lang.wmi> -#. PO4ASHARPEND -#. type: Content of: <div><div><div><div><form> -#: /home/runa/tor/website/download/en/download.wml:181 +#. type: Content of: <div><div><div><div><div><div><div><form><a><a><span> +#: /home/runa/tor/website/download/en/download.wml:196 msgid "" "<a class=\"button lin-tbb64\" href=\"../dist/torbrowser/linux/tor-browser-" "gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz\"><span " -"class=\"strong\">Download</span><span class=\"normal\">x86_64 / 64-bit (Beta)" -"</span></a> <select name=\"language\" id=\"lin-tbb64\" class=\"lang\"> </" -"select>" +"class=\"strong\">Download</span><span class=\"normal\">" msgstr "" -#. type: Content of: <div><div><div><div><form><div> -#: /home/runa/tor/website/download/en/download.wml:186 +#. PO4ASHARPBEGINinclude <lang.wmi> +#. PO4ASHARPEND +#. type: Content of: <div><div><div><div><div><div><div><form><a><a> +#: /home/runa/tor/website/download/en/download.wml:196 msgid "" +"</a> <select name=\"language\" id=\"lin-tbb64\" class=\"lang\"> </select>" +msgstr "" + +#. type: Content of: <div><div><div><div><div><div><div><form><a><a><div> +#: /home/runa/tor/website/download/en/download.wml:201 +msgid "" "(<a class=\"lin-tbb64-sig\" href=\"../dist/torbrowser/linux/tor-browser-gnu-" "linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc\">sig</" "a>) <a class=\"siginfo\" href=\"<page docs/verifying-signatures>\">What's " "This?</a>" msgstr "" -#. type: Content of: <div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:192 +#. type: Content of: <div><div><div><div><div><div><div><form><a> +#: /home/runa/tor/website/download/en/download.wml:207 msgid "" "<em>Version <version-torbrowserbundlelinux32> - Linux, BSD, and Unix</em>" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:194 +#. type: Content of: <div><div><div><div><div><div><div><form><a><p> +#: /home/runa/tor/website/download/en/download.wml:209 msgid "" "Use <a href=\"<page download/download-unix>\">our repositories</a> for all " "other Tor-related software." msgstr "" -#. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:200 +#. type: Content of: <div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:215 msgid "<span class=\"smartphone24\">Tor for Smartphones</span>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:206 +#. type: Content of: <div><div><div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:221 msgid "" "<a class=\"button\" style=\"margin-bottom: 5px;\" href=\"../dist/android/" "<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk\"><span " @@ -454,124 +522,124 @@ "Instructions</a>" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:210 +#. type: Content of: <div><div><div><div><div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:225 msgid "Android Bundle" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:211 +#. type: Content of: <div><div><div><div><div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:226 msgid "For Android-based phones, tablets, and computers." msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:216 +#. type: Content of: <div><div><div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:231 msgid "" "<a class=\"additional\" style=\"font-weight: bold;\" href=\"http://sid77." "slackware.it/iphone/\">Test Packages by Marco</a>" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:219 +#. type: Content of: <div><div><div><div><div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:234 msgid "Tor for Apple iOS" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:220 +#. type: Content of: <div><div><div><div><div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:235 msgid "For iPhone, iPod Touch, and iPad." msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:225 +#. type: Content of: <div><div><div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:240 msgid "" "<a class=\"additional\" style=\"font-weight: bold;\" href=\"<page docs/N900>" "\">Experimental Instructions</a>" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:228 +#. type: Content of: <div><div><div><div><div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:243 msgid "Nokia Maemo/N900" msgstr "" -#. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:234 +#. type: Content of: <div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:249 msgid "<span class=\"sourcecode24\">Source Code</span>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:239 +#. type: Content of: <div><div><div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:254 msgid "" "<a class=\"button\" href=\"../dist/tor-<version-stable>.tar.gz\"><span class=" "\"strong\">Download</span><span class=\"normal\">Source Code</span></a>" msgstr "" -#. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:241 +#. type: Content of: <div><div><div><div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:256 msgid "" "(<a href=\"../dist/tor-<version-stable>.tar.gz.asc\">sig</a>) <a class=" "\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>" msgstr "" -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:243 +#. type: Content of: <div><div><div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:258 msgid "" "<a class=\"button\" href=\"../dist/tor-<version-alpha>.tar.gz\"><span class=" "\"strong\">Download</span><span class=\"normal\">Source Code (Unstable)</" "span></a>" msgstr "" -#. type: Content of: <div><div><div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:245 +#. type: Content of: <div><div><div><div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:260 msgid "" "(<a href=\"../dist/tor-<version-alpha>.tar.gz.asc\">sig</a>) <a class=" "\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:249 +#. type: Content of: <div><div><div><div><div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:264 msgid "Source Tarball" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:250 +#. type: Content of: <div><div><div><div><div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:265 msgid "" "Configure with: <code style=\"color: #666666;\">./configure && make " "&& src/or/tor</code>" msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:251 +#. type: Content of: <div><div><div><div><div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:266 msgid "" "The current stable version of Tor is <version-stable>. Its <a href=\"https://" "gitweb.torproject.org/tor.git/blob/release-0.2.2:/ReleaseNotes\">release " "notes</a> are available." msgstr "" -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:252 +#. type: Content of: <div><div><div><div><div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:267 msgid "" "The current unstable/alpha version of Tor is <version-alpha>. Its <a href=" "\"https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog\">Changelog</a> " "is available." msgstr "" -#. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:257 /tmp/9274UDVCYT.xml:335 +#. type: Content of: <div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:272 /tmp/oQ2fCfaif9.xml:350 msgid "<br>" msgstr "" -#. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:260 +#. type: Content of: <div><div><div><div><div><div><div><div> +#: /home/runa/tor/website/download/en/download.wml:275 msgid "<a name=\"warning\"></a> <a name=\"Warning\"></a>" msgstr "" -#. type: Content of: <div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:262 +#. type: Content of: <div><div><div><div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:277 msgid "<a class=\"anchor\" href=\"#warning\">Want Tor to really work?</a>" msgstr "" -#. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:263 +#. type: Content of: <div><div><div><div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:278 msgid "" "...then please don't just install it and go on. You need to change some of " "your habits, and reconfigure your software! Tor by itself is <em>NOT</em> " @@ -579,8 +647,8 @@ "watch out for:" msgstr "" -#. type: Content of: <div><div><div><ol><li> -#: /home/runa/tor/website/download/en/download.wml:268 +#. type: Content of: <div><div><div><div><div><div><div><div><ol><li> +#: /home/runa/tor/website/download/en/download.wml:283 msgid "" "Tor only protects Internet applications that are configured to send their " "traffic through Tor — it doesn't magically anonymize all your traffic " @@ -589,8 +657,8 @@ "\"<page torbutton/index>\">Torbutton</a> extension." msgstr "" -#. type: Content of: <div><div><div><ol><li> -#: /home/runa/tor/website/download/en/download.wml:276 +#. type: Content of: <div><div><div><div><div><div><div><div><ol><li> +#: /home/runa/tor/website/download/en/download.wml:291 msgid "" "Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, " "Quicktime, Adobe's PDF plugin, and others: they can be manipulated into " @@ -603,8 +671,8 @@ "two browsers (one for Tor, one for non-Tor browsing)." msgstr "" -#. type: Content of: <div><div><div><ol><li> -#: /home/runa/tor/website/download/en/download.wml:289 +#. type: Content of: <div><div><div><div><div><div><div><div><ol><li> +#: /home/runa/tor/website/download/en/download.wml:304 msgid "" "Beware of cookies: if you ever browse without Tor and a site gives you a " "cookie, that cookie could identify you even when you start using Tor again. " @@ -613,8 +681,8 @@ "do not want to lose." msgstr "" -#. type: Content of: <div><div><div><ol><li> -#: /home/runa/tor/website/download/en/download.wml:297 +#. type: Content of: <div><div><div><div><div><div><div><div><ol><li> +#: /home/runa/tor/website/download/en/download.wml:312 msgid "" "Tor anonymizes the origin of your traffic, and it encrypts everything " "between you and the Tor network and everything inside the Tor network, but " @@ -628,8 +696,8 @@ "Foundation. It encrypts your communications with a number of major websites." msgstr "" -#. type: Content of: <div><div><div><ol><li> -#: /home/runa/tor/website/download/en/download.wml:311 +#. type: Content of: <div><div><div><div><div><div><div><div><ol><li> +#: /home/runa/tor/website/download/en/download.wml:326 msgid "" "While Tor blocks attackers on your local network from discovering or " "influencing your destination, it opens new risks: malicious or misconfigured " @@ -639,8 +707,8 @@ "integrity." msgstr "" -#. type: Content of: <div><div><div><ol><li> -#: /home/runa/tor/website/download/en/download.wml:320 +#. type: Content of: <div><div><div><div><div><div><div><div><ol><li> +#: /home/runa/tor/website/download/en/download.wml:335 msgid "" "Tor tries to prevent attackers from learning what destinations you connect " "to. It doesn't prevent somebody watching your traffic from learning that " @@ -652,15 +720,15 @@ "the less dangerous it will be that you are one of them." msgstr "" -#. type: Content of: <div><div><div><ol><li> -#: /home/runa/tor/website/download/en/download.wml:330 +#. type: Content of: <div><div><div><div><div><div><div><div><ol><li> +#: /home/runa/tor/website/download/en/download.wml:345 msgid "" "Do not use <a href=\"https://blog.torproject.org/blog/bittorrent-over-tor-" "isnt-good-idea\">BitTorrent and Tor</a> together." msgstr "" -#. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:337 +#. type: Content of: <div><div><div><div><div><div><div><div><p> +#: /home/runa/tor/website/download/en/download.wml:352 msgid "" "Be smart and learn more. Understand what Tor does and does not offer. This " "list of pitfalls isn't complete, and we need your help <a href=\"<page " @@ -668,8 +736,8 @@ "issues</a>." msgstr "" -#. type: Content of: <div><div><script> -#: /home/runa/tor/website/download/en/download.wml:350 +#. type: Content of: <div><div><div><div><div><div><div><script> +#: /home/runa/tor/website/download/en/download.wml:365 msgid "" "function displayVals() { var t3 = $(\"#t3\").val(); var amount = $(\"#amount" "\").val(); if(t3 != 0){ $('#a3').val(amount); $('#p3').val(1); $('#cmd').val" @@ -677,94 +745,94 @@ "$('#ppinfo').replaceWith('" msgstr "" -#. type: Content of: <div><div><script><h6> -#: /home/runa/tor/website/download/en/download.wml:358 +#. type: Content of: <div><div><div><div><div><div><div><script><h6> +#: /home/runa/tor/website/download/en/download.wml:373 msgid "<small>(Requires a PayPal Account)</small>" msgstr "" -#. type: Content of: <div><div><script> -#: /home/runa/tor/website/download/en/download.wml:358 +#. type: Content of: <div><div><div><div><div><div><div><script> +#: /home/runa/tor/website/download/en/download.wml:373 msgid "" "'); }else{ $('#a3').val(0); $('#p3').val(0); $('#cmd').val('_donations'); " "$('#item_name').val('Donation to the Tor Project'); $('#ppinfo').replaceWith" "('" msgstr "" -#. type: Content of: <div><div><script> -#: /home/runa/tor/website/download/en/download.wml:364 +#. type: Content of: <div><div><div><div><div><div><div><script> +#: /home/runa/tor/website/download/en/download.wml:379 msgid "" "'); } if( !t3 ) { $('#cmd').val('_donations'); $('#item_name').val('Donation " "to the Tor Project'); $('#ppinfo').replaceWith('" msgstr "" -#. type: Content of: <div><div><script> -#: /home/runa/tor/website/download/en/download.wml:369 +#. type: Content of: <div><div><div><div><div><div><div><script> +#: /home/runa/tor/website/download/en/download.wml:384 msgid "" "'); } } $(function(){ $(\"#amount\").change(displayVals); $(\"#t3\").change" "(displayVals); displayVals(); });" msgstr "" -#. type: Content of: <div><div><form><h2> -#: /home/runa/tor/website/download/en/download.wml:379 +#. type: Content of: <div><div><div><div><div><div><div><form><h2> +#: /home/runa/tor/website/download/en/download.wml:394 msgid "Donate to Tor" msgstr "" -#. type: Content of: <div><div><form><p><select> -#: /home/runa/tor/website/download/en/download.wml:381 +#. type: Content of: <div><div><div><div><div><div><div><form><p><select> +#: /home/runa/tor/website/download/en/download.wml:396 msgid "<select name=\"currency_code\" class=\"cur\">" msgstr "" -#. type: Content of: <div><div><form><p><select><option> -#: /home/runa/tor/website/download/en/download.wml:382 +#. type: Content of: <div><div><div><div><div><div><div><form><p><select><option> +#: /home/runa/tor/website/download/en/download.wml:397 msgid "$" msgstr "" -#. type: Content of: <div><div><form><p><select><option> -#: /home/runa/tor/website/download/en/download.wml:383 +#. type: Content of: <div><div><div><div><div><div><div><form><p><select><option> +#: /home/runa/tor/website/download/en/download.wml:398 msgid "€" msgstr "" -#. type: Content of: <div><div><form><p><select><option> -#: /home/runa/tor/website/download/en/download.wml:384 +#. type: Content of: <div><div><div><div><div><div><div><form><p><select><option> +#: /home/runa/tor/website/download/en/download.wml:399 msgid "£" msgstr "" -#. type: Content of: <div><div><form><p><select><option> -#: /home/runa/tor/website/download/en/download.wml:385 +#. type: Content of: <div><div><div><div><div><div><div><form><p><select><option> +#: /home/runa/tor/website/download/en/download.wml:400 msgid "¥" msgstr "" -#. type: Content of: <div><div><form><p> -#: /home/runa/tor/website/download/en/download.wml:386 +#. type: Content of: <div><div><div><div><div><div><div><form><p> +#: /home/runa/tor/website/download/en/download.wml:401 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" name=\"amount" "\" value=\"5\" size=\"10\">" msgstr "" -#. type: Content of: <div><div><form><p><select> -#: /home/runa/tor/website/download/en/download.wml:390 +#. type: Content of: <div><div><div><div><div><div><div><form><p><select> +#: /home/runa/tor/website/download/en/download.wml:405 msgid "" "<input type=\"hidden\" id=\"a3\" name=\"a3\" value=\"0\"> <select id=\"t3\" " "name=\"t3\">" msgstr "" -#. type: Content of: <div><div><form><p><select><option> -#: /home/runa/tor/website/download/en/download.wml:392 +#. type: Content of: <div><div><div><div><div><div><div><form><p><select><option> +#: /home/runa/tor/website/download/en/download.wml:407 msgid "One-time Donation" msgstr "" -#. type: Content of: <div><div><form><p><select><option> -#: /home/runa/tor/website/download/en/download.wml:393 +#. type: Content of: <div><div><div><div><div><div><div><form><p><select><option> +#: /home/runa/tor/website/download/en/download.wml:408 msgid "Monthly Subscription" msgstr "" -#. type: Content of: <div><div><form><p> -#: /home/runa/tor/website/download/en/download.wml:394 +#. type: Content of: <div><div><div><div><div><div><div><form><p> +#: /home/runa/tor/website/download/en/download.wml:409 msgid "</select>" msgstr "" -#. type: Content of: <div><div><form><p> -#: /home/runa/tor/website/download/en/download.wml:397 +#. type: Content of: <div><div><div><div><div><div><div><form><p> +#: /home/runa/tor/website/download/en/download.wml:412 msgid "" "<input type=\"hidden\" id=\"p3\" name=\"p3\" value=\"1\"> <input type=" "\"hidden\" name=\"sra\" value=\"1\"> <input type=\"hidden\" name=\"src\" " @@ -778,23 +846,23 @@ "\"https://www.torproject.org/download/download.html\">" msgstr "" -#. type: Content of: <div><div><form><p> -#: /home/runa/tor/website/download/en/download.wml:410 +#. type: Content of: <div><div><div><div><div><div><div><form><p> +#: /home/runa/tor/website/download/en/download.wml:425 msgid "" "<input class=\"donate-btn\" type=\"submit\" name=\"donate\" value=\"Donate\">" msgstr "" -#. type: Content of: <div><div><form><p> -#: /home/runa/tor/website/download/en/download.wml:412 +#. type: Content of: <div><div><div><div><div><div><div><form><p> +#: /home/runa/tor/website/download/en/download.wml:427 msgid "<a href=\"<page donate/donate>\">Other donation options...</a>" msgstr "" -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:418 +#. type: Content of: <div><div><div><div><div><div><div><div><div><h2> +#: /home/runa/tor/website/download/en/download.wml:433 msgid "Having Trouble?" msgstr "" -#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:420 +#. type: Content of: <div><div><div><div><div><div><div><div><div><ul><li> +#: /home/runa/tor/website/download/en/download.wml:435 msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>" msgstr ""