[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] r24653: {translation} updated the translation template files for the website (in translation/trunk/projects/website/po/templates: about docs projects)



Author: runa
Date: 2011-04-18 09:37:48 +0000 (Mon, 18 Apr 2011)
New Revision: 24653

Modified:
   translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot
   translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot
   translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot
   translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot
Log:
updated the translation template files for the website

Modified: translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot	2011-04-18 09:35:38 UTC (rev 24652)
+++ translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot	2011-04-18 09:37:48 UTC (rev 24653)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"POT-Creation-Date: 2011-04-18 10:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,28 +17,28 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/about/en/corepeople.wml:7
+#: /home/runa/tor/website/about/en/corepeople.wml:7
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page about/overview>"
 "\">About &raquo; </a> <a href=\"<page about/corepeople>\">Tor People</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/about/en/corepeople.wml:12
+#: /home/runa/tor/website/about/en/corepeople.wml:12
 msgid ""
 "The Tor Project is a 501(c)(3) non-profit based in the United States. The "
 "official address of the organization is:"
 msgstr ""
 
 #. type: Content of: <div><div><address>
-#: /home/runa/dev/website/about/en/corepeople.wml:17
+#: /home/runa/tor/website/about/en/corepeople.wml:17
 msgid ""
 "The Tor Project<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 "
 "USA<br><br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/about/en/corepeople.wml:22
+#: /home/runa/tor/website/about/en/corepeople.wml:22
 msgid ""
 "The organization consists of many volunteers and a few employees.  Please "
 "don't contact us individually about Tor topics &mdash; if you have a problem "
@@ -47,17 +47,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/dev/website/about/en/corepeople.wml:27
+#: /home/runa/tor/website/about/en/corepeople.wml:27
 msgid "Core Tor People"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:29
+#: /home/runa/tor/website/about/en/corepeople.wml:29
 msgid "Jacob Appelbaum, Developer, Advocate, and Security Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:30
+#: /home/runa/tor/website/about/en/corepeople.wml:30
 msgid ""
 "Our main advocate.  Speaks at conferences and gives trainings all over the "
 "world to get people excited about Tor, explain how Tor is used in real world "
@@ -70,12 +70,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:40
+#: /home/runa/tor/website/about/en/corepeople.wml:40
 msgid "Erinn Clark, Packaging and Build Automation"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:41
+#: /home/runa/tor/website/about/en/corepeople.wml:41
 msgid ""
 "Erinn is tackling the growing needs for easy to install and configure "
 "packages on a variety of operating systems.  Also working on automating the "
@@ -85,24 +85,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:47
+#: /home/runa/tor/website/about/en/corepeople.wml:47
 msgid "Christopher Davis, Libevent hacker"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:48
+#: /home/runa/tor/website/about/en/corepeople.wml:48
 msgid ""
 "Worked during Google Summer of Code 2009 on porting Polipo to Windows.  He "
 "currently helps with the libevent bufferevent code."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:51
+#: /home/runa/tor/website/about/en/corepeople.wml:51
 msgid "Roger Dingledine, Project Leader; Director, Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:52
+#: /home/runa/tor/website/about/en/corepeople.wml:52
 msgid ""
 "Original developer of Tor along with Nick Mathewson and Paul Syverson. "
 "Leading researcher in the anonymous communications field.  Frequent speaker "
@@ -111,24 +111,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:57
+#: /home/runa/tor/website/about/en/corepeople.wml:57
 msgid "Matt Edman, Vidalia Developer; Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:58
+#: /home/runa/tor/website/about/en/corepeople.wml:58
 msgid ""
 "Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-"
 "platform Tor Graphical User Interface included in the bundles."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:61
+#: /home/runa/tor/website/about/en/corepeople.wml:61
 msgid "Nathan Freitas, Mobile phone hacker"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:62
+#: /home/runa/tor/website/about/en/corepeople.wml:62
 msgid ""
 "The driving force behind <a href=\"https://guardianproject.info\";>The "
 "Guardian Project</a> and Tor on the Android platform in the form of <a href="
@@ -139,12 +139,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:70
+#: /home/runa/tor/website/about/en/corepeople.wml:70
 msgid "Christian Fromme, Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:71
+#: /home/runa/tor/website/about/en/corepeople.wml:71
 msgid ""
 "Christian works on all things python for Tor.  He enhanced and maintains a "
 "slew of codebases for us, such as the get-tor email auto-responder, check."
@@ -152,12 +152,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:75
+#: /home/runa/tor/website/about/en/corepeople.wml:75
 msgid "Melissa Gilroy, CFO and Internal Audit"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:76
+#: /home/runa/tor/website/about/en/corepeople.wml:76
 msgid ""
 "With a strong background in non-profit accounting and auditing, Melissa is "
 "in charge of Tor's finances, audit compliance, and keeping Tor's financial "
@@ -165,12 +165,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:80
+#: /home/runa/tor/website/about/en/corepeople.wml:80
 msgid "Sebastian Hahn, Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:81
+#: /home/runa/tor/website/about/en/corepeople.wml:81
 msgid ""
 "Worked during the 2008 Google Summer of Code on a networking application to "
 "automatically carry out tests for Tor and during the 2009 Google Summer of "
@@ -179,24 +179,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:86
+#: /home/runa/tor/website/about/en/corepeople.wml:86
 msgid "Thomas S. Benjamin, Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:87
+#: /home/runa/tor/website/about/en/corepeople.wml:87
 msgid ""
 "Anonymous communications and bridge distribution researcher. His other work "
 "can be found on his <a href=\"http://cryptocracy.net/\";>personal website</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:90
+#: /home/runa/tor/website/about/en/corepeople.wml:90
 msgid "Robert Hogan, Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:91
+#: /home/runa/tor/website/about/en/corepeople.wml:91
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller, a "
 "<a href=\"http://code.google.com/p/torora/\";>privacy-oriented Arora fork</"
@@ -205,12 +205,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:97
+#: /home/runa/tor/website/about/en/corepeople.wml:97
 msgid "Damian Johnson, Arm Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:98
+#: /home/runa/tor/website/about/en/corepeople.wml:98
 msgid ""
 "Builds <a href=\"http://atagar.com/arm\";>Arm</a>, a command-line application "
 "for monitoring Tor relays and providing real-time status information such as "
@@ -218,26 +218,26 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:102
+#: /home/runa/tor/website/about/en/corepeople.wml:102
 msgid ""
 "Andrew Lewman, Executive Director; Director; <a href=\"<page press/press>"
 "\">press contact</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:103
