[tor-commits] r24774: {translation} updated the website translation templates (in translation/trunk/projects/website/po/templates: about docs donate download projects)

Author: runa Date: 2011-05-23 16:00:45 +0000 (Mon, 23 May 2011) New Revision: 24774

Modified: translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot translation/trunk/projects/website/po/templates/donate/3-low.donate.pot translation/trunk/projects/website/po/templates/download/3-low.download.pot translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot Log: updated the website translation templates

Modified: translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot =================================================================== --- translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot 2011-05-20 01:20:13 UTC (rev 24773) +++ translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot 2011-05-23 16:00:45 UTC (rev 24774) @@ -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-05-23 17:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME EMAIL@ADDRESS\n" "Language-Team: LANGUAGE LL@li.org\n" @@ -269,12 +269,21 @@ #. type: Content of: <div><div><ol><li> #: /home/runa/tor/website/about/en/gsoc.wml:169 msgid "" +"Are you applying to other projects for GSoC and, if so, what would be your " +"preference if you're accepted to both? Having a stated preference helps with " +"the deduplication process and will not impact if we accept your application " +"or not." +msgstr "" + +#. type: Content of: <div><div><ol><li> +#: /home/runa/tor/website/about/en/gsoc.wml:174 +msgid "" "Is there anything else we should know that will make us like your project " "more?" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/gsoc.wml:175 +#: /home/runa/tor/website/about/en/gsoc.wml:180 msgid "" "We will pick out mentors for this year &mdash; most of the people on the <a " "href="<page about/corepeople>">core Tor development team</a> plus a few " @@ -288,7 +297,7 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/gsoc.wml:187 +#: /home/runa/tor/website/about/en/gsoc.wml:192 msgid "" "If you're interested, you can either contact the <a href="<page about/" "contact>">tor-assistants list</a> with a brief summary of your proposal and " @@ -300,7 +309,7 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/gsoc.wml:197 +#: /home/runa/tor/website/about/en/gsoc.wml:202 msgid "" "The more applications we get, the more likely Google is to give us good " "students. So if you haven't filled up your summer plans yet, please consider " @@ -308,17 +317,17 @@ msgstr ""

#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/gsoc.wml:202 +#: /home/runa/tor/website/about/en/gsoc.wml:207 msgid "<a id="Example"></a>" msgstr ""

#. type: Content of: <div><div><h2> -#: /home/runa/tor/website/about/en/gsoc.wml:203 +#: /home/runa/tor/website/about/en/gsoc.wml:208 msgid "<a class="anchor" href="#Example">Application Examples</a>" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/gsoc.wml:206 +#: /home/runa/tor/website/about/en/gsoc.wml:211 msgid "" "Below are examples of some GSoC applications from previous years we liked. " "The best applications tend to go through several iterations so you're highly " @@ -326,29 +335,57 @@ msgstr ""

#. type: Content of: <div><div><ul><li><h4> -#: /home/runa/tor/website/about/en/gsoc.wml:212 +#: /home/runa/tor/website/about/en/gsoc.wml:217 msgid "" "<a href="http://tor.spanning-tree.org/proposal.html%5C%22%3EDNSEL Rewrite</a> by " "Harry Bock" msgstr ""

#. type: Content of: <div><div><ul><li><h4> -#: /home/runa/tor/website/about/en/gsoc.wml:213 +#: /home/runa/tor/website/about/en/gsoc.wml:218 msgid "" "<a href="http://kjb.homeunix.com/wp-content/uploads/2010/05/KevinBerry-" "GSoC2010-TorProposal.html">Extending Tor Network Metrics</a> by Kevin Berry" msgstr ""

#. type: Content of: <div><div><ul><li><h4> -#: /home/runa/tor/website/about/en/gsoc.wml:214 +#: /home/runa/tor/website/about/en/gsoc.wml:219 msgid "" "<a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</" "a> by John Schanck" msgstr ""

#. type: Content of: <div><div><ul><li><h4> -#: /home/runa/tor/website/about/en/gsoc.wml:215 +#: /home/runa/tor/website/about/en/gsoc.wml:220 msgid "" +"<a href="http://inspirated.com/uploads/tor-gsoc-11.pdf%5C%22%3EGTK+ Frontend and " +"Client Mode Improvements for arm</a> by Kamran Khan" +msgstr "" + +#. type: Content of: <div><div><ul><li><h4> +#: /home/runa/tor/website/about/en/gsoc.wml:221 +msgid "" +"<a href="http://www.gsathya.in/gsoc11.html%5C%22%3EOrbot + ORLib</a> by Sathya " +"Gunasekaran" +msgstr "" + +#. type: Content of: <div><div><ul><li><h4> +#: /home/runa/tor/website/about/en/gsoc.wml:222 +msgid "" +"<a href="http://blanu.net/TorSummerOfCodeProposal.pdf%5C%22%3EBlocking-resistant " +"Transport Evaluation Framework</a> by Brandon Wiley" +msgstr "" + +#. type: Content of: <div><div><ul><li><h4> +#: /home/runa/tor/website/about/en/gsoc.wml:223 +msgid "" +"<a href="../about/gsocProposal/gsoc11-proposal-metadataToolkit.pdf" +"">Metadata Anonymisation Toolkit</a> by Julien Voisin" +msgstr "" + +#. type: Content of: <div><div><ul><li><h4> +#: /home/runa/tor/website/about/en/gsoc.wml:224 +msgid "" "<a href="http://www.atagar.com/misc/gsocBlog09/%5C%22%3EWebsite Pootle " "Translation</a> by Damian Johnson" msgstr ""

