[tor-commits] r24876: {translation} updated translation templates for the website (in translation/trunk/projects/website/po/templates: about docs download)
Runa Sandvik
runa.sandvik at gmail.com
Fri Jul 8 07:41:57 UTC 2011
Author: runa
Date: 2011-07-08 07:41:57 +0000 (Fri, 08 Jul 2011)
New Revision: 24876
Modified:
translation/trunk/projects/website/po/templates/about/3-low.contact.pot
translation/trunk/projects/website/po/templates/about/3-low.contributors.pot
translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot
translation/trunk/projects/website/po/templates/docs/3-low.debian-vidalia.pot
translation/trunk/projects/website/po/templates/docs/3-low.debian.pot
translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot
translation/trunk/projects/website/po/templates/download/1-high.download-easy.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-07-08 07:36:42 UTC (rev 24875)
+++ translation/trunk/projects/website/po/templates/about/3-low.contact.pot 2011-07-08 07:41:57 UTC (rev 24876)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-13 16:28+0200\n"
+"POT-Creation-Date: 2011-07-08 08:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -28,82 +28,36 @@
msgid "Tor: Contact"
msgstr ""
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><h3>
#: /home/runa/tor/website/about/en/contact.wml:16
-msgid ""
-"First, if you have a problem or question about using Tor, go look at the <a "
-"href=\"<page docs/documentation>#Support\">Support section</a> for how to "
-"proceed. The Tor developers spend most of their time developing Tor, and "
-"there are no people devoted to user support, so try to help yourself before "
-"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a volunteer</"
-"a>."
+msgid "Email"
msgstr ""
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:18
-msgid ""
-"If you really do need to reach us, here are some approaches. Please be "
-"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-questions.html"
-"\">helpful</a>, and please make sure to write your mail in English."
-msgstr ""
-
#. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:21
+#: /home/runa/tor/website/about/en/contact.wml:17
msgid ""
-"<i>tor-assistants at torproject.org</i> is the catch-all address for "
-"everything. It can be used for:"
+"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-"
+"all address for everything. It can be used for reaching people working on "
+"Tor. A few other addresses are more specific:"
msgstr ""
#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:25
+#: /home/runa/tor/website/about/en/contact.wml:24
msgid ""
-"Contacting the people who manage the directory authorities. Use this if you "
-"run a Tor relay and have a question or problem with your relay."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:28
-msgid ""
-"So we can fix typos on the website, change wrong statements or directions on "
-"the website, and add new sections and paragraphs that you send us. You might "
-"want to make a draft of your new sections on <a href=\"<wiki>\">the Tor "
-"wiki</a> first."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:32
-msgid ""
-"Hearing about your documents, patches, testing, experiences with supporting "
-"applications, and so forth inspired by our <a href=\"<page getinvolved/"
-"volunteer>\">volunteer page</a> (or other problems you've fixed or "
-"documented about using Tor). There's no need to mail us before you start "
-"working on something -- like all volunteer Internet projects, we hear from a "
-"lot of excited people who vanish soon after, so we are most interested in "
-"hearing about actual progress."
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:42
-msgid "A few other addresses are more specific:"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:45
-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:48
+#: /home/runa/tor/website/about/en/contact.wml:27
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:50
+#: /home/runa/tor/website/about/en/contact.wml:29
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 "
@@ -112,7 +66,7 @@
msgstr ""
#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:55
+#: /home/runa/tor/website/about/en/contact.wml:34
msgid ""
"<i>execdir at torproject.org</i> is for press/media, questions and comments "
"about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -120,31 +74,70 @@
"etc."
msgstr ""
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/about/en/contact.wml:40
+msgid "Identi.ca"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/contact.wml:41
+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
+msgid "IRC"
+msgstr ""
+
#. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:46
+msgid "<a id=\"irc\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/contact.wml:47
msgid ""
-"<a id=\"irc\"></a> Tor users and developers can also be found in the "
-"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:"
+"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:66
+#: /home/runa/tor/website/about/en/contact.wml:51
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:69
+#: /home/runa/tor/website/about/en/contact.wml:54
msgid ""
"<i>#tor-dev</i> - Channel for people who want to do development. "
-"Discussions about Tor related coding, protocols, and <a href=\"<page "
+"Discussions about Tor-related coding, protocols, and <a href=\"<page "
"getinvolved/volunteer>\">project ideas</a> are all welcome."
msgstr ""
#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:72
+#: /home/runa/tor/website/about/en/contact.wml:57
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
+msgid "Telephone"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/contact.wml:62
+msgid "<a id=\"phone\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/contact.wml:63
+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."
+msgstr ""
Modified: translation/trunk/projects/website/po/templates/about/3-low.contributors.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.contributors.pot 2011-07-08 07:36:42 UTC (rev 24875)
+++ translation/trunk/projects/website/po/templates/about/3-low.contributors.pot 2011-07-08 07:41:57 UTC (rev 24876)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-01 16:37+0000\n"
+"POT-Creation-Date: 2011-07-08 08:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -184,47 +184,69 @@
#. type: Content of: <div><div><dl><dt>
#: /home/runa/tor/website/about/en/contributors.wml:48
+msgid "Bruce Leidl"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:48
+msgid "Worked on a Tor client in Java."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:49
msgid "Rebecca MacKinnon"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:48
+#: /home/runa/tor/website/about/en/contributors.wml:49
msgid ""
"Former Director of Tor. Co-Founder of <a href=\"http://www."
"globalvoicesonline.org/\">Global Voices Online</a>."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:50
+#: /home/runa/tor/website/about/en/contributors.wml:51
msgid "Chris Palmer"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:50
+#: /home/runa/tor/website/about/en/contributors.wml:51
msgid ""
"Our liaison and tech guy with EFF while EFF was funding us. Also helped "
"advocate and write end-user docs."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:52
+#: /home/runa/tor/website/about/en/contributors.wml:53
+msgid "Martin Peck"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:53
+msgid ""
+"Worked on a VM-based transparent proxying approach for Tor clients on "
+"Windows."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:55
msgid "Matej Pfajfar"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:52
+#: /home/runa/tor/website/about/en/contributors.wml:55
msgid ""
"Author of the original onion routing code that Tor is based on, so we didn't "
"have to start from scratch."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:54
+#: /home/runa/tor/website/about/en/contributors.wml:57
msgid "Johannes Renner"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:54
+#: /home/runa/tor/website/about/en/contributors.wml:57
msgid ""
"Worked during the 2007 Google Summer of Code on modifying <a href=\"https://"
"svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to measure various "
@@ -232,23 +254,36 @@
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:59
+#: /home/runa/tor/website/about/en/contributors.wml:62
msgid "Scott Squires"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:59
+#: /home/runa/tor/website/about/en/contributors.wml:62
msgid ""
"The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:61
+#: /home/runa/tor/website/about/en/contributors.wml:64
+msgid "tup (a pseudonym)"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:64
+msgid ""
+"Added new features for making Tor easier to use as a <a href="
+"\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a href="
+"\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:69
msgid "Stephen Tyree"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:61
+#: /home/runa/tor/website/about/en/contributors.wml:69
msgid ""
"Worked during Google Summer of Code 2009 to develop a plugin API for <a href="
"\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow "
@@ -257,12 +292,12 @@
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:65
+#: /home/runa/tor/website/about/en/contributors.wml:73
msgid "Camilo Viecco"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:65
+#: /home/runa/tor/website/about/en/contributors.wml:73
msgid ""
"Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac."
"vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -270,12 +305,12 @@
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:68
+#: /home/runa/tor/website/about/en/contributors.wml:76
msgid "Fred von Lohmann"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:68
+#: /home/runa/tor/website/about/en/contributors.wml:76
msgid ""
"Fred served on our Board of Directors from 2006 through 2009. His complete "
"bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-"
@@ -283,12 +318,24 @@
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:72
+#: /home/runa/tor/website/about/en/contributors.wml:80
+msgid "Kyle Williams"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:80
+msgid ""
+"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
+"easier to set up and use."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:82
msgid "Christian Wilms"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:72
+#: /home/runa/tor/website/about/en/contributors.wml:82
msgid ""
"Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
"\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-perf/"
@@ -296,12 +343,12 @@
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/contributors.wml:75
+#: /home/runa/tor/website/about/en/contributors.wml:85
msgid "Jillian C. York"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/contributors.wml:75
+#: /home/runa/tor/website/about/en/contributors.wml:85
msgid ""
"<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, "
"blogger, and activist based in Boston."
Modified: translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot 2011-07-08 07:36:42 UTC (rev 24875)
+++ translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot 2011-07-08 07:41:57 UTC (rev 24876)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-29 20:42+0200\n"
+"POT-Creation-Date: 2011-07-08 08:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -30,80 +30,72 @@
#. type: Content of: <div><div><dl><dt>
#: /home/runa/tor/website/about/en/volunteers.wml:15
-msgid "Anonym"
+msgid "Anonym, bertagaz, and intrigeri"
msgstr ""
#. type: Content of: <div><div><dl><dd>
#: /home/runa/tor/website/about/en/volunteers.wml:15
-msgid "Maintainer of the Incognito LiveCD."
+msgid ""
+"Maintainers of <a href=\"https://tails.boum.org/\">The Amnesic Incognito "
+"Live System</a>."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
-msgid "Kevin Bankston"
+#: /home/runa/tor/website/about/en/volunteers.wml:17
+msgid "Marco Bonetti"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
-msgid ""
-"EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
-"Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
-"has a legal question about Tor."
+#: /home/runa/tor/website/about/en/volunteers.wml:17
+msgid "Focusing on MobileTor for the iPhone."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
-msgid "Marco Bonetti"
+#: /home/runa/tor/website/about/en/volunteers.wml:18
+msgid "Kasimir Gabert"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
-msgid "Focusing on MobileTor for the iPhone."
+#: /home/runa/tor/website/about/en/volunteers.wml:18
+msgid "Maintains TorStatus."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
-msgid "Kasimir Gabert"
+#: /home/runa/tor/website/about/en/volunteers.wml:19
+msgid "Marcia Hofmann and Kevin Bankston"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
-msgid "Maintains TorStatus."
+#: /home/runa/tor/website/about/en/volunteers.wml:19
+msgid ""
+"EFF lawyers who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
+"Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
+"has a legal question about Tor."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:22
+#: /home/runa/tor/website/about/en/volunteers.wml:23
msgid "Andreas Jonsson"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:22
+#: /home/runa/tor/website/about/en/volunteers.wml:23
msgid "Works on OS X Tor Browser Bundle sandbox technology."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:24
+#: /home/runa/tor/website/about/en/volunteers.wml:25
msgid "Fabian Keil"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:24
+#: /home/runa/tor/website/about/en/volunteers.wml:25
msgid ""
"One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
"and Privoxy still work well together."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:26
-msgid "Bruce Leidl"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:26
-msgid "Working on a Tor client in Java."
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
#: /home/runa/tor/website/about/en/volunteers.wml:27
msgid "Julius Mittenzwei"
msgstr ""
@@ -141,60 +133,34 @@
#. type: Content of: <div><div><dl><dt>
#: /home/runa/tor/website/about/en/volunteers.wml:34
-msgid "Martin Peck"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:34
-msgid ""
-"Working on a VM-based transparent proxying approach for Tor clients on "
-"Windows."
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:36
msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/tor/website/about/en/volunteers.wml:35
msgid ""
"The most dedicated bug reporter we've ever heard from. He must read Tor "
"source code every day over breakfast."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "tup (another pseudonym)"
+#: /home/runa/tor/website/about/en/volunteers.wml:37
+msgid "Nart Villeneuve"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
+#: /home/runa/tor/website/about/en/volunteers.wml:37
msgid ""
-"Periodically adds new features for making Tor easier to use as a <a href="
-"\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a href="
-"\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>."
+"Security researcher who works with Jacob on Internet Censorship research."
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
-msgid "Kyle Williams"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
-msgid ""
-"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
-"easier to set up and use."
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:47
+#: /home/runa/tor/website/about/en/volunteers.wml:39
msgid "Ethan Zuckerman"
msgstr ""
#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:47
+#: /home/runa/tor/website/about/en/volunteers.wml:39
msgid ""
"A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?"
"p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/"
@@ -203,7 +169,7 @@
msgstr ""
#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:52
+#: /home/runa/tor/website/about/en/volunteers.wml:44
msgid ""
"All our relay operators, people who write <a href=\"http://freehaven.net/"
"anonbib/\">research papers</a> about Tor, people who teach others about Tor, "
Modified: translation/trunk/projects/website/po/templates/docs/3-low.debian-vidalia.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.debian-vidalia.pot 2011-07-08 07:36:42 UTC (rev 24875)
+++ translation/trunk/projects/website/po/templates/docs/3-low.debian-vidalia.pot 2011-07-08 07:41:57 UTC (rev 24876)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-05 19:13+0000\n"
+"POT-Creation-Date: 2011-07-08 08:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -35,7 +35,7 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/M9Wxp74W_E.xml:83
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/LnaSOLeTA9.xml:84
msgid "<br />"
msgstr ""
@@ -56,71 +56,76 @@
#. type: Content of: <div><div><p><ul><li>
#: /home/runa/tor/website/docs/en/debian-vidalia.wml:29
-msgid "Ubuntu 10.10 is \"maverick\" but use the \"lucid\" packages"
+msgid "Ubuntu 11.04 is \"natty\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
#: /home/runa/tor/website/docs/en/debian-vidalia.wml:30
+msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31
msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32
msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33
msgid "Ubuntu 9.04 is \"jaunty\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34
msgid "Ubuntu 8.10 is \"intrepid\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35
msgid "Ubuntu 8.04 is \"hardy\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36
msgid "Debian Etch is \"etch\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:37
msgid "Debian Lenny is \"lenny\""
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:39
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40
msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:43
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:44
#, no-wrap
msgid "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:45
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:46
msgid ""
"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
"intrepid, hardy) in place of <DISTRIBUTION>."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:51
msgid ""
"Then add the gpg key used to sign the packages by running the following "
"commands at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:54
#, no-wrap
msgid ""
"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
@@ -128,14 +133,14 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:57
msgid ""
"Now refresh your sources and install Vidalia by running the following "
"commands at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:59
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:60
#, no-wrap
msgid ""
"apt-get update\n"
@@ -143,8 +148,8 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:65
-#: /tmp/M9Wxp74W_E.xml:112
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:66
+#: /tmp/LnaSOLeTA9.xml:113
msgid ""
"Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-"
"doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" "
@@ -152,7 +157,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:71
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:72
msgid ""
"The DNS name <code>deb.torproject.org</code> is actually a set of "
"independent servers in a DNS round robin configuration. If you for some "
@@ -162,37 +167,37 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:80
msgid "<hr /> <a id=\"source\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:82
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83
msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:87
msgid ""
"If you want to build your own debs from source you must first add an "
"appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>."
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:89
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:90
#, no-wrap
msgid "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:92
msgid ""
"You also need to install the necessary packages to build your own debs and "
"the packages needed to build Vidalia:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:95
#, no-wrap
msgid ""
"apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n"
@@ -200,12 +205,12 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:97
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:98
msgid "Then you can build Vidalia in ~/debian-packages:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:99
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:100
#, no-wrap
msgid ""
"mkdir ~/debian-packages; cd ~/debian-packages\n"
@@ -216,23 +221,23 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:105
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:106
msgid "Now you can install the new package:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:107
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:108
#, no-wrap
msgid "sudo dpkg -i vidalia_*.deb\n"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:117
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:118
msgid "<hr />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian-vidalia.wml:119
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:120
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/3-low.debian.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.debian.pot 2011-07-08 07:36:42 UTC (rev 24875)
+++ translation/trunk/projects/website/po/templates/docs/3-low.debian.pot 2011-07-08 07:41:57 UTC (rev 24876)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-01 16:37+0000\n"
+"POT-Creation-Date: 2011-07-08 08:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,8 +37,8 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/__TMvx4TV6.xml:43
-#: /tmp/__TMvx4TV6.xml:113 /tmp/__TMvx4TV6.xml:148
+#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43
+#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149
msgid "<br />"
msgstr ""
@@ -58,8 +58,8 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94
-#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182
+#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95
+#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183
msgid ""
"Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
"unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions."
@@ -109,56 +109,61 @@
#. type: Content of: <div><div><p><ul><li>
#: /home/runa/tor/website/docs/en/debian.wml:60
-msgid "Ubuntu 10.10 is \"maverick\""
+msgid "Ubuntu 11.04 is \"natty\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
#: /home/runa/tor/website/docs/en/debian.wml:61
+msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian.wml:62
msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian.wml:62
+#: /home/runa/tor/website/docs/en/debian.wml:63
msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian.wml:63
+#: /home/runa/tor/website/docs/en/debian.wml:64
msgid "Ubuntu 8.04 is \"hardy\""
msgstr ""
#. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/debian.wml:64
+#: /home/runa/tor/website/docs/en/debian.wml:65
msgid "Ubuntu 6.06 is \"dapper\""
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:67
+#: /home/runa/tor/website/docs/en/debian.wml:68
msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:71
+#: /home/runa/tor/website/docs/en/debian.wml:72
#, no-wrap
msgid "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:73
+#: /home/runa/tor/website/docs/en/debian.wml:74
msgid ""
"where you put the codename of your distribution (i.e. lenny, sid, maverick "
"or whatever it is) in place of <DISTRIBUTION>."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:79
+#: /home/runa/tor/website/docs/en/debian.wml:80
msgid ""
"Then add the gpg key used to sign the packages by running the following "
"commands at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:82
+#: /home/runa/tor/website/docs/en/debian.wml:83
#, no-wrap
msgid ""
"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
@@ -166,14 +171,14 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:85
+#: /home/runa/tor/website/docs/en/debian.wml:86
msgid ""
"Now refresh your sources and install Tor by running the following commands "
"(as root) at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:88
+#: /home/runa/tor/website/docs/en/debian.wml:89
#, no-wrap
msgid ""
"apt-get update\n"
@@ -181,7 +186,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:100
+#: /home/runa/tor/website/docs/en/debian.wml:101
msgid ""
"The DNS name <code>deb.torproject.org</code> is actually a set of "
"independent servers in a DNS round robin configuration. If you for some "
@@ -191,19 +196,19 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:108
+#: /home/runa/tor/website/docs/en/debian.wml:109
msgid "<hr /> <a id=\"development\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/debian.wml:111
+#: /home/runa/tor/website/docs/en/debian.wml:112
msgid ""
"<a class=\"anchor\" href=\"#development\">Option three: Using the "
"development branch of Tor on Debian or Ubuntu</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:115
+#: /home/runa/tor/website/docs/en/debian.wml:116
msgid ""
"If you want to use the <a href=\"<page download/download>#packagediff"
"\">development branch</a> of Tor instead (more features and more bugs), you "
@@ -212,7 +217,7 @@
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:120
+#: /home/runa/tor/website/docs/en/debian.wml:121
#, no-wrap
msgid ""
"deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n"
@@ -220,19 +225,19 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:123
+#: /home/runa/tor/website/docs/en/debian.wml:124
msgid ""
"where you again substitute the name of your distro (lenny, sid, "
"maverick, ...) in place of <DISTRIBUTION>."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:129
+#: /home/runa/tor/website/docs/en/debian.wml:130
msgid "Then run the following commands at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:131
+#: /home/runa/tor/website/docs/en/debian.wml:132
#, no-wrap
msgid ""
"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
@@ -242,17 +247,17 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:144
+#: /home/runa/tor/website/docs/en/debian.wml:145
msgid "<hr /> <a id=\"source\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/debian.wml:147
+#: /home/runa/tor/website/docs/en/debian.wml:148
msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:151
+#: /home/runa/tor/website/docs/en/debian.wml:152
msgid ""
"If you want to build your own debs from source you must first add an "
"appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>."
@@ -261,7 +266,7 @@
#. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND
#. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:154
+#: /home/runa/tor/website/docs/en/debian.wml:155
#, no-wrap
msgid ""
"\n"
@@ -273,14 +278,14 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:161
+#: /home/runa/tor/website/docs/en/debian.wml:162
msgid ""
"You also need to install the necessary packages to build your own debs and "
"the packages needed to build Tor:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:164
+#: /home/runa/tor/website/docs/en/debian.wml:165
#, no-wrap
msgid ""
"apt-get install build-essential fakeroot devscripts\n"
@@ -288,12 +293,12 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:167
+#: /home/runa/tor/website/docs/en/debian.wml:168
msgid "Then you can build Tor in ~/debian-packages:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:169
+#: /home/runa/tor/website/docs/en/debian.wml:170
#, no-wrap
msgid ""
"mkdir ~/debian-packages; cd ~/debian-packages\n"
@@ -304,23 +309,23 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:175
+#: /home/runa/tor/website/docs/en/debian.wml:176
msgid "Now you can install the new package:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:177
+#: /home/runa/tor/website/docs/en/debian.wml:178
#, no-wrap
msgid "sudo dpkg -i tor_*.deb\n"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:187
+#: /home/runa/tor/website/docs/en/debian.wml:188
msgid "<hr />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:189
+#: /home/runa/tor/website/docs/en/debian.wml:190
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/3-low.tor-doc-unix.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot 2011-07-08 07:36:42 UTC (rev 24875)
+++ translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot 2011-07-08 07:41:57 UTC (rev 24876)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-21 08:18+0200\n"
+"POT-Creation-Date: 2011-07-08 08:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -30,9 +30,8 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26
-#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135
-#: /tmp/4vVJb7zECD.xml:173
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26
+#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130
msgid "<br>"
msgstr ""
@@ -40,9 +39,8 @@
#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17
msgid ""
"<b>Note that these are the installation instructions for running a Tor "
-"client. If you want to relay traffic for others to help the network grow "
-"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a "
-"relay</a> guide.</b>"
+"client. The easiest way to do this is to simply download the <a href=\"<page "
+"projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>"
msgstr ""
#. type: Content of: <div><div>
@@ -90,75 +88,25 @@
#. type: Content of: <div><div>
#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54
-msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>"
-msgstr ""
-
-#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:57
-msgid ""
-"<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web "
-"Browsing</a>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60
-msgid ""
-"After installing Tor, you need to configure your applications to use it."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:64
-msgid ""
-"The first step is to set up web browsing. Start by installing <a href="
-"\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> from your "
-"favorite repository. Polipo is a caching web proxy that does http pipelining "
-"well, so it's well-suited for Tor's latencies. Make sure to get at least "
-"Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
-"remove privoxy or yum remove privoxy), so they don't conflict."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:74
-msgid ""
-"Once you've installed Polipo (either from package or from source), <b>you "
-"will need to configure Polipo to use Tor</b>. Grab our <a href=\"<tbbrepo>/"
-"build-scripts/config/polipo.conf\">Polipo configuration for Tor</a> and put "
-"it in place of your current polipo config file (e.g. /etc/polipo/config or "
-"~/.polipo). You'll need to restart Polipo for the changes to take effect. "
-"For example:<br> <tt>/etc/init.d/polipo restart</tt>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84
-msgid ""
-"If you prefer, you can instead use Privoxy with <a href=\"<wiki>doc/"
-"PrivoxyConfig\">this sample Privoxy configuration</a>. But since the config "
-"files both use port 8118, you shouldn't run both Polipo and Privoxy at the "
-"same time."
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89
msgid "<hr> <a id=\"using\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56
msgid ""
-"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
-"to use Tor</a>"
+"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to "
+"use Tor</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59
msgid ""
-"After installing Tor and Polipo, you need to configure your applications to "
-"use them. The first step is to set up web browsing."
+"After installing Tor, you need to configure your applications to use them. "
+"The first step is to set up web browsing."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62
msgid ""
"You should use Tor with Firefox and Torbutton, for best safety. Simply "
"install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart "
@@ -166,14 +114,14 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
msgid ""
"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
"torbutton.png\" > <br>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75
msgid ""
"If you plan to run Firefox on a different computer than Tor, see the <a href="
"\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a different "
@@ -181,38 +129,36 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81
msgid ""
-"To Torify other applications that support HTTP proxies, just point them at "
-"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
-"messaging, Jabber, IRC, etc), you can point your application directly at Tor "
-"(localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ "
-"entry</a> for why this may be dangerous. For applications that support "
-"neither SOCKS nor HTTP, take a look at <a href=\"https://code.google.com/p/"
-"torsocks/\">torsocks</a> or <a href=\"<wiki>doc/TorifyHOWTO#socat\">socat</"
-"a>."
+"To Torify other applications that support SOCKS proxies, just point them at "
+"Tor's SOCKS port (127.0.0.1 port 9050). See <a href=\"<wikifaq>#SOCKSAndDNS"
+"\">this FAQ entry</a> for why this may be dangerous. For applications that "
+"support neither SOCKS nor HTTP, take a look at <a href=\"https://code.google."
+"com/p/torsocks/\">torsocks</a> or <a href=\"<wiki>doc/TorifyHOWTO#socat"
+"\">socat</a>."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89
msgid ""
"For information on how to Torify other applications, check out the <a href="
"\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
msgid "<hr> <a id=\"verify\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95
msgid ""
-"<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
+"<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:138
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
msgid ""
"Next, you should try using your browser with Tor and make sure that your IP "
"address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -224,51 +170,51 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109
msgid ""
"If you have a personal firewall that limits your computer's ability to "
"connect to itself (this includes something like SELinux on Fedora Core 4), "
-"be sure to allow connections from your local applications to Polipo (local "
-"port 8118) and Tor (local port 9050). If your firewall blocks outgoing "
-"connections, punch a hole so it can connect to at least TCP ports 80 and "
-"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</"
-"a>. If your SELinux config is not allowing tor or privoxy to run correctly, "
-"create a file named booleans.local in the directory /etc/selinux/targeted. "
-"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". "
-"Restart your machine for this change to take effect."
+"be sure to allow connections from your local applications to Tor (local port "
+"9050). If your firewall blocks outgoing connections, punch a hole so it can "
+"connect to at least TCP ports 80 and 443, and then see <a href="
+"\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux config "
+"is not allowing tor or privoxy to run correctly, create a file named "
+"booleans.local in the directory /etc/selinux/targeted. Edit this file in "
+"your favorite text editor and insert \"allow_ypbind=1\". Restart your "
+"machine for this change to take effect."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122
msgid ""
"If it's still not working, look at <a href=\"<page docs/faq>#DoesntWork"
"\">this FAQ entry</a> for hints."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:172
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129
msgid ""
-"<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
+"<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:175
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
msgid ""
"The Tor network relies on volunteers to donate bandwidth. The more people "
"who run relays, the faster the Tor network will be. If you have at least 20 "
-"kilobytes/s each way, please help out Tor by configuring your Tor to be a "
+"KiloBytes/s each way, please help out Tor by configuring your Tor to be a "
"relay too. We have many features that make Tor relays easy and convenient, "
"including rate limiting for bandwidth, exit policies so you can limit your "
"exposure to abuse complaints, and support for dynamic IP addresses."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140
msgid ""
"Having relays in many different places on the Internet is what makes Tor "
"users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger "
@@ -277,19 +223,19 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
msgid ""
"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
"a> guide."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149
msgid "<hr>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151
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/1-high.download-easy.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot 2011-07-08 07:36:42 UTC (rev 24875)
+++ translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot 2011-07-08 07:41:57 UTC (rev 24876)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-21 08:18+0200\n"
+"POT-Creation-Date: 2011-07-08 08:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -118,7 +118,7 @@
#: /home/runa/tor/website/download/en/download-easy.wml:72
msgid ""
"</select> <input type=\"text\" id=\"amount\" class=\"amount\" name=\"amount"
-"\" value=\"5\" size=\"10\">"
+"\" value=\"10\" size=\"10\">"
msgstr ""
#. type: Content of: <div><div><table><tbody><tr><td><form><p><select>
Modified: translation/trunk/projects/website/po/templates/download/3-low.download.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-07-08 07:36:42 UTC (rev 24875)
+++ translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-07-08 07:41:57 UTC (rev 24876)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-21 08:18+0200\n"
+"POT-Creation-Date: 2011-07-08 08:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -117,7 +117,7 @@
#: /home/runa/tor/website/download/en/download.wml:65
msgid ""
"</select> <input type=\"text\" id=\"amount\" class=\"amount\" name=\"amount"
-"\" value=\"5\" size=\"10\">"
+"\" value=\"10\" size=\"10\">"
msgstr ""
#. type: Content of: <div><div><table><tr><td><form><p><select>
@@ -175,8 +175,8 @@
msgstr ""
#. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165
-#: /tmp/FhqGC1ISDt.xml:203
+#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165
+#: /tmp/lbSAEZiU0Z.xml:203
msgid ""
"The <strong>Tor Browser Bundle</strong> contains everything you need to "
"safely browse the Internet. This package requires no installation. Just "
@@ -209,7 +209,7 @@
msgstr ""
#. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168
+#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168
msgid ""
"There are two versions of each package, a stable and alpha release. Stable "
"packages are released when we believe the features and code will not change "
@@ -515,7 +515,7 @@
msgstr ""
#. type: Content of: <div><div><div>
-#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344
+#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344
msgid "<br>"
msgstr ""
More information about the tor-commits
mailing list