+#: /home/runa/tor/website/about/en/corepeople.wml:103
 msgid ""
 "Manages the business operations of The Tor Project, Inc.  Plays roles of "
 "finance, advocacy, project management, strategy, press, and general support."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:106
+#: /home/runa/tor/website/about/en/corepeople.wml:106
 msgid "Dr. Karsten Loesing, Researcher and Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:107
+#: /home/runa/tor/website/about/en/corepeople.wml:107
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href="
 "\"<specblob>proposals/114-distributed-storage.txt\">distributing and "
@@ -247,24 +247,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:114
+#: /home/runa/tor/website/about/en/corepeople.wml:114
 msgid "Nick Mathewson, Chief Architect, Researcher, Director"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:115
+#: /home/runa/tor/website/about/en/corepeople.wml:115
 msgid ""
 "One of the three original designers of Tor; does a lot of the ongoing design "
 "work. One of the two main developers, along with Roger."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:118
+#: /home/runa/tor/website/about/en/corepeople.wml:118
 msgid "Dr. Steven Murdoch, Researcher and Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:119
+#: /home/runa/tor/website/about/en/corepeople.wml:119
 msgid ""
 "Researcher at the University of Cambridge, currently funded by The Tor "
 "Project to improve the security, performance, and usability of Tor. Creator "
@@ -274,36 +274,36 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:126
+#: /home/runa/tor/website/about/en/corepeople.wml:126
 msgid "Linus Nordberg, Advocate"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:127
+#: /home/runa/tor/website/about/en/corepeople.wml:127
 msgid ""
 "Swedish advocate for Tor, anonymous communications research, and employee at "
 "<a href=\"http://nordu.net\";>NORDUnet</a>."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:130
+#: /home/runa/tor/website/about/en/corepeople.wml:130
 msgid "Peter Palfrader, Sysadmin and Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:131
+#: /home/runa/tor/website/about/en/corepeople.wml:131
 msgid ""
 "Manages the Debian packages, runs one of the directory authorities, runs the "
 "website and the wiki, and generally helps out a lot."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:132
+#: /home/runa/tor/website/about/en/corepeople.wml:132
 msgid "Mike Perry, Torbutton and Tor Performance Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:133
+#: /home/runa/tor/website/about/en/corepeople.wml:133
 msgid ""
 "Author of <a href=\"https://svn.torproject.org/svn/torflow/trunk/README";
 "\">TorFlow</a>, a Tor controller that builds paths through the Tor network "
@@ -312,24 +312,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:139
+#: /home/runa/tor/website/about/en/corepeople.wml:139
 msgid "Robert Ransom"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:140
+#: /home/runa/tor/website/about/en/corepeople.wml:140
 msgid ""
 "Bug catcher and immensely helpful on irc and the email lists. Looking into "
 "hidden service performance and robustness."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:143
+#: /home/runa/tor/website/about/en/corepeople.wml:143
 msgid "Karen Reilly, Development Director"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:144
+#: /home/runa/tor/website/about/en/corepeople.wml:144
 msgid ""
 "Responsible for fundraising, advocacy, general marketing, policy outreach "
 "programs for Tor. She is also available to speak for audiences about the "
@@ -337,28 +337,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:148
-msgid "Runa A. Sandvik, Translation Coordinator"
+#: /home/runa/tor/website/about/en/corepeople.wml:148
+msgid ""
+"Runa A. Sandvik, Developer, Security Researcher, and Translation Coordinator"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:149
+#: /home/runa/tor/website/about/en/corepeople.wml:149
 msgid ""
 "Maintains the <a href=\"http://www.transifex.net/projects/p/torproject/";
-"\">Tor Translation Portal</a>, and works on automatically converting our "
-"website wml files to po files (and back).  She also generally helps out with "
-"the <a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/";
-"Torouter\">Torouter project</a>, bridge distribution through instant "
-"messaging, and other projects."
+"\">Tor Translation Portal</a> and the translations for a number of projects "
+"(such as Vidalia, Torbutton and the website). She also generally helps out "
+"with the <a href=\"https://trac.torproject.org/projects/tor/wiki/";
+"TheOnionRouter/Torouter\">Torouter project</a>, bridge distribution through "
+"instant messaging, and other projects."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:157
+#: /home/runa/tor/website/about/en/corepeople.wml:157
 msgid "Dr. Paul Syverson, Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:158
+#: /home/runa/tor/website/about/en/corepeople.wml:158
 msgid ""
 "Inventor of <a href=\"http://www.onion-router.net/\";>Onion Routing</a>, "
 "original designer of Tor along with Roger and Nick, and project leader for "
@@ -367,12 +368,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:163
+#: /home/runa/tor/website/about/en/corepeople.wml:163
 msgid "Jeremy Todaro, Illustration &amp; Design"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:164
+#: /home/runa/tor/website/about/en/corepeople.wml:164
 msgid ""
 "Works on the artwork and design for various projects, annual reports, and "
 "brochures. His other work can be found at <a href=\"http://jmtodaro.com/";
@@ -380,11 +381,11 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/corepeople.wml:167
+#: /home/runa/tor/website/about/en/corepeople.wml:167
 msgid "TomÃs Touceda"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/corepeople.wml:168
+#: /home/runa/tor/website/about/en/corepeople.wml:168
 msgid "Maintenance and new development for Vidalia."
 msgstr ""

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-04-18 09:35:38 UTC (rev 24652)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot	2011-04-18 09:37:48 UTC (rev 24653)
@@ -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-04-18 10:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -30,8 +30,8 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/ETpEqGX4UH.xml:38 /tmp/ETpEqGX4UH.xml:54 /tmp/ETpEqGX4UH.xml:81
-#: /tmp/ETpEqGX4UH.xml:155
+#: /tmp/6bL_6afI3I.xml:41 /tmp/6bL_6afI3I.xml:57 /tmp/6bL_6afI3I.xml:84
+#: /tmp/6bL_6afI3I.xml:175
 msgid "<hr>"
 msgstr ""
 
@@ -77,50 +77,65 @@
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
-msgid "Matt's (0x5FA14861)."
+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:32
+#: /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:33
+#: /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:34
+#: /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><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:40
 msgid "Step Zero: Install GnuPG"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42
 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:43
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:46
 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."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
 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 "
@@ -128,19 +143,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:52
 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:53
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:56
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:55
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
 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 "