Modified: translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot 2011-05-20 01:20:13 UTC (rev 24773) +++ translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot 2011-05-23 16:00:45 UTC (rev 24774) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-05-02 16:59+0200\n" +"POT-Creation-Date: 2011-05-23 17:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME EMAIL@ADDRESS\n" "Language-Team: LANGUAGE LL@li.org\n" @@ -207,14 +207,15 @@ #. type: Content of: <div><div><ol><li> #: /home/runa/tor/website/docs/en/documentation.wml:147 msgid "" -"Our <a href="<gitblob>doc/TODO">developer TODO file</a> starts with a " -"timeline for external promises &mdash; things <a href="<page about/sponsors>" -"">our sponsors</a> have paid to see done. It also lists many other tasks " -"and topics we'd like to tackle next." +"Our <a href="https://trac.torproject.org/projects/tor/wiki/sponsors" +"">sponsor TODO list</a> starts with a timeline for external promises " +"&mdash; things <a href="<page about/sponsors>">our sponsors</a> have paid " +"to see done. It also lists many other tasks and topics we'd like to tackle " +"next." msgstr ""

#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/documentation.wml:154 +#: /home/runa/tor/website/docs/en/documentation.wml:155 msgid "" "Once you're up to speed, things will continue to change surprisingly fast. " "The <a href="#MailingLists">tor-dev mailing list</a> is where the complex " @@ -223,17 +224,17 @@ msgstr ""

#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/documentation.wml:162 +#: /home/runa/tor/website/docs/en/documentation.wml:163 msgid "<a id="MailingLists"></a>" msgstr ""

#. type: Content of: <div><div><h1> -#: /home/runa/tor/website/docs/en/documentation.wml:163 +#: /home/runa/tor/website/docs/en/documentation.wml:164 msgid "<a class="anchor" href="#MailingLists">Mailing List Information</a>" msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:165 +#: /home/runa/tor/website/docs/en/documentation.wml:166 msgid "" "The <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" "announce/">tor-announce mailing list</a> is a low volume list for " @@ -244,7 +245,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:171 +#: /home/runa/tor/website/docs/en/documentation.wml:172 msgid "" "The <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk/" "">tor-talk list</a> is where a lot of discussion happens, and is where we " @@ -252,7 +253,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:174 +#: /home/runa/tor/website/docs/en/documentation.wml:175 msgid "" "The <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" "relays/">tor-relays list</a> is where discussions about running, " @@ -261,7 +262,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:178 +#: /home/runa/tor/website/docs/en/documentation.wml:179 msgid "" "The <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev/" "">tor-dev list</a> is for posting by developers only, and is very low " @@ -269,7 +270,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:180 +#: /home/runa/tor/website/docs/en/documentation.wml:181 msgid "" "A list for <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/" "tor-mirrors">mirror operators</a> for new website mirrors, and supporting " @@ -277,14 +278,14 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:183 +#: /home/runa/tor/website/docs/en/documentation.wml:184 msgid "" "A list for <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/" "tor-commits/">svn and git commits</a> may be interesting for developers." msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:185 +#: /home/runa/tor/website/docs/en/documentation.wml:186 msgid "" "An automated list for <a href="https://lists.torproject.org/cgi-bin/mailman/" "listinfo/tor-bugs/">bug reports from trac</a> may be interesting for users " @@ -292,17 +293,17 @@ msgstr ""

#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/documentation.wml:189 +#: /home/runa/tor/website/docs/en/documentation.wml:190 msgid "<a id="DesignDoc"></a>" msgstr ""

#. type: Content of: <div><div><h1> -#: /home/runa/tor/website/docs/en/documentation.wml:190 +#: /home/runa/tor/website/docs/en/documentation.wml:191 msgid "<a class="anchor" href="#DesignDoc">Design Documents</a>" msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:192 +#: /home/runa/tor/website/docs/en/documentation.wml:193 msgid "" "The <b>design document</b> (published at Usenix Security 2004) gives our " "justifications and security analysis for the Tor design: <a href="https://" @@ -312,7 +313,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:197 +#: /home/runa/tor/website/docs/en/documentation.wml:198 msgid "" "Our follow-up paper on <b>challenges in low-latency anonymity</b> (still in " "draft form) details more recent experiences and directions: <a href=" @@ -321,7 +322,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:201 +#: /home/runa/tor/website/docs/en/documentation.wml:202 msgid "" "Our paper at WEIS 2006 &mdash; <b>Anonymity Loves Company: Usability and the " "Network Effect</b> &mdash; explains why usability in anonymity systems " @@ -330,7 +331,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:205 +#: /home/runa/tor/website/docs/en/documentation.wml:206 msgid "" "Our preliminary design to make it harder for large firewalls to prevent " "access to the Tor network is described in <b>design of a blocking-resistant " @@ -341,19 +342,19 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:211 +#: /home/runa/tor/website/docs/en/documentation.wml:212 msgid "" "The <b>specifications</b> aim to give developers enough information to build " "a compatible version of Tor:" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:214 +#: /home/runa/tor/website/docs/en/documentation.wml:215 msgid "<a href="<specblob>tor-spec.txt">Main Tor specification</a>" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:215 +#: /home/runa/tor/website/docs/en/documentation.wml:216 msgid "" "<a href="<specblob>dir-spec.txt">Tor version 3 directory server " "specification</a> (and older <a href="<specblob>dir-spec-v1.txt">version " @@ -362,72 +363,72 @@ msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:220 +#: /home/runa/tor/website/docs/en/documentation.wml:221 msgid "" "<a href="<specblob>control-spec.txt">Tor control protocol specification</a>" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:222 +#: /home/runa/tor/website/docs/en/documentation.wml:223 msgid "<a href="<specblob>rend-spec.txt">Tor rendezvous specification</a>" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:224 +#: /home/runa/tor/website/docs/en/documentation.wml:225 msgid "" "<a href="<specblob>path-spec.txt">Tor path selection specification</a>" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:226 +#: /home/runa/tor/website/docs/en/documentation.wml:227 msgid "<a href="<specblob>address-spec.txt">Special hostnames in Tor</a>" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:228 +#: /home/runa/tor/website/docs/en/documentation.wml:229 msgid "" "<a href="<specblob>socks-extensions.txt">Tor's SOCKS support and " "extensions</a>" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:230 +#: /home/runa/tor/website/docs/en/documentation.wml:231 msgid "<a href="<specblob>version-spec.txt">How Tor version numbers work</a>" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:232 +#: /home/runa/tor/website/docs/en/documentation.wml:233 msgid "" "<a href="<spectree>proposals">In-progress drafts of new specifications and " "proposed changes</a>" msgstr ""

#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/documentation.wml:238 +#: /home/runa/tor/website/docs/en/documentation.wml:239 msgid "<a id="NeatLinks"></a>" msgstr ""

#. type: Content of: <div><div><h1> -#: /home/runa/tor/website/docs/en/documentation.wml:239 +#: /home/runa/tor/website/docs/en/documentation.wml:240 msgid "<a class="anchor" href="#NeatLinks">Neat Links</a>" msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:241 +#: /home/runa/tor/website/docs/en/documentation.wml:242 msgid "" "The <a href="<wiki>">Tor wiki</a> provides a plethora of helpful " "contributions from Tor users. Check it out!" msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:244 +#: /home/runa/tor/website/docs/en/documentation.wml:245 msgid "" "<a href="<wiki>TheOnionRouter/SupportPrograms">A list of supporting " "programs you might want to use in association with Tor</a>." msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:248 +#: /home/runa/tor/website/docs/en/documentation.wml:249 msgid "" "<a href="https://check.torproject.org/%5C%22%3EThe Tor detector</a> or <a href=" ""http://torcheck.xenobite.eu/%5C%22%3Ethe other Tor detector</a> try to guess if " @@ -435,7 +436,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:251 +#: /home/runa/tor/website/docs/en/documentation.wml:252 msgid "" "Check out one of the Tor status pages, such as <a href="http://torstatus." "blutmagie.de/">blutmagie's</a>, or <a href="http://trunk.torstatus.kgprog." @@ -446,7 +447,7 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:258 +#: /home/runa/tor/website/docs/en/documentation.wml:259 msgid "" "Read <a href="http://freehaven.net/anonbib/topic." "html#Anonymous_20communication">these papers</a> (especially the ones in " @@ -454,50 +455,50 @@ msgstr ""

#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/documentation.wml:264 +#: /home/runa/tor/website/docs/en/documentation.wml:265 msgid "<a id="Developers"></a>" msgstr ""

#. type: Content of: <div><div><h1> -#: /home/runa/tor/website/docs/en/documentation.wml:265 +#: /home/runa/tor/website/docs/en/documentation.wml:266 msgid "<a class="anchor" href="#Developers">For Developers</a>" msgstr ""

#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/documentation.wml:266 +#: /home/runa/tor/website/docs/en/documentation.wml:267 msgid "Browse the Tor <b>source repository</b>:" msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:268 +#: /home/runa/tor/website/docs/en/documentation.wml:269 msgid "<a href="<gitrepo>">Browse the repository's source tree directly</a>" msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:269 +#: /home/runa/tor/website/docs/en/documentation.wml:270 msgid "Git and SVN access:" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:271 +#: /home/runa/tor/website/docs/en/documentation.wml:272 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>" msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:272 +#: /home/runa/tor/website/docs/en/documentation.wml:273 msgid "" "The development branch is <kbd>master</kbd>. The active maintenance " "branches are <kbd>maint-0.2.1</kbd> and <kbd>maint-0.2.2</kbd>." msgstr ""

#. type: Content of: <div><div><ul><li><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:273 +#: /home/runa/tor/website/docs/en/documentation.wml:274 msgid "" "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>" msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/documentation.wml:276 +#: /home/runa/tor/website/docs/en/documentation.wml:277 msgid "" "<a href="https://gitweb.torproject.org//githax.git?a=blob;f=doc/Howto.txt;" "hb=HEAD">Basic instructions for using Git to contribute to Tor software.</a>"

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-05-20 01:20:13 UTC (rev 24773) +++ translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot 2011-05-23 16:00:45 UTC (rev 24774) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-04-18 10:37+0200\n" +"POT-Creation-Date: 2011-05-23 17:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME EMAIL@ADDRESS\n" "Language-Team: LANGUAGE LL@li.org\n" @@ -30,8 +30,8 @@

#. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13 -#: /tmp/6bL_6afI3I.xml:41 /tmp/6bL_6afI3I.xml:57 /tmp/6bL_6afI3I.xml:84 -#: /tmp/6bL_6afI3I.xml:175 +#: /tmp/GgIrzWMX_o.xml:42 /tmp/GgIrzWMX_o.xml:58 /tmp/GgIrzWMX_o.xml:85 +#: /tmp/GgIrzWMX_o.xml:181 msgid "<hr>" msgstr ""

@@ -117,25 +117,35 @@ msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags." msgstr ""

+#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38 +msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot." +msgstr "" + +#. type: Content of: <div><div><ul> +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38 +msgid "." +msgstr "" + #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:40 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:41 msgid "Step Zero: Install GnuPG" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:43 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:46 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:47 msgid "" "Linux: see <a href="http://www.gnupg.org/download/%5C%22%3Ehttp://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:49 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:50 msgid "" "Windows: see <a href="http://www.gnupg.org/download/%5C%22%3Ehttp://www.gnupg.org/" "download/</a>. Look for the "version compiled for MS-Windows" under " @@ -143,19 +153,19 @@ msgstr ""