@@ -148,13 +163,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
-#: /tmp/ETpEqGX4UH.xml:84 /tmp/ETpEqGX4UH.xml:163
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62
+#: /tmp/6bL_6afI3I.xml:87 /tmp/6bL_6afI3I.xml:183
 msgid "<b>Windows:</b>"
 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:63
 msgid ""
 "GnuPG for Windows is a command line tool, and you will need to use <i>cmd."
 "exe</i>. Unless you edit your PATH environment variable, you will need to "
@@ -164,24 +179,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:69
 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:68
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
 #, 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:70
-#: /tmp/ETpEqGX4UH.xml:87
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+#: /tmp/6bL_6afI3I.xml:90
 msgid "<b>Mac and Linux</b>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:74
 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 "
@@ -191,47 +206,47 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:79
 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:78
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
 #, no-wrap
 msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:80
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:82
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
 msgid ""
 "After importing the key, you will want to verify that the fingerprint is "
 "correct."
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:88
 #, no-wrap
 msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:88
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:91
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:96
 #, no-wrap
 msgid ""
 "    pub   1024D/28988BF5 2000-02-27\n"
@@ -257,6 +272,11 @@
 "    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
 "    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\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 &lt;chiiph@xxxxxxxxx&gt;\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 &lt;edmanm@xxxxxxx&gt;\n"
@@ -264,6 +284,13 @@
 "    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\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) &lt;atagar1@xxxxxxxxx&gt;\n"
+"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\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 &lt;jacob@xxxxxxxxxxxxx&gt;\n"
@@ -293,23 +320,28 @@
 "    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\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 &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
+"    sub   1024g/FC4A9460 2006-08-19\n"
+"\n"
 "    "
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:154
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:174
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:156
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:176
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
 "download the \".asc\" file as well."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:159
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:179
 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 "
@@ -317,42 +349,42 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:164
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:184
 #, 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>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:166
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:186
 msgid "<b>Mac:</b>"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:167
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
 #, 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:169
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:189
 msgid "<b>Linux</b>"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:170
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
 #, 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:173
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:193
 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:178
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
 #, no-wrap
 msgid ""
 "    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
@@ -364,7 +396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:186
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:206
 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 "
@@ -374,7 +406,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:193
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:213
 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 "
@@ -382,7 +414,7 @@
 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:218
 #, no-wrap
 msgid ""
 "    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
@@ -391,37 +423,37 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:202
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:222
 msgid "<b>RPM-based distributions :</b>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:203
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:223
 msgid ""
 "In order to manually verify the signatures on the RPM packages, you must use "
 "the <code>rpm</code> tool like so: <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:206
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:226
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
 msgid "<b>Debian:</b>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:210
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:230
 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>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:213
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
 msgid ""
 "If you wish to learn more about GPG, see <a href=\"http://www.gnupg.org/";
 "documentation/\">http://www.gnupg.org/documentation/</a>."

Modified: translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot	2011-04-18 09:35:38 UTC (rev 24652)
+++ translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot	2011-04-18 09:37:48 UTC (rev 24653)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
+"POT-Creation-Date: 2011-04-18 10:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -32,114 +32,180 @@
 #.  BEGIN SIDEBAR 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/faq-abuse.wml:15
-msgid "# #"
+msgid "<hr> # #"
 msgstr ""
 
-#. type: Content of: <div><div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:17 /tmp/gWXQV_nZkD.xml:18
-#: /tmp/gWXQV_nZkD.xml:19 /tmp/gWXQV_nZkD.xml:20 /tmp/gWXQV_nZkD.xml:21
-#: /tmp/gWXQV_nZkD.xml:22 /tmp/gWXQV_nZkD.xml:23 /tmp/gWXQV_nZkD.xml:24
-#: /tmp/gWXQV_nZkD.xml:25 /tmp/gWXQV_nZkD.xml:26 /tmp/gWXQV_nZkD.xml:27
-#: /tmp/gWXQV_nZkD.xml:28 /tmp/gWXQV_nZkD.xml:29 /tmp/gWXQV_nZkD.xml:30
-#: /tmp/gWXQV_nZkD.xml:31
+#.  END SIDEBAR 
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:18 /tmp/5DznWgeZY9.xml:19
+#: /tmp/5DznWgeZY9.xml:20 /tmp/5DznWgeZY9.xml:21 /tmp/5DznWgeZY9.xml:22
+#: /tmp/5DznWgeZY9.xml:23 /tmp/5DznWgeZY9.xml:24 /tmp/5DznWgeZY9.xml:25
+#: /tmp/5DznWgeZY9.xml:26 /tmp/5DznWgeZY9.xml:27 /tmp/5DznWgeZY9.xml:28
+#: /tmp/5DznWgeZY9.xml:29 /tmp/5DznWgeZY9.xml:30 /tmp/5DznWgeZY9.xml:31
+#: /tmp/5DznWgeZY9.xml:32 /tmp/5DznWgeZY9.xml:33
 msgid "#"
 msgstr ""
 
-#. type: Content of: <div><div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:17
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:18 /tmp/5DznWgeZY9.xml:34
 msgid "Questions"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:19
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:20
 msgid ""
 "<a href=\"<page docs/faq-abuse>#WhatAboutCriminals\">Doesn't Tor enable "
 "criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:20
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:21
 msgid ""
 "<a href=\"<page docs/faq-abuse>#DDoS\">What about distributed denial of "
 "service attacks?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:21
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:22
 msgid ""
 "<a href=\"<page docs/faq-abuse>#WhatAboutSpammers\">What about spammers?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:22
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:23
 msgid ""
 "<a href=\"<page docs/faq-abuse>#HowMuchAbuse\">Does Tor get much abuse?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:23
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:24
 msgid ""
 "<a href=\"<page docs/faq-abuse>#TypicalAbuses\">So what should I expect if I "
 "run an exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:24
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:25
 msgid ""
 "<a href=\"<page docs/faq-abuse>#IrcBans\">Tor is banned from the IRC network "
 "I want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:25
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:26
 msgid ""
 "<a href=\"<page docs/faq-abuse>#SMTPBans\">Your nodes are banned from the "
 "mail server I want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:26
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:27
 msgid ""
 "<a href=\"<page docs/faq-abuse>#Bans\">I want to ban the Tor network from my "
 "service.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:27
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:28
 msgid ""
 "<a href=\"<page docs/faq-abuse>#TracingUsers\">I have a compelling reason to "
 "trace a Tor user. Can you help?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:28
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:29
 msgid ""
 "<a href=\"<page docs/faq-abuse>#RemoveContent\">I want some content removed "
 "from a .onion address.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:29
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:30
 msgid ""
 "<a href=\"<page docs/faq-abuse>#LegalQuestions\">I have legal questions "
 "about Tor abuse.</a>"
 msgstr ""
 