#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:52 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:53 msgid "" "Mac: see <a href="http://macgpg.sourceforge.net/%5C%22%3Ehttp://macgpg." "sourceforge.net/</a>." msgstr ""

#. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:56 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:57 msgid "Step One: Import the keys" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59 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 " @@ -163,13 +173,13 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62 -#: /tmp/6bL_6afI3I.xml:87 /tmp/6bL_6afI3I.xml:183 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:63 +#: /tmp/GgIrzWMX_o.xml:88 /tmp/GgIrzWMX_o.xml:189 msgid "<b>Windows:</b>" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:63 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64 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 " @@ -179,24 +189,24 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:69 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:70 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:71 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:72 #, 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:73 -#: /tmp/6bL_6afI3I.xml:90 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:74 +#: /tmp/GgIrzWMX_o.xml:91 msgid "<b>Mac and Linux</b>" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:74 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75 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 " @@ -206,47 +216,47 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:79 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:80 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:81 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:82 #, 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:83 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:84 msgid "Step Two: Verify the fingerprints" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:86 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:88 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:89 #, 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:91 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:92 #, no-wrap msgid "gpg --fingerprint (insert keyid here)" msgstr ""

#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:94 msgid "The fingerprints for the keys should be:" msgstr ""

#. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:96 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97 #, no-wrap msgid "" " pub 1024D/28988BF5 2000-02-27\n" @@ -325,23 +335,28 @@ " uid Robert Hogan &lt;robert@roberthogan.net&gt;\n" " sub 1024g/FC4A9460 2006-08-19\n" "\n" +" pub 3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n" +" \t Key fingerprint = B92B CA64 72F7 C6F0 8D47 8503 D2AC D203 B374 CBD2\n" +" uid Nathan of Guardian &lt;nathan@guardianproject.info&gt;\n" +" sub 4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n" +"\n" " " msgstr ""

#. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:174 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:180 msgid "Step Three: Verify the downloaded package" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:176 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:182 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:179 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185 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 " @@ -349,42 +364,42 @@ msgstr ""

#. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:184 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190 #, 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:186 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:192 msgid "<b>Mac:</b>" msgstr ""

#. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:193 #, 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:189 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195 msgid "<b>Linux</b>" msgstr ""

#. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:196 #, 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:193 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:199 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:198 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204 #, no-wrap msgid "" " gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n" @@ -396,7 +411,7 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:206 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:212 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 " @@ -406,7 +421,7 @@ 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:219 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 " @@ -414,7 +429,7 @@ msgstr ""

#. type: Content of: <div><div><pre> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:218 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224 #, no-wrap msgid "" " gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n" @@ -423,37 +438,37 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:222 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:228 msgid "<b>RPM-based distributions :</b>" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:223 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229 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:226 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:232 #, no-wrap msgid "rpm -K filename.rpm" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:235 msgid "<b>Debian:</b>" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/verifying-signatures.wml:230 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:236 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:233 +#: /home/runa/tor/website/docs/en/verifying-signatures.wml:239 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/donate/3-low.donate.pot =================================================================== --- translation/trunk/projects/website/po/templates/donate/3-low.donate.pot 2011-05-20 01:20:13 UTC (rev 24773) +++ translation/trunk/projects/website/po/templates/donate/3-low.donate.pot 2011-05-23 16:00:45 UTC (rev 24774) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-12 12:19+0000\n" +"POT-Creation-Date: 2011-05-23 17:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME EMAIL@ADDRESS\n" "Language-Team: LANGUAGE LL@li.org\n" @@ -43,29 +43,29 @@

#. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/donate/en/donate.wml:23 -msgid "Paypal" +msgid "<a href="#paypal">Paypal</a>" msgstr ""

#. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/donate/en/donate.wml:24 -msgid "Amazon Payments" +msgid "<a href="#amazon">Amazon Payments</a>" msgstr ""

#. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/donate/en/donate.wml:25 -msgid "Google Checkout" +msgid "<a href="#google">Google Checkout</a>" msgstr ""

#. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/donate/en/donate.wml:26 -msgid "Givv.org" +msgid "<a href="#givv">Givv.org</a>" msgstr ""

#. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/donate/en/donate.wml:27 msgid "" -"checks, money orders, bank transfers, stock grants or other more " -"sophisticated transactions." +"<a href="#cash">checks, money orders, bank transfers, stock grants or " +"other more sophisticated transactions.</a>" msgstr ""

#. type: Content of: <div><div><p> @@ -80,48 +80,53 @@ msgid "Tor Project Subscription via PayPal" msgstr ""