-#.  END SIDEBAR 
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:36
+msgid ""
+"<a href=\"#WhatAboutCriminals\">Doesn't Tor enable criminals to do bad "
+"things?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:37
+msgid "<a href=\"#DDoS\">What about distributed denial of service attacks?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:38
+msgid "<a href=\"#WhatAboutSpammers\">What about spammers?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:39
+msgid "<a href=\"#HowMuchAbuse\">Does Tor get much abuse?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:40
+msgid ""
+"<a href=\"#TypicalAbuses\">So what should I expect if I run an exit relay?</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:41
+msgid ""
+"<a href=\"#IrcBans\">Tor is banned from the IRC network I want to use.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:42
+msgid ""
+"<a href=\"#SMTPBans\">Your nodes are banned from the mail server I want to "
+"use.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:43
+msgid "<a href=\"#Bans\">I want to ban the Tor network from my service.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:44
+msgid ""
+"<a href=\"#TracingUsers\">I have a compelling reason to trace a Tor user. "
+"Can you help?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:45
+msgid ""
+"<a href=\"#RemoveContent\">I want some content removed from a .onion address."
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:46
+msgid "<a href=\"#LegalQuestions\">I have legal questions about Tor abuse.</a>"
+msgstr ""
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:32
-msgid "# #<hr> <a id=\"WhatAboutCriminals\"></a>"
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:48
+msgid "<hr> <a id=\"WhatAboutCriminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:36
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:51
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutCriminals\">Doesn't Tor enable "
 "criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:38
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:53
 msgid ""
 "Criminals can already do bad things. Since they're willing to break laws, "
 "they already have lots of options available that provide <em>better</em> "
@@ -151,14 +217,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:46
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:61
 msgid ""
 "Tor aims to provide protection for ordinary people who want to follow the "
 "law. Only criminals have privacy right now, and we need to fix that."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:49
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:64
 msgid ""
 "Some advocates of anonymity explain that it's just a tradeoff &mdash; "
 "accepting the bad uses for the good ones &mdash; but there's more to it than "
@@ -171,7 +237,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:59
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:74
 msgid ""
 "So yes, criminals could in theory use Tor, but they already have better "
 "options, and it seems unlikely that taking Tor away from the world will stop "
@@ -180,26 +246,33 @@
 "and so on."
 msgstr ""
 
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:80
+msgid "#<a id=\"Pervasive\"></a> #"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:81
+msgid ""
+"<a class=\"anchor\" href=\"#Pervasive\">If the whole world starts using "
+"#Tor, won't civilization collapse?</a>"
+msgstr ""
+
 #
-#.     <a id="Pervasive">
-#. </a>
-#.     <h3><a class="anchor" href="#Pervasive">If the whole world starts using
-#.     Tor, won't civilization collapse?</a></h3>
-#.     
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:71
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:84
 msgid "<a id=\"DDoS\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:72
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:85
 msgid ""
 "<a class=\"anchor\" href=\"#DDoS\">What about distributed denial of service "
 "attacks?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:74
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:87
 msgid ""
 "Distributed denial of service (DDoS) attacks typically rely on having a "
 "group of thousands of computers all sending floods of traffic to a victim. "
@@ -208,7 +281,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:79
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:92
 msgid ""
 "But because Tor only transports correctly formed TCP streams, not all IP "
 "packets, you cannot send UDP packets over Tor. (You can't do specialized "
@@ -221,18 +294,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:88
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:101
 msgid "<a id=\"WhatAboutSpammers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:89
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:102
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutSpammers\">What about spammers?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:91
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:104
 msgid ""
 "First of all, the default Tor exit policy rejects all outgoing port 25 "
 "(SMTP) traffic. So sending spam mail through Tor isn't going to work by "
@@ -244,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:99
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:112
 msgid ""
 "Of course, it's not all about delivering the mail. Spammers can use Tor to "
 "connect to open HTTP proxies (and from there to SMTP servers); to connect to "
@@ -254,7 +327,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:107
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:120
 msgid ""
 "This is a shame, but notice that spammers are already doing great without "
 "Tor. Also, remember that many of their more subtle communication mechanisms "
@@ -263,33 +336,33 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:113
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:126
 msgid "<a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:114
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:127
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">How do Tor exit policies work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:117
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:130
 msgid "<a href=\"<page docs/faq>#ExitPolicies\">See the main FAQ</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:120
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:133
 msgid "<a id=\"HowMuchAbuse\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:121
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:134
 msgid "<a class=\"anchor\" href=\"#HowMuchAbuse\">Does Tor get much abuse?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:123
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:136
 msgid ""
 "Not much, in the grand scheme of things. The network has been running since "
 "October 2003, and it's only generated a handful of complaints. Of course, "
@@ -301,26 +374,26 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:131
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:144
 msgid ""
 "Since Tor has <a href=\"<page about/torusers>\">many good uses as well</a>, "
 "we feel that we're doing pretty well at striking a balance currently."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:136
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:149
 msgid "<a id=\"TypicalAbuses\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:137
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:150
 msgid ""
 "<a class=\"anchor\" href=\"#TypicalAbuses\">So what should I expect if I run "
 "an exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:139
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:152
 msgid ""
 "If you run a Tor relay that allows exit connections (such as the default "
 "exit policy), it's probably safe to say that you will eventually hear from "
@@ -328,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:144
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:157
 msgid ""
 "Somebody connects to Hotmail, and sends a ransom note to a company. The FBI "
 "sends you a polite email, you explain that you run a Tor relay, and they say "
@@ -336,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:148
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:161
 msgid ""
 "Somebody tries to get you shut down by using Tor to connect to Google groups "
 "and post spam to Usenet, and then sends an angry mail to your ISP about how "
@@ -344,7 +417,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:151
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:164
 msgid ""
 "Somebody connects to an IRC network and makes a nuisance of himself. Your "
 "ISP gets polite mail about how your computer has been compromised; and/or "
@@ -352,7 +425,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:154
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:167
 msgid ""
 "Somebody uses Tor to download a Vin Diesel movie, and your ISP gets a DMCA "
 "takedown notice. See EFF's <a href=\"<page eff/tor-dmca-response>\">Tor DMCA "
@@ -361,8 +434,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:161
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:174
 msgid ""
+"For a complete set of template responses to different abuse complaint types, "
+"see <a href=\"<wiki>TheOnionRouter/TorAbuseTemplates\">the collection of "
+"templates on the Tor wiki</a>. You can also proactively reduce the amount of "
+"abuse you get by following <a href=\"<blog>tips-running-exit-node-minimal-"
+"harassment\">these tips for running an exit node with minimal harassment</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:181
+msgid ""
 "You might also find that your Tor relay's IP is blocked from accessing some "
 "Internet sites/services. This might happen regardless of your exit policy, "
 "because some groups don't seem to know or care that Tor has exit policies. "
@@ -371,7 +454,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:168
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:188
 msgid ""
 "Because of a few cases of anonymous jerks messing with its web pages, "
 "Wikipedia is currently blocking many Tor relay IPs from writing (reading "
@@ -383,7 +466,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:177
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:197
 msgid ""
 "SORBS is putting some Tor relay IPs on their email blacklist as well. They "
 "do this because they passively detect whether your relay connects to certain "
@@ -395,19 +478,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:188
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:208
 msgid "<a id=\"IrcBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:189
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:209
 msgid ""
 "<a class=\"anchor\" href=\"#IrcBans\">Tor is banned from the IRC network I "
 "want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:191
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:211
 msgid ""
 "Sometimes jerks make use of Tor to troll IRC channels. This abuse results in "
 "IP-specific temporary bans (\"klines\" in IRC lingo), as the network "
@@ -415,7 +498,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:195
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:215
 msgid ""
 "This response underscores a fundamental flaw in IRC's security model: they "
 "assume that IP addresses equate to humans, and by banning the IP address "
@@ -429,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:205
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:225
 msgid ""
 "On the other hand, from the viewpoint of IRC server operators, security is "
 "not an all-or-nothing thing.  By responding quickly to trolls or any other "
@@ -443,7 +526,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:215
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:235
 msgid ""
 "But the real answer is to implement application-level auth systems, to let "
 "in well-behaving users and keep out badly-behaving users. This needs to be "
@@ -452,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:220
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:240
 msgid ""
 "Of course, not all IRC networks are trying to ban Tor nodes. After all, "
 "quite a few people use Tor to IRC in privacy in order to carry on legitimate "
@@ -463,7 +546,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:227
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:247
 msgid ""
 "If you're being blocked, have a discussion with the network operators and "
 "explain the issues to them. They may not be aware of the existence of Tor at "
@@ -475,7 +558,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:235
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:255
 msgid ""
 "Finally, if you become aware of an IRC network that seems to be blocking "
 "Tor, or a single Tor exit node, please put that information on <a href="
@@ -485,19 +568,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:242
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:262
 msgid "<a id=\"SMTPBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:243
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:263
 msgid ""
 "<a class=\"anchor\" href=\"#SMTPBans\">Your nodes are banned from the mail "
 "server I want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:245
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:265
 msgid ""
 "Even though <a href=\"#WhatAboutSpammers\">Tor isn't useful for spamming</"
 "a>, some over-zealous blacklisters seem to think that all open networks like "
@@ -506,7 +589,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:251
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:271
 msgid ""
 "If your server administrators decide to make use of these blacklists to "
 "refuse incoming mail, you should have a conversation with them and explain "
@@ -514,19 +597,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:255
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:275
 msgid "<a id=\"Bans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:256
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:276
 msgid ""
 "<a class=\"anchor\" href=\"#Bans\">I want to ban the Tor network from my "
 "service.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:258
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:278
 msgid ""
 "We're sorry to hear that. There are some situations where it makes sense to "
 "block anonymous users for an Internet service. But in many cases, there are "
@@ -535,7 +618,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:263
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:283
 msgid ""
 "First, ask yourself if there's a way to do application-level decisions to "
 "separate the legitimate users from the jerks. For example, you might have "
@@ -547,7 +630,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:272
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:292
 msgid ""
 "For example, the <a href=\"http://freenode.net/policy.shtml#tor\";>Freenode "
 "IRC network</a> had a problem with a coordinated group of abusers joining "
@@ -558,7 +641,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:280
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:300
 msgid ""
 "Second, consider that hundreds of thousands of people use Tor every day "
 "simply for good data hygiene &mdash; for example, to protect against data-"
@@ -573,7 +656,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:293
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:313
 msgid ""
 "At this point, you should also ask yourself what you do about other services "
 "that aggregate many users behind a few IP addresses. Tor is not so different "
@@ -581,7 +664,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:297
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:317
 msgid ""
 "Lastly, please remember that Tor relays have <a href=\"<page docs/"
 "faq>#ExitPolicies\">individual exit policies</a>. Many Tor relays do not "
@@ -593,7 +676,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:307
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:327
 msgid ""
 "If you really want to do this, we provide a <a href=\"https://check.";
 "torproject.org/cgi-bin/TorBulkExitList.py\">Tor exit relay list</a> or a <a "
@@ -601,7 +684,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:314
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:334
 msgid ""
 "(Some system administrators block ranges of IP addresses because of official "
 "policy or some abuse pattern, but some have also asked about whitelisting "
@@ -610,19 +693,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:320
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:340
 msgid "<a id=\"TracingUsers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:321
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:341
 msgid ""
 "<a class=\"anchor\" href=\"#TracingUsers\">I have a compelling reason to "
 "trace a Tor user. Can you help?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:324
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:344
 msgid ""
 "There is nothing the Tor developers can do to trace Tor users. The same "
 "protections that keep bad people from breaking Tor's anonymity also prevent "
@@ -630,7 +713,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:330
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:350
 msgid ""
 "Some fans have suggested that we redesign Tor to include a <a href=\"<page "
 "docs/faq>#Backdoor\">backdoor</a>.  There are two problems with this idea. "
@@ -644,28 +727,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:343
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:363
 msgid ""
+"This ultimately means that it is the responsibility of site owners to "
+"protect themselves against compromise and security issues that can come from "
+"anywhere. This is just part of signing up for the benefits of the Internet. "
+"You must be prepared to secure yourself against the bad elements, wherever "
+"they may come from. Tracking and increased surveillance are not the answer "
+"to preventing abuse."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:372
+msgid ""
 "But remember that this doesn't mean that Tor is invulnerable. Traditional "
 "police techniques can still be very effective against Tor, such as "
-"interviewing suspects, surveillance and keyboard taps, writing style "
-"analysis, sting operations, and other physical investigations."
+"investigating means, motive, and opportunity, interviewing suspects, writing "
+"style analysis, technical analysis of the content itself, sting operations, "
+"keyboard taps, and other physical investigations. The Tor Project is also "
+"happy to work with everyone including law enforcement groups to train them "
+"how to use the Tor software to safely conduct investigations or anonymized "
+"activities online."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:349
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:382
 msgid "<a id=\"RemoveContent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:350
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:383
 msgid ""
 "<a class=\"anchor\" href=\"#RemoveContent\">I want some content removed from "
 "a .onion address.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:351
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:384
 msgid ""
 "The Tor Project does not host, control, nor have the ability to discover the "
 "owner or location of a .onion address.  The .onion address is an address "