+#. type: Content of: <div><div><div><div> +#: /home/runa/tor/website/donate/en/donate.wml:35 +msgid "<a id="paypal"></a> <a class="anchor" href="#paypal"></a>" +msgstr "" + #. type: Content of: <div><div><div><div><h4> -#: /home/runa/tor/website/donate/en/donate.wml:35 +#: /home/runa/tor/website/donate/en/donate.wml:37 msgid "Monthly Subscription to The Tor Project" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:40 /tmp/ugTbmfEHjk.xml:89 +#: /home/runa/tor/website/donate/en/donate.wml:42 /tmp/JsimINXUVm.xml:91 msgid "Choose your currency:" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td><select> -#: /home/runa/tor/website/donate/en/donate.wml:42 /tmp/ugTbmfEHjk.xml:91 +#: /home/runa/tor/website/donate/en/donate.wml:44 /tmp/JsimINXUVm.xml:93 msgid "<select name="currency_code">" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td><select><option> -#: /home/runa/tor/website/donate/en/donate.wml:43 /tmp/ugTbmfEHjk.xml:92 +#: /home/runa/tor/website/donate/en/donate.wml:45 /tmp/JsimINXUVm.xml:94 msgid "$" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td><select><option> -#: /home/runa/tor/website/donate/en/donate.wml:44 /tmp/ugTbmfEHjk.xml:93 +#: /home/runa/tor/website/donate/en/donate.wml:46 /tmp/JsimINXUVm.xml:95 msgid "&euro;" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td><select><option> -#: /home/runa/tor/website/donate/en/donate.wml:45 /tmp/ugTbmfEHjk.xml:94 +#: /home/runa/tor/website/donate/en/donate.wml:47 /tmp/JsimINXUVm.xml:96 msgid "&pound;" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td><select><option> -#: /home/runa/tor/website/donate/en/donate.wml:46 /tmp/ugTbmfEHjk.xml:95 +#: /home/runa/tor/website/donate/en/donate.wml:48 /tmp/JsimINXUVm.xml:97 msgid "&yen;" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:47 /tmp/ugTbmfEHjk.xml:96 +#: /home/runa/tor/website/donate/en/donate.wml:49 /tmp/JsimINXUVm.xml:98 msgid "</select>" msgstr ""

#. type: Content of: <div><div><div><div><table><form><div><tr> -#: /home/runa/tor/website/donate/en/donate.wml:51 +#: /home/runa/tor/website/donate/en/donate.wml:53 msgid "" "<input type="hidden" name="p3" value="1"> <input type="hidden" name=" ""t3" value="M"> <input type="hidden" name="sra" value="1"> <input " @@ -139,113 +144,119 @@ msgstr ""

#. type: Content of: <div><div><div><div><table><form><div><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:66 -msgid "<input type="radio" name="a3" value="5.00">5/mo" +#: /home/runa/tor/website/donate/en/donate.wml:68 +msgid "<input type="radio" name="amount" value="5.00">5/mo" msgstr ""

#. type: Content of: <div><div><div><div><table><form><div><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:67 -msgid "<input type="radio" name="a3" value="10.00">10/mo" +#: /home/runa/tor/website/donate/en/donate.wml:69 +msgid "<input type="radio" name="amount" value="10.00">10/mo" msgstr ""

#. type: Content of: <div><div><div><div><table><form><div><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:68 +#: /home/runa/tor/website/donate/en/donate.wml:70 msgid "" -"<input type="radio" name="a3" value="20.00" checked="checked">20/mo" +"<input type="radio" name="amount" value="20.00" checked="checked">20/" +"mo" msgstr ""

#. type: Content of: <div><div><div><div><table><form><div><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:71 -msgid "<input type="radio" name="a3" value="50.00">50/mo" +#: /home/runa/tor/website/donate/en/donate.wml:73 +msgid "<input type="radio" name="amount" value="50.00">50/mo" msgstr ""

#. type: Content of: <div><div><div><div><table><form><div><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:72 -msgid "<input type="radio" name="a3" value="100.00">100/mo" +#: /home/runa/tor/website/donate/en/donate.wml:74 +msgid "<input type="radio" name="amount" value="100.00">100/mo" msgstr ""

#. type: Content of: <div><div><div><div><table><form><div><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:73 -msgid "<input type="radio" name="a3" value="250.00">250/mo" +#: /home/runa/tor/website/donate/en/donate.wml:75 +msgid "<input type="radio" name="amount" value="250.00">250/mo" msgstr ""

#. type: Content of: <div><div><div> -#: /home/runa/tor/website/donate/en/donate.wml:82 +#: /home/runa/tor/website/donate/en/donate.wml:84 msgid "Single Donation via PayPal" msgstr ""

#. type: Content of: <div><div><div><div><h4> -#: /home/runa/tor/website/donate/en/donate.wml:85 +#: /home/runa/tor/website/donate/en/donate.wml:87 msgid "Make a one-time donation" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr> -#: /home/runa/tor/website/donate/en/donate.wml:100 +#: /home/runa/tor/website/donate/en/donate.wml:102 msgid "" "<input type="hidden" name="no_shipping" value="1"> <input type="image" "" src="$(IMGROOT)/btn_donateCC_LG.gif" name="submit" alt="Make a " "single donation with PayPal - it's fast, free and secure!"/> <input type=" ""hidden" name="cmd" value="_xclick"> <input type="hidden" name=" ""business" value="donations@torproject.org"> <input type="hidden" name=" -""item_name" value="Tor"> <input type="hidden" name="return" value=" -""https://www.torproject.org/donate/donate.html.en%5C%22/%3E <input type="hidden" -"" name="cancel_return" value="https://www.torproject.org/donate/donate." -"html.en"/>" +""item_name" value="Donation to the Tor Project"> <input type="hidden" " +"name="return" value="https://www.torproject.org/donate/donate.html.en%5C%22/%3E " +"<input type="hidden" name="cancel_return" value="https://www.torproject." +"org/donate/donate.html.en"/>" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:109 -msgid "<input type="radio" name="a3" value="10.00"> 10" +#: /home/runa/tor/website/donate/en/donate.wml:111 +msgid "<input type="radio" name="amount" value="10.00"> 10" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:110 +#: /home/runa/tor/website/donate/en/donate.wml:112 msgid "" -"<input type="radio" name="a3" value="20.00" checked="checked"> 20" +"<input type="radio" name="amount" value="20.00" checked="checked"> 20" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:111 -msgid "<input type="radio" name="a3" value="50.00"> 50" +#: /home/runa/tor/website/donate/en/donate.wml:113 +msgid "<input type="radio" name="amount" value="50.00"> 50" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:112 -msgid "<input type="radio" name="a3" value="100.00"> 100" +#: /home/runa/tor/website/donate/en/donate.wml:114 +msgid "<input type="radio" name="amount" value="100.00"> 100" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:115 -msgid "<input type="radio" name="a3" value="250.00"> 250" +#: /home/runa/tor/website/donate/en/donate.wml:117 +msgid "<input type="radio" name="amount" value="250.00"> 250" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:116 -msgid "<input type="radio" name="a3" value="500.00"> 500" +#: /home/runa/tor/website/donate/en/donate.wml:118 +msgid "<input type="radio" name="amount" value="500.00"> 500" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:117 -msgid "<input type="radio" name="a3" value="1000.00"> 1,000" +#: /home/runa/tor/website/donate/en/donate.wml:119 +msgid "<input type="radio" name="amount" value="1000.00"> 1,000" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:118 -msgid "<input type="radio" name="a3" value="5000.00"> 5,000" +#: /home/runa/tor/website/donate/en/donate.wml:120 +msgid "<input type="radio" name="amount" value="5000.00"> 5,000" msgstr ""