@@ -679,45 +777,46 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:360
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:393
 msgid ""
 "But remember that this doesn't mean that hidden services are invulnerable. "
 "Traditional police techniques can still be very effective against them, such "
-"as interviewing suspects, surveillance and keyboard taps, writing style "
-"analysis, sting operations, and other physical investigations."
+"as interviewing suspects, writing style analysis, technical analysis of the "
+"content itself, sting operations, keyboard taps, and other physical "
+"investigations."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:365
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:399
 msgid ""
-"If you have a complaint about child pornography, you may wish to report it "
-"to the National Center for Missing and Exploited Children, which serves as a "
-"national coordination point for investigation of child pornography: <a href="
-"\"http://www.missingkids.com/\";>http://www.missingkids.com/</a>.  We do not "
-"view links you report."
+"If you have a complaint about child abuse materials, you may wish to report "
+"it to the National Center for Missing and Exploited Children, which serves "
+"as a national coordination point for investigation of child pornography: <a "
+"href=\"http://www.missingkids.com/\";>http://www.missingkids.com/</a>.  We do "
+"not view links you report."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:371
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:405
 msgid "<a id=\"LegalQuestions\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:372
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:406
 msgid ""
 "<a class=\"anchor\" href=\"#LegalQuestions\">I have legal questions about "
 "Tor abuse.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:374
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:408
 msgid ""
 "We're only the developers. We can answer technical questions, but we're not "
 "the ones to talk to about legal questions or concerns."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:377
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:411
 msgid ""
 "Please take a look at the <a href=\"<page eff/tor-legal-faq>\">Tor Legal "
 "FAQ</a>, and contact EFF directly if you have any further legal questions."

Modified: translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot	2011-04-18 09:35:38 UTC (rev 24652)
+++ translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot	2011-04-18 09:37:48 UTC (rev 24653)
@@ -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-04-18 10:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -219,130 +219,23 @@
 "torimbrowserbundle>, 25 MB)"
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:94
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/projects/en/torbrowser.wml:93
 msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
-"US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser-"
-"<version-torimbrowserbundle>_en-US.exe.asc\" style=\"font-size: 90%;"
-"\">signature</a>)"
+"The Tor IM Browser Bundle has been <a href=\"https://blog.torproject.org/";
+"blog/tor-im-browser-bundle-discontinued-temporarily\">temporarily "
+"discontinued</a>."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><p>
 #: /home/runa/tor/website/projects/en/torbrowser.wml:96
 msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_ar."
-"exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a "
-"href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_ar.exe."
-"asc\" style=\"font-size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:98
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_de."
-"exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
-"torimbrowserbundle>_de.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:100
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
-"ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</"
-"a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
-"torimbrowserbundle>_es-ES.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:102
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_fa."
-"exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a> (<a href=\"../dist/"
-"torbrowser/tor-im-browser-<version-torimbrowserbundle>_fa.exe.asc\" style="
-"\"font-size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:104
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_fr."
-"exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</"
-"a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
-"torimbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:106
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_it."
-"exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser/tor-im-browser-"
-"<version-torimbrowserbundle>_it.exe.asc\" style=\"font-size: 90%;"
-"\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:108
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_nl."
-"exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser/tor-im-browser-"
-"<version-torimbrowserbundle>_nl.exe.asc\" style=\"font-size: 90%;"
-"\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:110
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pl."
-"exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
-"torimbrowserbundle>_pl.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:112
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
-"PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;"
-"&#x0073; (pt-PT)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
-"torimbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:114
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_ru."
-"exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a "
-"href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_ru.exe."
-"asc\" style=\"font-size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:116
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_vi."
-"exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser/tor-im-browser-"
-"<version-torimbrowserbundle>_vi.exe.asc\" style=\"font-size: 90%;"
-"\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:118
-msgid ""
-"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
-"CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser/"
-"tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe.asc\" style=\"font-"
-"size: 90%;\">signature</a>)"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:122
-msgid ""
 "BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox "
 "(version <version-torbrowserbundleosx>, 28 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:126