#. type: Content of: <div><div><div> -#: /home/runa/tor/website/donate/en/donate.wml:126 +#: /home/runa/tor/website/donate/en/donate.wml:128 msgid "Single Donation via Amazon Payments" msgstr ""

+#. type: Content of: <div><div><div><div> +#: /home/runa/tor/website/donate/en/donate.wml:131 +msgid "<a id="amazon"></a> <a class="anchor" href="#amazon"></a>" +msgstr "" + #. type: Content of: <div><div><div><div><h4> -#: /home/runa/tor/website/donate/en/donate.wml:129 /tmp/ugTbmfEHjk.xml:159 +#: /home/runa/tor/website/donate/en/donate.wml:133 /tmp/JsimINXUVm.xml:165 msgid "Make a single donation." msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr> -#: /home/runa/tor/website/donate/en/donate.wml:133 +#: /home/runa/tor/website/donate/en/donate.wml:137 msgid "" "<input type="hidden" name="immediateReturn" value="1"> <input type=" ""hidden" name="collectShippingAddress" value="0"> <input type="hidden" @@ -262,29 +273,34 @@ msgstr ""

#. type: Content of: <div><div><div><div><form><table><td> -#: /home/runa/tor/website/donate/en/donate.wml:144 /tmp/ugTbmfEHjk.xml:146 +#: /home/runa/tor/website/donate/en/donate.wml:148 /tmp/JsimINXUVm.xml:150 msgid "&nbsp;" msgstr ""

#. type: Content of: <div><div><div><div><form><table><td> -#: /home/runa/tor/website/donate/en/donate.wml:145 +#: /home/runa/tor/website/donate/en/donate.wml:149 msgid "$<input type="text" name="amount" size="8" value="10">" msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:148 +#: /home/runa/tor/website/donate/en/donate.wml:152 msgid "" "<input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/" "golden_small_donate_withmsg_whitebg.gif">" msgstr ""

#. type: Content of: <div><div><div> -#: /home/runa/tor/website/donate/en/donate.wml:156 +#: /home/runa/tor/website/donate/en/donate.wml:160 msgid "Single Donation via Google Checkout" msgstr ""

+#. type: Content of: <div><div><div><div> +#: /home/runa/tor/website/donate/en/donate.wml:163 +msgid "<a id="google"></a> <a class="anchor" href="#google"></a>" +msgstr "" + #. type: Content of: <div><div><div><div><script> -#: /home/runa/tor/website/donate/en/donate.wml:162 +#: /home/runa/tor/website/donate/en/donate.wml:168 msgid "" "function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\." "([0-9]+))?$/)){ return true; }else{ alert('You must enter a valid " @@ -292,7 +308,7 @@ msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr> -#: /home/runa/tor/website/donate/en/donate.wml:175 +#: /home/runa/tor/website/donate/en/donate.wml:181 msgid "" "<input name="item_name_1" type="hidden" value="Donate to the Tor Project" ""/> <input name="item_description_1" type="hidden" value="Tor is " @@ -306,7 +322,7 @@ msgstr ""

#. type: Content of: <div><div><div><div><form><table><tr><td> -#: /home/runa/tor/website/donate/en/donate.wml:188 +#: /home/runa/tor/website/donate/en/donate.wml:194 msgid "" "&#x24; <input id="item_price_1" name="item_price_1" onfocus="this.style." "color='black'; this.value='';" size="6" type="text" value="25.00"/> " @@ -316,12 +332,17 @@ msgstr ""

#. type: Content of: <div><div><div> -#: /home/runa/tor/website/donate/en/donate.wml:198 +#: /home/runa/tor/website/donate/en/donate.wml:204 msgid "Donate via Givv.org" msgstr ""

+#. type: Content of: <div><div><div> +#: /home/runa/tor/website/donate/en/donate.wml:206 +msgid "<a id="givv"></a> <a class="anchor" href="#givv"></a>" +msgstr "" + #. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/donate/en/donate.wml:201 +#: /home/runa/tor/website/donate/en/donate.wml:208 msgid "" "Givv.org is a new way to think about making your impact. Make one monthly " "donation. To as many nonprofits as you like. Automatic, one-click giving. " @@ -330,53 +351,58 @@ msgstr ""

#. type: Content of: <div><div><div> -#: /home/runa/tor/website/donate/en/donate.wml:207 +#: /home/runa/tor/website/donate/en/donate.wml:214 msgid "Donate via Check, Cash, or Money Order" msgstr ""

+#. type: Content of: <div><div><div> +#: /home/runa/tor/website/donate/en/donate.wml:216 +msgid "<a id="cash"></a> <a class="anchor" href="#cash"></a>" +msgstr "" + #. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/donate/en/donate.wml:210 +#: /home/runa/tor/website/donate/en/donate.wml:218 msgid "You can send checks or money orders to:" msgstr ""

#. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/donate/en/donate.wml:211 +#: /home/runa/tor/website/donate/en/donate.wml:219 msgid "" "The Tor Project, Inc<br> 969 Main Street, Suite 206<br> Walpole, MA " "02081-2972 USA" msgstr ""

#. type: Content of: <div><div><div> -#: /home/runa/tor/website/donate/en/donate.wml:217 +#: /home/runa/tor/website/donate/en/donate.wml:225 msgid "Donate via Wire or Bank Transfer" msgstr ""

#. type: Content of: <div><div><div><h3> -#: /home/runa/tor/website/donate/en/donate.wml:220 +#: /home/runa/tor/website/donate/en/donate.wml:228 msgid "US Transfers" msgstr ""

#. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/donate/en/donate.wml:221 +#: /home/runa/tor/website/donate/en/donate.wml:229 msgid "" "For US donations via wire or ACH transfer, please contact us for the " "relevant information." msgstr ""

#. type: Content of: <div><div><div><h3> -#: /home/runa/tor/website/donate/en/donate.wml:222 +#: /home/runa/tor/website/donate/en/donate.wml:230 msgid "European Transfers" msgstr ""

#. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/donate/en/donate.wml:223 +#: /home/runa/tor/website/donate/en/donate.wml:231 msgid "" "Wau Holland Stiftung<br> IBAN DE03 5204 0021 0277 281202<br> SWIFT BIC " "COBADEFF520" msgstr ""

#. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/donate/en/donate.wml:226 +#: /home/runa/tor/website/donate/en/donate.wml:234 msgid "" "<strong>Classic style German account information is:</strong><br> Konto: " "2772812-02<br> Inhaber: Wau Holland Stiftung<br> Bank: Commerzbank " @@ -384,7 +410,7 @@ msgstr ""

#. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/donate/en/donate.wml:231 +#: /home/runa/tor/website/donate/en/donate.wml:239 msgid "" "<em>For European bank transfers, we have an arrangement with <a href=" ""https://www.ccc.de/%5C%22%3ECCC in Germany</a> to provide tax-deductible " @@ -392,7 +418,7 @@ msgstr ""

#. type: Content of: <div><div><div><ul><li> -#: /home/runa/tor/website/donate/en/donate.wml:235 +#: /home/runa/tor/website/donate/en/donate.wml:243 msgid "" "Residents from any of the 31 <a href="http://en.wikipedia.org/wiki/" "Single_Euro_Payments_Area">SEPA</a> member states can wire up to 50.000 " @@ -401,7 +427,7 @@ msgstr ""

#. type: Content of: <div><div><div><ul><li> -#: /home/runa/tor/website/donate/en/donate.wml:240 +#: /home/runa/tor/website/donate/en/donate.wml:248 msgid "" "German citizens can make a charitable contribution that is tax-deductible to " "a certain degree (max 5% of total income, up to 1.650 Euro per annum). A new " @@ -410,7 +436,7 @@ msgstr ""

#. type: Content of: <div><div><div><ul><li> -#: /home/runa/tor/website/donate/en/donate.wml:244 +#: /home/runa/tor/website/donate/en/donate.wml:252 msgid "" "Corporate entities can deduct donations up to 4/1000 of their combined " "turnovers, wages and salaries. WHS issues a donation receipt upon request "

Modified: translation/trunk/projects/website/po/templates/download/3-low.download.pot =================================================================== --- translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-05-20 01:20:13 UTC (rev 24773) +++ translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-05-23 16:00:45 UTC (rev 24774) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-05-02 16:59+0200\n" +"POT-Creation-Date: 2011-05-23 17:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME EMAIL@ADDRESS\n" "Language-Team: LANGUAGE LL@li.org\n" @@ -53,8 +53,8 @@ msgstr ""

#. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:25 /tmp/4ybE8mkvwB.xml:88 -#: /tmp/4ybE8mkvwB.xml:126 +#: /home/runa/tor/website/download/en/download.wml:25 /tmp/lRozugJuoH.xml:88 +#: /tmp/lRozugJuoH.xml:126 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -87,7 +87,7 @@ msgstr ""

#. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:33 /tmp/4ybE8mkvwB.xml:91 +#: /home/runa/tor/website/download/en/download.wml:33 /tmp/lRozugJuoH.xml:91 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -393,7 +393,7 @@ msgstr ""

#. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:188 /tmp/4ybE8mkvwB.xml:261 +#: /home/runa/tor/website/download/en/download.wml:188 /tmp/lRozugJuoH.xml:267 msgid "<br>" msgstr ""

@@ -489,8 +489,16 @@ "the less dangerous it will be that you are one of them." msgstr ""

+#. type: Content of: <div><div><div><ol><li> +#: /home/runa/tor/website/download/en/download.wml:261 +msgid "" +"Do not use <a href="https://blog.torproject.org/blog/bittorrent-over-tor-" +"isnt-good-idea">BitTorrent and Tor</a> together unless you are using a " +"system like <a href="http://tails.boum.org/%5C%22%3ETAILS</a>." +msgstr "" + #. type: Content of: <div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:263 +#: /home/runa/tor/website/download/en/download.wml:269 msgid "" "Be smart and learn more. Understand what Tor does and does not offer. This " "list of pitfalls isn't complete, and we need your help <a href="<page " @@ -499,63 +507,63 @@ msgstr ""

#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:275 +#: /home/runa/tor/website/download/en/download.wml:281 msgid "Jump to:" msgstr ""

#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:277 +#: /home/runa/tor/website/download/en/download.wml:283 msgid "<a href="#Windows">Microsoft Windows</a>" msgstr ""

#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:278 +#: /home/runa/tor/website/download/en/download.wml:284 msgid "<a href="#mac">Apple OS X</a>" msgstr ""

#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:279 +#: /home/runa/tor/website/download/en/download.wml:285 msgid "<a href="#linux">Linux/Unix</a>" msgstr ""

#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:280 +#: /home/runa/tor/website/download/en/download.wml:286 msgid "<a href="#smartphones">Smartphones</a>" msgstr ""

#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:281 +#: /home/runa/tor/website/download/en/download.wml:287 msgid "<a href="#source">Source Code</a>" msgstr ""

#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:282 +#: /home/runa/tor/website/download/en/download.wml:288 msgid "<a href="<page donate/donate>">Please consider a donation</a>" msgstr ""

#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:290 +#: /home/runa/tor/website/download/en/download.wml:296 msgid "What is the (sig) link?" msgstr ""

#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/download/en/download.wml:291 +#: /home/runa/tor/website/download/en/download.wml:297 msgid "" "These are GPG signatures to allow you to verify that your downloaded file is " "really from The Tor Project and not an imposter." msgstr ""

#. type: Content of: <div><div><div><div> -#: /home/runa/tor/website/download/en/download.wml:294 +#: /home/runa/tor/website/download/en/download.wml:300 msgid "<a href="<page docs/verifying-signatures>">Learn more &raquo;</a>" msgstr ""

#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/download/en/download.wml:300 +#: /home/runa/tor/website/download/en/download.wml:306 msgid "Having Trouble?" msgstr ""

#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/download/en/download.wml:302 +#: /home/runa/tor/website/download/en/download.wml:308 msgid "<a href="<page docs/documentation>">Read the fine manuals</a>" msgstr ""

Modified: translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot =================================================================== --- translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot 2011-05-20 01:20:13 UTC (rev 24773) +++ translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot 2011-05-23 16:00:45 UTC (rev 24774) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-04-18 10:37+0200\n" +"POT-Creation-Date: 2011-05-23 17:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME EMAIL@ADDRESS\n" "Language-Team: LANGUAGE LL@li.org\n" @@ -127,18 +127,58 @@ "href="../dist/vidalia/vidalia-0.2.12.tar.gz.sig">sig</a>)" msgstr ""

+#. type: Content of: <div><div><h4> +#: /home/runa/tor/website/projects/en/vidalia.wml:81 +msgid "Alpha Releases" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/projects/en/vidalia.wml:82 +msgid "The most recent alpha release is: 0.3.0" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/projects/en/vidalia.wml:83 +msgid "<strong>WARNING</strong> this are very alpha bundles." +msgstr "" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/projects/en/vidalia.wml:86 +msgid "" +"<a href="https://archive.torproject.org/tor-package-archive/technology-" +"preview/vidalia-bundle-0.2.3.1-alpha-0.3.0.exe">Windows Installer</a> (<a " +"href="https://archive.torproject.org/tor-package-archive/technology-preview/" +"vidalia-bundle-0.2.3.1-alpha-0.3.0.exe.asc">sig</a>)" +msgstr "" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/projects/en/vidalia.wml:90 +msgid "" +"<a href="https://archive.torproject.org/tor-package-archive/technology-" +"preview/vidalia-bundle-0.2.3.1-alpha-0.3.0-i386.dmg">Mac OS X x86 Only</a> " +"(<a href="https://archive.torproject.org/tor-package-archive/technology-" +"preview/vidalia-bundle-0.2.3.1-alpha-0.3.0-i386.dmg.asc">sig</a>)" +msgstr "" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/projects/en/vidalia.wml:94 +msgid "" +"<a href="../dist/vidalia/vidalia-0.3.0.tar.gz">Source Tarball</a> (<a href=" +""../dist/vidalia/vidalia-0.3.0-alpha.tar.gz.asc">sig</a>)" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/projects/en/vidalia.wml:82 +#: /home/runa/tor/website/projects/en/vidalia.wml:99 msgid "<a id="Contribute"></a>" msgstr ""

#. type: Content of: <div><div><h3> -#: /home/runa/tor/website/projects/en/vidalia.wml:83 +#: /home/runa/tor/website/projects/en/vidalia.wml:100 msgid "<a class="anchor" href="#Contribute">Contribute</a>" msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/projects/en/vidalia.wml:86 +#: /home/runa/tor/website/projects/en/vidalia.wml:103 msgid "" "Vidalia is always looking for volunteers that want to help in development. " "To start you should first take a look at the <a href="https://www." @@ -151,17 +191,17 @@ msgstr ""

#. type: Content of: <div><div> -#: /home/runa/tor/website/projects/en/vidalia.wml:97 +#: /home/runa/tor/website/projects/en/vidalia.wml:114 msgid "<a id="Support"></a>" msgstr ""

#. type: Content of: <div><div><h3> -#: /home/runa/tor/website/projects/en/vidalia.wml:98 +#: /home/runa/tor/website/projects/en/vidalia.wml:115 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 +#: /home/runa/tor/website/projects/en/vidalia.wml:118 msgid "" "If you intend to start coding already, please read and follow the <a href=" ""https://gitweb.torproject.org/vidalia.git/blob/HEAD:/HACKING%5C%22%3EHACKING " @@ -173,7 +213,7 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/projects/en/vidalia.wml:112 +#: /home/runa/tor/website/projects/en/vidalia.wml:129 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/" @@ -181,7 +221,7 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/projects/en/vidalia.wml:118 +#: /home/runa/tor/website/projects/en/vidalia.wml:135 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 " @@ -193,7 +233,7 @@ msgstr ""

#. type: Content of: <div><div><p> -#: /home/runa/tor/website/projects/en/vidalia.wml:128 +#: /home/runa/tor/website/projects/en/vidalia.wml:145 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."