+#: /home/runa/tor/website/projects/en/torbrowser.wml:100
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-en-US.zip\">English (en-US)</a> (<a href=\"../dist/torbrowser/"
@@ -351,7 +244,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:129
+#: /home/runa/tor/website/projects/en/torbrowser.wml:103
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-ar.zip\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;"
@@ -361,7 +254,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:133
+#: /home/runa/tor/website/projects/en/torbrowser.wml:107
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-de.zip\">Deutsch (de)</a> (<a href=\"../dist/torbrowser/osx/"
@@ -370,7 +263,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:136
+#: /home/runa/tor/website/projects/en/torbrowser.wml:110
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-es-ES.zip\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;"
@@ -380,7 +273,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:140
+#: /home/runa/tor/website/projects/en/torbrowser.wml:114
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> (<a "
@@ -389,7 +282,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:143
+#: /home/runa/tor/website/projects/en/torbrowser.wml:117
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-fr.zip\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;"
@@ -399,7 +292,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:146
+#: /home/runa/tor/website/projects/en/torbrowser.wml:120
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-it.zip\">Italiano (it)</a> (<a href=\"../dist/torbrowser/osx/"
@@ -408,7 +301,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:149
+#: /home/runa/tor/website/projects/en/torbrowser.wml:123
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser/osx/"
@@ -417,7 +310,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:152
+#: /home/runa/tor/website/projects/en/torbrowser.wml:126
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-pl.zip\">Polish (pl)</a> (<a href=\"../dist/torbrowser/osx/"
@@ -426,7 +319,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:155
+#: /home/runa/tor/website/projects/en/torbrowser.wml:129
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-pt-PT.zip\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;"
@@ -436,7 +329,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:158
+#: /home/runa/tor/website/projects/en/torbrowser.wml:132
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-ru.zip\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;"
@@ -446,7 +339,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:162
+#: /home/runa/tor/website/projects/en/torbrowser.wml:136
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../"
@@ -455,7 +348,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:169
+#: /home/runa/tor/website/projects/en/torbrowser.wml:143
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> (64-"
@@ -463,7 +356,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:172
+#: /home/runa/tor/website/projects/en/torbrowser.wml:146
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> (<a "
@@ -477,7 +370,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:175
+#: /home/runa/tor/website/projects/en/torbrowser.wml:149
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -492,7 +385,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:177
+#: /home/runa/tor/website/projects/en/torbrowser.wml:151
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a href=\"../"
@@ -506,7 +399,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:179
+#: /home/runa/tor/website/projects/en/torbrowser.wml:153
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a href="
 "\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -521,7 +414,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:181
+#: /home/runa/tor/website/projects/en/torbrowser.wml:155
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a href=\"../dist/torbrowser/"
 "linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa."
@@ -535,7 +428,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:183
+#: /home/runa/tor/website/projects/en/torbrowser.wml:157
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -550,7 +443,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:185
+#: /home/runa/tor/website/projects/en/torbrowser.wml:159
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a href=\"../"
@@ -564,7 +457,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:187
+#: /home/runa/tor/website/projects/en/torbrowser.wml:161
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a href="
@@ -578,7 +471,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:189
+#: /home/runa/tor/website/projects/en/torbrowser.wml:163
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a href=\"../"
@@ -592,7 +485,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:191
+#: /home/runa/tor/website/projects/en/torbrowser.wml:165
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-"
 "PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -607,7 +500,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:193
+#: /home/runa/tor/website/projects/en/torbrowser.wml:167
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -622,7 +515,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:195
+#: /home/runa/tor/website/projects/en/torbrowser.wml:169
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz"
@@ -636,7 +529,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:201
+#: /home/runa/tor/website/projects/en/torbrowser.wml:175
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -648,17 +541,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:211
+#: /home/runa/tor/website/projects/en/torbrowser.wml:185
 msgid "<a id=\"MacOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:212
+#: /home/runa/tor/website/projects/en/torbrowser.wml:186
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:213
+#: /home/runa/tor/website/projects/en/torbrowser.wml:187
 msgid ""
 "Download the file above, save it somewhere, then click on it. Mac OS X will "
 "automatically unarchive it and you will have a TorBrowser application in "
@@ -668,24 +561,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:219
+#: /home/runa/tor/website/projects/en/torbrowser.wml:193
 msgid ""
 "<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
 "Mac OS X bundle\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:221
+#: /home/runa/tor/website/projects/en/torbrowser.wml:195
 msgid "<a id=\"Linux\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:222
+#: /home/runa/tor/website/projects/en/torbrowser.wml:196
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:223
+#: /home/runa/tor/website/projects/en/torbrowser.wml:197
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
 "run:<br> <code>tar -xvzf tor-browser-gnu-linux-i686-<version-"
@@ -699,27 +592,27 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:232
+#: /home/runa/tor/website/projects/en/torbrowser.wml:206
 msgid "<a id=\"Windows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:233
+#: /home/runa/tor/website/projects/en/torbrowser.wml:207
 msgid "<a class=\"anchor\" href=\"#Windows\">Windows instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:235
+#: /home/runa/tor/website/projects/en/torbrowser.wml:209
 msgid "<a id=\"Extraction\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h4>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:236
+#: /home/runa/tor/website/projects/en/torbrowser.wml:210
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:238
+#: /home/runa/tor/website/projects/en/torbrowser.wml:212
 msgid ""
 "Download the file above, and save it somewhere, then double click on it.  "
 "Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -731,57 +624,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:246
+#: /home/runa/tor/website/projects/en/torbrowser.wml:220
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:249
+#: /home/runa/tor/website/projects/en/torbrowser.wml:223
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:252
+#: /home/runa/tor/website/projects/en/torbrowser.wml:226
 msgid "<a id=\"Usage\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h4>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:253
+#: /home/runa/tor/website/projects/en/torbrowser.wml:227
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:255
+#: /home/runa/tor/website/projects/en/torbrowser.wml:229
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:257
+#: /home/runa/tor/website/projects/en/torbrowser.wml:231
 msgid ""
 "Double click on the <strong>Start Tor Browser</strong> (4) application (it "
 "may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:260
+#: /home/runa/tor/website/projects/en/torbrowser.wml:234
 msgid "The Vidalia window will shortly appear."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:262
+#: /home/runa/tor/website/projects/en/torbrowser.wml:236
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:265
+#: /home/runa/tor/website/projects/en/torbrowser.wml:239
 msgid ""
 "Once Tor is ready, Firefox will automatically be opened. Only web pages "
 "visited through the included Firefox browser will be sent via Tor. Other web "
@@ -793,14 +686,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:272
+#: /home/runa/tor/website/projects/en/torbrowser.wml:246
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:274
+#: /home/runa/tor/website/projects/en/torbrowser.wml:248
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
@@ -809,13 +702,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:280
+#: /home/runa/tor/website/projects/en/torbrowser.wml:254
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:283
+#: /home/runa/tor/website/projects/en/torbrowser.wml:257
 msgid ""
 "With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
 "the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on "
@@ -823,20 +716,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:285
+#: /home/runa/tor/website/projects/en/torbrowser.wml:259
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:288
+#: /home/runa/tor/website/projects/en/torbrowser.wml:262
 msgid ""
 "To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
 "steps in <a href=\"#Usage\">\"Usage\"</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:290
+#: /home/runa/tor/website/projects/en/torbrowser.wml:264
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a href=\"<wikifaq>#ExitEavesdroppers"
@@ -847,17 +740,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:298
+#: /home/runa/tor/website/projects/en/torbrowser.wml:272
 msgid "<a id=\"Feedback\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:299
+#: /home/runa/tor/website/projects/en/torbrowser.wml:273
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:301
+#: /home/runa/tor/website/projects/en/torbrowser.wml:275
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
 "discuss improvements and submit comments, please use the <a href=\"https://";
@@ -866,24 +759,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:306
+#: /home/runa/tor/website/projects/en/torbrowser.wml:280
 msgid "<a id=\"More\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:307
+#: /home/runa/tor/website/projects/en/torbrowser.wml:281
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:309
+#: /home/runa/tor/website/projects/en/torbrowser.wml:283
 msgid ""
 "<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
 "visit the <a href=\"<page index>\">Tor Project website</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:313
+#: /home/runa/tor/website/projects/en/torbrowser.wml:287
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects/torbrowser-"
@@ -891,7 +784,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:317
+#: /home/runa/tor/website/projects/en/torbrowser.wml:291
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
@@ -899,7 +792,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:321
+#: /home/runa/tor/website/projects/en/torbrowser.wml:295
 msgid ""
 "<strong>How can I make my own bundle?</strong> To download the source code "
 "and learn how to build the bundle yourself, read the <a href=\"<page "
@@ -907,7 +800,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:325
+#: /home/runa/tor/website/projects/en/torbrowser.wml:299
 msgid ""
 "Tor Browser Bundle is partially based on <a href=\"http://portableapps.com/";
 "apps/internet/firefox_portable\">Mozilla Firefox, Portable Edition</a> and "

Modified: translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot	2011-04-18 09:35:38 UTC (rev 24652)
+++ translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot	2011-04-18 09:37:48 UTC (rev 24653)
@@ -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-04-18 10:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -86,28 +86,31 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/projects/en/vidalia.wml:58
-msgid "The most recent stable release is: 0.2.10"
+msgid "The most recent stable release is: 0.2.12"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/projects/en/vidalia.wml:61
 msgid ""
-"<a href=\"../dist/vidalia/vidalia-0.2.10.msi\">Windows Installer</a> (<a "
-"href=\"../dist/vidalia/vidalia-0.2.10.msi.asc\">sig</a>)"
+"<a href=\"../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12.exe"
+"\">Windows Installer</a> (<a href=\"../dist/vidalia-bundles/vidalia-"
+"bundle-0.2.2.24-alpha-0.2.12.exe.asc\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/projects/en/vidalia.wml:65
 msgid ""
-"<a href=\"../dist/vidalia/vidalia-0.2.10-i386.dmg\">Mac OS X x86 Only</a> "
-"(<a href=\"../dist/vidalia/vidalia-0.2.10-i386.dmg.asc\">sig</a>)"
+"<a href=\"../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-i386."
+"dmg\">Mac OS X x86 Only</a> (<a href=\"../dist/vidalia-bundles/vidalia-"
+"bundle-0.2.2.24-alpha-0.2.12-i386.dmg.asc\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/projects/en/vidalia.wml:69
 msgid ""
-"<a href=\"../dist/vidalia/vidalia-0.2.9-ppc.dmg\">Mac OS X PPC-only</a> (<a "
-"href=\"../dist/vidalia/vidalia-0.2.9-ppc.dmg.asc\">sig</a>)"
+"<a href=\"../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-ppc."
+"dmg\">Mac OS X PPC Only</a> (<a href=\"../dist/vidalia-bundles/vidalia-"
+"bundle-0.2.2.24-alpha-0.2.12-ppc.dmg.asc\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -120,8 +123,8 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/projects/en/vidalia.wml:76
 msgid ""
-"<a href=\"../dist/vidalia/vidalia-0.2.10.tar.gz\">Source Tarball</a> (<a "
-"href=\"../dist/vidalia/vidalia-0.2.10.tar.gz.asc\">sig</a>)"
+"<a href=\"../dist/vidalia/vidalia-0.2.12.tar.gz\">Source Tarball</a> (<a "
+"href=\"../dist/vidalia/vidalia-0.2.12.tar.gz.sig\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -141,26 +144,45 @@
 "To start you should first take a look at the <a href=\"https://www.";
 "torproject.org/getinvolved/volunteer.html.en\"> volunteer page</a> and see "
 "if there is something that interests you the most.  Vidalia's source code "
-"can be found in the SVN repository. The checkout URL is: https://svn.";
-"torproject.org/vidalia. You should get to know how Vidalia works internally "
-"in order to work with it. To do this you should know C++ and Qt."
+"lives now in a Git repository under https://gitweb.torproject.org/vidalia.  "
+"The clone URL is git://git.torproject.org/vidalia. You should get to know "
+"how Vidalia works internally in order to work with it. To do this you should "
+"know C++ and Qt."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/projects/en/vidalia.wml:97
+msgid "<a id=\"Support\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/projects/en/vidalia.wml:98
+msgid "<a class=\"anchor\" href=\"#Support\">Support &amp; Development</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/projects/en/vidalia.wml:101
 msgid ""
 "If you intend to start coding already, please read and follow the <a href="
-"\"https://svn.torproject.org/vidalia/vidalia/trunk/HACKING\";>HACKING guide</"
-"a>.  If you have a patch for a feature or a bug fix, first check the <a href="
-"\"https://trac.torproject.org/projects/tor/report/27\";>tickets that are "
-"already submitted</a>, if there isn't a suited one for your patch, you can "
-"submit a <a href=\"https://trac.torproject.org/projects/tor/newticket\";>new "
-"ticket</a> selecting Vidalia as its Component."
+"\"https://gitweb.torproject.org/vidalia.git/blob/HEAD:/HACKING\";>HACKING "
+"guide</a>.  If you have a patch for a feature or a bug fix, first check the "
+"<a href=\"https://trac.torproject.org/projects/tor/report/27\";>tickets that "
+"are already submitted</a>, if there isn't a suited one for your patch, you "
+"can submit a <a href=\"https://trac.torproject.org/projects/tor/newticket";
+"\">new ticket</a> selecting Vidalia as its Component."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/vidalia.wml:109
+#: /home/runa/tor/website/projects/en/vidalia.wml:112
 msgid ""
+"If you found a bug or you want a specific feature for future Vidalia "
+"releases, please file a <a href=\"https://trac.torproject.org/projects/tor/";
+"newticket\">new ticket</a> selecting Vidalia as its Component."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/projects/en/vidalia.wml:118
+msgid ""
 "Every project member inside Tor mostly uses IRC to communicate. Vidalia is "
 "being developed currently by Matt Edman and Tomas Touceda. You can find them "
 "in #vidalia channel at OFTC under the nicks edmanm and chiiph, repectively. "
@@ -171,34 +193,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/vidalia.wml:119
+#: /home/runa/tor/website/projects/en/vidalia.wml:128
 msgid ""
 "If you have any doubts about any of the points in here, you can email <a "
 "href=\"<page about/contact>\">contact us</a> about it."
 msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/vidalia.wml:124
-msgid "<a id=\"Support\"></a>"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/vidalia.wml:125
-msgid "<a class=\"anchor\" href=\"#Support\">Support &amp; Development</a>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/vidalia.wml:128
-msgid ""
-"Please open a <a href=\"https://trac.torproject.org/projects/tor/";
-"report/27\">ticket</a> on our bug tracker for any bugs you find or features "
-"you would like to see added in future releases."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/vidalia.wml:134
-msgid ""
-"We also have a <a href=\"http://lists.vidalia-project.net/cgi-bin/mailman/";
-"listinfo/vidalia-users\">vidalia-users</a> mailing list for support-related "
-"questions."
-msgstr ""

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits