[or-cvs] r21745: {translation} new and updated po files for pootle (in translation/trunk/projects/website: ar ar/docs bms bms/docs de de/docs es es/docs et et/docs fa fa/docs fr fr/docs it it/docs nb nb/docs nl nl/docs pl pl/docs pt pt/docs ru ru/docs sv sv/docs tr tr/docs zh_CN zh_CN/docs)

Runa Sandvik runa.sandvik at gmail.com
Tue Feb 23 19:49:07 UTC 2010


Author: runa
Date: 2010-02-23 19:49:06 +0000 (Tue, 23 Feb 2010)
New Revision: 21745

Added:
   translation/trunk/projects/website/ar/docs/3-low.N900.po
   translation/trunk/projects/website/ar/docs/3-low.android.po
   translation/trunk/projects/website/bms/docs/3-low.N900.po
   translation/trunk/projects/website/bms/docs/3-low.android.po
   translation/trunk/projects/website/de/docs/3-low.N900.po
   translation/trunk/projects/website/de/docs/3-low.android.po
   translation/trunk/projects/website/es/docs/3-low.N900.po
   translation/trunk/projects/website/es/docs/3-low.android.po
   translation/trunk/projects/website/et/docs/3-low.N900.po
   translation/trunk/projects/website/et/docs/3-low.android.po
   translation/trunk/projects/website/fa/docs/3-low.N900.po
   translation/trunk/projects/website/fa/docs/3-low.android.po
   translation/trunk/projects/website/fr/docs/3-low.N900.po
   translation/trunk/projects/website/fr/docs/3-low.android.po
   translation/trunk/projects/website/it/docs/3-low.N900.po
   translation/trunk/projects/website/it/docs/3-low.android.po
   translation/trunk/projects/website/nb/docs/3-low.N900.po
   translation/trunk/projects/website/nb/docs/3-low.android.po
   translation/trunk/projects/website/nl/docs/3-low.N900.po
   translation/trunk/projects/website/nl/docs/3-low.android.po
   translation/trunk/projects/website/pl/docs/3-low.N900.po
   translation/trunk/projects/website/pl/docs/3-low.android.po
   translation/trunk/projects/website/pt/docs/3-low.N900.po
   translation/trunk/projects/website/pt/docs/3-low.android.po
   translation/trunk/projects/website/ru/docs/3-low.N900.po
   translation/trunk/projects/website/ru/docs/3-low.android.po
   translation/trunk/projects/website/sv/docs/3-low.N900.po
   translation/trunk/projects/website/sv/docs/3-low.android.po
   translation/trunk/projects/website/tr/docs/3-low.N900.po
   translation/trunk/projects/website/tr/docs/3-low.android.po
   translation/trunk/projects/website/zh_CN/docs/3-low.N900.po
   translation/trunk/projects/website/zh_CN/docs/3-low.android.po
Modified:
   translation/trunk/projects/website/ar/2-medium.documentation.po
   translation/trunk/projects/website/ar/3-low.download-unix.po
   translation/trunk/projects/website/ar/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/bms/2-medium.documentation.po
   translation/trunk/projects/website/bms/3-low.download-unix.po
   translation/trunk/projects/website/bms/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/de/2-medium.documentation.po
   translation/trunk/projects/website/de/3-low.download-unix.po
   translation/trunk/projects/website/de/docs/1-high.tor-doc-windows.po
   translation/trunk/projects/website/de/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/es/2-medium.documentation.po
   translation/trunk/projects/website/es/3-low.download-unix.po
   translation/trunk/projects/website/es/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/et/2-medium.documentation.po
   translation/trunk/projects/website/et/3-low.download-unix.po
   translation/trunk/projects/website/et/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/fa/2-medium.documentation.po
   translation/trunk/projects/website/fa/3-low.download-unix.po
   translation/trunk/projects/website/fa/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/fr/2-medium.documentation.po
   translation/trunk/projects/website/fr/2-medium.faq.po
   translation/trunk/projects/website/fr/3-low.download-unix.po
   translation/trunk/projects/website/fr/4-optional.volunteer.po
   translation/trunk/projects/website/fr/docs/3-low.rpms.po
   translation/trunk/projects/website/fr/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/it/2-medium.documentation.po
   translation/trunk/projects/website/it/3-low.download-unix.po
   translation/trunk/projects/website/it/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/nb/2-medium.documentation.po
   translation/trunk/projects/website/nb/3-low.download-unix.po
   translation/trunk/projects/website/nb/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/nl/2-medium.documentation.po
   translation/trunk/projects/website/nl/3-low.download-unix.po
   translation/trunk/projects/website/nl/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/pl/1-high.download.po
   translation/trunk/projects/website/pl/1-high.finding-tor.po
   translation/trunk/projects/website/pl/2-medium.documentation.po
   translation/trunk/projects/website/pl/3-low.download-unix.po
   translation/trunk/projects/website/pl/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/pt/2-medium.documentation.po
   translation/trunk/projects/website/pt/3-low.download-unix.po
   translation/trunk/projects/website/pt/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/ru/2-medium.documentation.po
   translation/trunk/projects/website/ru/2-medium.donate.po
   translation/trunk/projects/website/ru/2-medium.torusers.po
   translation/trunk/projects/website/ru/3-low.download-unix.po
   translation/trunk/projects/website/ru/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/sv/2-medium.documentation.po
   translation/trunk/projects/website/sv/3-low.download-unix.po
   translation/trunk/projects/website/sv/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/tr/2-medium.documentation.po
   translation/trunk/projects/website/tr/3-low.download-unix.po
   translation/trunk/projects/website/tr/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/zh_CN/1-high.download.po
   translation/trunk/projects/website/zh_CN/2-medium.documentation.po
   translation/trunk/projects/website/zh_CN/2-medium.donate.po
   translation/trunk/projects/website/zh_CN/3-low.download-unix.po
   translation/trunk/projects/website/zh_CN/docs/2-medium.tor-doc-osx.po
   translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po
Log:
new and updated po files for pootle

Modified: translation/trunk/projects/website/ar/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/ar/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/ar/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:48+0100\n"
+"POT-Creation-Date: 2010-02-23 20:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/ar/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/ar/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/ar/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:00+0100\n"
+"POT-Creation-Date: 2010-02-23 20:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/8WMAb1SvaJ.xml:40
-#: /tmp/8WMAb1SvaJ.xml:56 /tmp/8WMAb1SvaJ.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/MWiFwqexE9.xml:40
+#: /tmp/MWiFwqexE9.xml:56 /tmp/MWiFwqexE9.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/ar/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/ar/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/ar/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/qyfqVJfpqR.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/ar/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/ar/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/ar/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/XNHt1LW2a6.xml:32
+#: /tmp/XNHt1LW2a6.xml:40 /tmp/XNHt1LW2a6.xml:48 /tmp/XNHt1LW2a6.xml:71
+#: /tmp/XNHt1LW2a6.xml:83 /tmp/XNHt1LW2a6.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/ar/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/ar/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/ar/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:43+0100\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/jcqKfNlQGG.xml:24
-#: /tmp/jcqKfNlQGG.xml:54 /tmp/jcqKfNlQGG.xml:86 /tmp/jcqKfNlQGG.xml:129
-#: /tmp/jcqKfNlQGG.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/r16kK3PRwK.xml:24
+#: /tmp/r16kK3PRwK.xml:54 /tmp/r16kK3PRwK.xml:88 /tmp/r16kK3PRwK.xml:131
+#: /tmp/r16kK3PRwK.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/bms/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/bms/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/bms/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:57+0100\n"
+"POT-Creation-Date: 2010-02-23 20:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/bms/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/bms/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/bms/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:07+0100\n"
+"POT-Creation-Date: 2010-02-23 20:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/P1dUVQNGvg.xml:40
-#: /tmp/P1dUVQNGvg.xml:56 /tmp/P1dUVQNGvg.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/VK3JllCHMH.xml:40
+#: /tmp/VK3JllCHMH.xml:56 /tmp/VK3JllCHMH.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/bms/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/bms/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/bms/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/pRGVZlbIrZ.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/bms/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/bms/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/bms/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/0dHxoAKhR6.xml:32
+#: /tmp/0dHxoAKhR6.xml:40 /tmp/0dHxoAKhR6.xml:48 /tmp/0dHxoAKhR6.xml:71
+#: /tmp/0dHxoAKhR6.xml:83 /tmp/0dHxoAKhR6.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/bms/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/bms/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/bms/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:30+0100\n"
+"POT-Creation-Date: 2010-02-23 20:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/sAoHAtQf5w.xml:24
-#: /tmp/sAoHAtQf5w.xml:54 /tmp/sAoHAtQf5w.xml:86 /tmp/sAoHAtQf5w.xml:129
-#: /tmp/sAoHAtQf5w.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/s6WcaBtZ3_.xml:24
+#: /tmp/s6WcaBtZ3_.xml:54 /tmp/s6WcaBtZ3_.xml:88 /tmp/s6WcaBtZ3_.xml:131
+#: /tmp/s6WcaBtZ3_.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/de/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/de/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/de/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:58+0100\n"
+"POT-Creation-Date: 2010-02-23 20:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/de/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/de/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/de/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:05+0100\n"
+"POT-Creation-Date: 2010-02-23 20:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/0BDUiUtk5z.xml:40
-#: /tmp/0BDUiUtk5z.xml:56 /tmp/0BDUiUtk5z.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/Tneig8MPSl.xml:40
+#: /tmp/Tneig8MPSl.xml:56 /tmp/Tneig8MPSl.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Modified: translation/trunk/projects/website/de/docs/1-high.tor-doc-windows.po
===================================================================
--- translation/trunk/projects/website/de/docs/1-high.tor-doc-windows.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/de/docs/1-high.tor-doc-windows.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:54+0100\n"
+"POT-Creation-Date: 2010-02-23 20:35+0100\n"
 "PO-Revision-Date: 2010-02-22 07:22-0700\n"
 "Last-Translator: MLang <markus at samtechs.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,12 +20,13 @@
 msgid ""
 "Running the <a href=\"<page index>\">Tor</a> client on Microsoft Windows"
 msgstr ""
-"Hier läuft der <a href=\"<page index>\">Tor</a> Dienst unter Microsoft Windows"
+"Hier läuft der <a href=\"<page index>\">Tor</a> Dienst unter Microsoft "
+"Windows"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:12
-#: /tmp/c2URV4_2ns.xml:30 /tmp/c2URV4_2ns.xml:66 /tmp/c2URV4_2ns.xml:105
-#: /tmp/c2URV4_2ns.xml:148
+#: /tmp/WZqqAtbgC7.xml:34 /tmp/WZqqAtbgC7.xml:70 /tmp/WZqqAtbgC7.xml:109
+#: /tmp/WZqqAtbgC7.xml:152
 msgid "<br />"
 msgstr "<br />"
 
@@ -53,27 +54,27 @@
 "language? Let us know!"
 msgstr ""
 "Freedom House hat eine Tor Installation als Video bereitgestellt. "
-"(vermutlich in Englisch) Diese finden sie unter  <a "
-"href=\"http://tinyvid.tv/show/3lejztnthk2tm\">TinyVid: How to install Tor on "
-"Windows</a>.  Sofern sie eine bessere Anleitung und/oder eine in ihrer "
-"Sprache finden... teilen sie uns dies doch mit!"
+"(vermutlich in Englisch) Diese finden sie unter  <a href=\"http://tinyvid.tv/"
+"show/3lejztnthk2tm\">TinyVid: How to install Tor on Windows</a>.  Sofern sie "
+"eine bessere Anleitung und/oder eine in ihrer Sprache finden... teilen sie "
+"uns dies doch mit!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:27
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:31
 msgid "<hr /> <a id=\"installing\"></a>"
 msgstr "<hr /> <a id=\"installing\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:29
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:33
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
 "a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#installing\">Schritt 1: Download und Installation "
-"von Tor</a>"
+"<a class=\"anchor\" href=\"#installing\">Schritt 1: Download und "
+"Installation von Tor</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:33
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:37
 msgid ""
 "Microsoft Windows bundles contain <a href=\"<page index>\">Tor</a>, <a href="
 "\"<page vidalia/index>\">Vidalia</a> (a GUI for Tor), <a href=\"https://"
@@ -87,14 +88,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:45
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:49
 msgid ""
 "<img alt=\"tor installer splash page\" src=\"../img/screenshot-win32-"
 "installer-splash.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:47
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:51
 msgid ""
 "If you have previously installed Tor, Vidalia, or Polipo you can deselect "
 "whichever components you do not need to install in the dialog shown below."
@@ -104,14 +105,14 @@
 "im folgenden Dialog erscheinen."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:52
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:56
 msgid ""
 "<img alt=\"select components to install\" src=\"../img/screenshot-win32-"
 "installer-components.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:54
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:58
 msgid ""
 "After you have completed the installer, the components you selected will "
 "automatically be started for you."
@@ -120,7 +121,7 @@
 "getstartet werden sollen."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:58
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:62
 msgid ""
 "Tor comes configured as a client by default. It uses a built-in default "
 "configuration file, and most people won't need to change any of the "
@@ -130,12 +131,12 @@
 "muss im Normalfall nicht angepasst werden. Tor ist nun installiert."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:63
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:67
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:65
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:69
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to "
 "use Tor</a>"
@@ -144,7 +145,7 @@
 "Verwendung von Tor</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:72
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
@@ -154,26 +155,26 @@
 "Schritt sollte dies der Browser zur Internet Nutzung sein."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:71
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:75
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety. The bundle "
 "installs the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
 "plugin</a> for you. Restart your Firefox, and you're all set:"
 msgstr ""
 "Sie sollten Tor und Firefox zusammen mit Torbutton nutzen -als sicherste "
-"Lösung-. Die Software sollte aus dem Paket heraus bereits das <a "
-"href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton plugin</a> "
+"Lösung-. Die Software sollte aus dem Paket heraus bereits das <a href="
+"\"https://addons.mozilla.org/firefox/2275/\">Torbutton plugin</a> "
 "installiert haben. Nach dem Neustart sehen sie hoffentlich:"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:77
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:81
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"/> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:82
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:86
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -181,12 +182,12 @@
 "computer</a>."
 msgstr ""
 "Soern sie Firefox auf einem anderen Rechner laufen lassen als Tor, "
-"berücksichtigen sie bitte die Hinweise unter <a href=\"https://wiki.torprojec"
-"t.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress\">FAQ entry for "
-"running Tor on a different computer</a>."
+"berücksichtigen sie bitte die Hinweise unter <a href=\"https://wiki."
+"torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress\">FAQ entry "
+"for running Tor on a different computer</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:87
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:91
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -199,30 +200,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:101
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
 "HOWTO</a>."
 msgstr ""
-"Um andere Anwendung über Tor laufen zu lassen beachten sie bitte die <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
+"Um andere Anwendung über Tor laufen zu lassen beachten sie bitte die <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
 "HOWTO</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:102
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:106
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:108
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#verify\">Schritt 3: Prüfen ob es wirklich läuft</a>"
+"<a class=\"anchor\" href=\"#verify\">Schritt 3: Prüfen ob es wirklich läuft</"
+"a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:108
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:112
 msgid ""
 "Check to see that Vidalia is running.  Vidalia uses a small green onion to "
 "indicate Tor is running or a dark onion with a red \"X\" when Tor is not "
@@ -232,13 +234,13 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:115
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:119
 msgid ""
 "<img alt=\"Vidalia Tray Icon\" src=\"../img/screenshot-win32-vidalia.png\"/>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:118
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:122
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -248,15 +250,15 @@
 "suggestions on how to test your Tor.)"
 msgstr ""
 "Als nächstes öffnen sie bitte den Browser, auf dem Tor laufen sollte, und "
-"prüfen ob ihre IP-Adresse anonymisiert wird. Klicken sie auf <a "
-"href=\"https://check.torproject.org/\">den Tor detector</a> und schauen sie ob "
+"prüfen ob ihre IP-Adresse anonymisiert wird. Klicken sie auf <a href="
+"\"https://check.torproject.org/\">den Tor detector</a> und schauen sie ob "
 "diese Seite meint sie nutzen Tor oder nicht.  (Sofern die Seite nicht "
-"funktioniert finden sie weiterführende Tipps unter <a href=\"https://wiki.tor"
-"project.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate\"> FAQ </a> "
-".)"
+"funktioniert finden sie weiterführende Tipps unter <a href=\"https://wiki."
+"torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate\"> FAQ </"
+"a> .)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:130
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself, be sure to allow connections from your local applications "
@@ -267,17 +269,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:135
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:139
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
-"Wenn es immer noch nicht läuft werfen sie einen Blick auf die  <a href=\"http"
-"s://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">FAQ "
-"</a>. Ggf. sind hier weitere Tipps zu finden."
+"Wenn es immer noch nicht läuft werfen sie einen Blick auf die  <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork"
+"\">FAQ </a>. Ggf. sind hier weitere Tipps zu finden."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:140
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:144
 msgid ""
 "Once it's working, learn more about <a href=\"<page download>#Warning\">what "
 "Tor does and does not offer</a>."
@@ -286,12 +288,12 @@
 "kann und was nicht</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:148
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:147
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:151
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
@@ -299,7 +301,7 @@
 "konfigurieren</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:150
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:154
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -310,7 +312,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:158
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:162
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -320,22 +322,22 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:165
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:169
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:168
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:172
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:170
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:174
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"
 msgstr ""
-"Verbesserungsvorschläge, Hinweise, Anregungen etc.  <a href=\"<page "
-"contact>\">senden sie bitte an uns</a>. Vielen Dank im voraus!"
+"Verbesserungsvorschläge, Hinweise, Anregungen etc.  <a href=\"<page contact>"
+"\">senden sie bitte an uns</a>. Vielen Dank im voraus!"

Added: translation/trunk/projects/website/de/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/de/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/de/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:35+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/MjdmCjv9B9.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/de/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/de/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/de/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:35+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/dilyFt_six.xml:32
+#: /tmp/dilyFt_six.xml:40 /tmp/dilyFt_six.xml:48 /tmp/dilyFt_six.xml:71
+#: /tmp/dilyFt_six.xml:83 /tmp/dilyFt_six.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/de/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/de/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/de/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:31+0100\n"
+"POT-Creation-Date: 2010-02-23 20:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/rHwqaGHjNd.xml:24
-#: /tmp/rHwqaGHjNd.xml:54 /tmp/rHwqaGHjNd.xml:86 /tmp/rHwqaGHjNd.xml:129
-#: /tmp/rHwqaGHjNd.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/3Hm3IzCw9A.xml:24
+#: /tmp/3Hm3IzCw9A.xml:54 /tmp/3Hm3IzCw9A.xml:88 /tmp/3Hm3IzCw9A.xml:131
+#: /tmp/3Hm3IzCw9A.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/es/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/es/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/es/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:49+0100\n"
+"POT-Creation-Date: 2010-02-23 20:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/es/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/es/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/es/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:06+0100\n"
+"POT-Creation-Date: 2010-02-23 20:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/hFnutUgFDD.xml:40
-#: /tmp/hFnutUgFDD.xml:56 /tmp/hFnutUgFDD.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/bOo0edfLSX.xml:40
+#: /tmp/bOo0edfLSX.xml:56 /tmp/bOo0edfLSX.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/es/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/es/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/es/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/CeV5Yw2crO.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/es/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/es/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/es/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/6VMJHy1z9a.xml:32
+#: /tmp/6VMJHy1z9a.xml:40 /tmp/6VMJHy1z9a.xml:48 /tmp/6VMJHy1z9a.xml:71
+#: /tmp/6VMJHy1z9a.xml:83 /tmp/6VMJHy1z9a.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/es/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/es/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/es/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:45+0100\n"
+"POT-Creation-Date: 2010-02-23 20:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/4XamuI2Anh.xml:24
-#: /tmp/4XamuI2Anh.xml:54 /tmp/4XamuI2Anh.xml:86 /tmp/4XamuI2Anh.xml:129
-#: /tmp/4XamuI2Anh.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/kE5aeATk55.xml:24
+#: /tmp/kE5aeATk55.xml:54 /tmp/kE5aeATk55.xml:88 /tmp/kE5aeATk55.xml:131
+#: /tmp/kE5aeATk55.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/et/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/et/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/et/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-12 12:20+0100\n"
+"POT-Creation-Date: 2010-02-23 20:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/et/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/et/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/et/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:04+0100\n"
+"POT-Creation-Date: 2010-02-23 20:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/Bswd3MubS9.xml:40
-#: /tmp/Bswd3MubS9.xml:56 /tmp/Bswd3MubS9.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/FJT54elJbE.xml:40
+#: /tmp/FJT54elJbE.xml:56 /tmp/FJT54elJbE.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/et/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/et/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/et/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:34+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/wVOPyFyqki.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/et/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/et/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/et/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:33+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/E8OyQ7Xf59.xml:32
+#: /tmp/E8OyQ7Xf59.xml:40 /tmp/E8OyQ7Xf59.xml:48 /tmp/E8OyQ7Xf59.xml:71
+#: /tmp/E8OyQ7Xf59.xml:83 /tmp/E8OyQ7Xf59.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/et/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/et/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/et/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-12 12:21+0100\n"
+"POT-Creation-Date: 2010-02-23 20:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/79Z4Vl_3B1.xml:24
-#: /tmp/79Z4Vl_3B1.xml:54 /tmp/79Z4Vl_3B1.xml:86 /tmp/79Z4Vl_3B1.xml:129
-#: /tmp/79Z4Vl_3B1.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/TDl3WYkB9Q.xml:24
+#: /tmp/TDl3WYkB9Q.xml:54 /tmp/TDl3WYkB9Q.xml:88 /tmp/TDl3WYkB9Q.xml:131
+#: /tmp/TDl3WYkB9Q.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/fa/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/fa/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fa/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:54+0100\n"
+"POT-Creation-Date: 2010-02-23 20:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/fa/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/fa/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fa/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:04+0100\n"
+"POT-Creation-Date: 2010-02-23 20:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/rRU4F73oHP.xml:40
-#: /tmp/rRU4F73oHP.xml:56 /tmp/rRU4F73oHP.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/J61ficH_Tp.xml:40
+#: /tmp/J61ficH_Tp.xml:56 /tmp/J61ficH_Tp.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/fa/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/fa/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/fa/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:34+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/r1Ql5t8nb2.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/fa/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/fa/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/fa/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:34+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/GJvzyXwZn4.xml:32
+#: /tmp/GJvzyXwZn4.xml:40 /tmp/GJvzyXwZn4.xml:48 /tmp/GJvzyXwZn4.xml:71
+#: /tmp/GJvzyXwZn4.xml:83 /tmp/GJvzyXwZn4.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/fa/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/fa/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fa/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:47+0100\n"
+"POT-Creation-Date: 2010-02-23 20:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/PnnBDM2fqP.xml:24
-#: /tmp/PnnBDM2fqP.xml:54 /tmp/PnnBDM2fqP.xml:86 /tmp/PnnBDM2fqP.xml:129
-#: /tmp/PnnBDM2fqP.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/yKrlSpV1cX.xml:24
+#: /tmp/yKrlSpV1cX.xml:54 /tmp/yKrlSpV1cX.xml:88 /tmp/yKrlSpV1cX.xml:131
+#: /tmp/yKrlSpV1cX.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/fr/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/fr/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fr/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-07 07:59+0100\n"
+"POT-Creation-Date: 2010-02-23 20:32+0100\n"
 "PO-Revision-Date: 2010-02-12 11:58-0700\n"
 "Last-Translator: Médéric RIBREUX <mederic.ribreux at gmail.com>\n"
 "Language-Team: fr_FR <tor-translate at torproject.org>\n"
@@ -285,9 +285,10 @@
 "proposal process for changing our design</a>, and look over the <a href="
 "\"<gittree>doc/spec/proposals\">existing proposals</a>."
 msgstr ""
-"Étudiez les <a href=\"<gitblob>doc/spec/proposals/001-process.txt\">processus "
-"Tor proposés à la modifications de nos spécifications</a>, et consultez les "
-"<a href=\"<gittree>doc/spec/proposals\">propositions existantes</a>."
+"Étudiez les <a href=\"<gitblob>doc/spec/proposals/001-process.txt"
+"\">processus Tor proposés à la modifications de nos spécifications</a>, et "
+"consultez les <a href=\"<gittree>doc/spec/proposals\">propositions "
+"existantes</a>."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:146
@@ -597,12 +598,14 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
+#, fuzzy
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 "Allez voir la page <a href=\"http://trunk.torstatus.kgprog.com/index.php"
 "\">d'état de Tor</a>, ou la page <a href=\"https://torstat.xenobite.eu/"
@@ -611,7 +614,7 @@
 "Tor, car Tor va chercher les listes d'annuaires et les combine localement. "
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -622,39 +625,39 @@
 "en valeur) pour des informations sur les systèmes de communications anonymes."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr "<a id=\"Developers\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr "<a class=\"anchor\" href=\"#Developers\">Pour les développeurs</a>"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr "Parcourez le <b>dépôt des sources</b> de Tor: "
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 "<a href=\"<gitrepo>\">Parcourir l'arborescence de répertoire du dépôt des "
 "sources directement</a>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr "Accès à Git et au SVN:"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
@@ -663,7 +666,7 @@
 "maintenance sont nommées <kbd>maint-0.2.0</kbd> et <kbd>maint-0.2.1</kbd>."
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
@@ -672,14 +675,14 @@
 "8D:58:41:85:9C:2B:82:84:7C:84:0E:B9:BB:58:16:AC"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/fr/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/fr/2-medium.faq.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fr/2-medium.faq.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 10:02+0100\n"
+"POT-Creation-Date: 2010-02-23 20:32+0100\n"
 "PO-Revision-Date: 2010-02-22 09:53-0700\n"
 "Last-Translator: Médéric RIBREUX <mederic.ribreux at gmail.com>\n"
 "Language-Team: fr_FR <tor-translate at torproject.org>\n"
@@ -22,7 +22,7 @@
 msgstr "FAQ Tor"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:12 /tmp/uqe1nrLUNF.xml:1096
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/fvxJtlpnlh.xml:1096
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -1326,8 +1326,8 @@
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-creation."
 "txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
-"Vous pouvez essayer de suivre les étapes du fichier <a href=\"<gitblob>doc"
-"/tor-win32-mingw-creation.txt\">tor-win32-mingw-creation.txt</a>."
+"Vous pouvez essayer de suivre les étapes du fichier <a href=\"<gitblob>doc/"
+"tor-win32-mingw-creation.txt\">tor-win32-mingw-creation.txt</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:596
@@ -1801,12 +1801,12 @@
 "month) that you donate, check out the <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#Hibernation\">hibernation feature</a>."
 msgstr ""
-"Tor a une gestion interne <a href=\"https://wiki.torproject.org/noreply/TheOn"
-"ionRouter/TorFAQ#LimitBandwidth\"> de limites de flux</a>. De plus, si vous "
-"avez un lien rapide mais que vous désirez limiter le nombre d'octets que "
-"vous allez offrir par jour (ou par semaine ou par mois), consultez <a href=\""
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Hibernation\">la "
-"fonctionnalité d'hibernation</a>."
+"Tor a une gestion interne <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#LimitBandwidth\"> de limites de flux</a>. De plus, si "
+"vous avez un lien rapide mais que vous désirez limiter le nombre d'octets "
+"que vous allez offrir par jour (ou par semaine ou par mois), consultez <a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Hibernation"
+"\">la fonctionnalité d'hibernation</a>."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:793
@@ -1917,10 +1917,10 @@
 "connexions, cette politique est basée sur sa propre situation et sur les "
 "abus potentiels. Lisez l'article de la FAQ à propos des <a href =\"<page faq-"
 "abuse>#TypicalAbuses\"> problèmes que vous pourriez rencontrer si vous "
-"utilisez la politique par défaut</a>, et lisez ensuite les <a "
-"href=\"https://blog.torproject.org/blog/tips-running-exit-node-minimal-"
-"harassment\"> conseils de Mike Perry pour faire fonctionner un noeud de "
-"sortie avec un harcèlement minimal</a>."
+"utilisez la politique par défaut</a>, et lisez ensuite les <a href=\"https://"
+"blog.torproject.org/blog/tips-running-exit-node-minimal-harassment\"> "
+"conseils de Mike Perry pour faire fonctionner un noeud de sortie avec un "
+"harcèlement minimal</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:844

Modified: translation/trunk/projects/website/fr/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/fr/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fr/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 10:02+0100\n"
+"POT-Creation-Date: 2010-02-23 20:32+0100\n"
 "PO-Revision-Date: 2010-02-21 11:14-0700\n"
 "Last-Translator: Médéric RIBREUX <mederic.ribreux at gmail.com>\n"
 "Language-Team: fr_FR <tor-translate at torproject.org>\n"
@@ -79,8 +79,8 @@
 msgstr "<a href=\"<page docs/debian>\">Archive de paquets</a>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/uikSy6hD7i.xml:40
-#: /tmp/uikSy6hD7i.xml:56 /tmp/uikSy6hD7i.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/nacm28Lpar.xml:40
+#: /tmp/nacm28Lpar.xml:56 /tmp/nacm28Lpar.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 
@@ -187,20 +187,19 @@
 #: /home/runa/tor/website/en/download-unix.wml:77
 msgid ""
 "<img src=\"images/distros/200px-Maemo_logo_color.svg.png\" alt=\"Maemo\" />"
-msgstr "<img src=\"images/distros/200px-Maemo_logo_color.svg.png\" alt=\"Maemo\" />"
+msgstr ""
+"<img src=\"images/distros/200px-Maemo_logo_color.svg.png\" alt=\"Maemo\" />"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
-msgstr "Maemo"
+msgid "Maemo / N900"
+msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
-msgstr ""
-"Télécharger depuis <a "
-"href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+#, fuzzy
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
+msgstr "<a href=\"<page docs/rpms>\">Archive de paquets</a>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
@@ -531,6 +530,16 @@
 "des changements à la fois dans les versions stable et développement, voyez "
 "le <a href=\"<gitblob>ChangeLog\">(ntd : trace de changement)</a>."
 
+#~ msgid "Maemo"
+#~ msgstr "Maemo"
+
+#~ msgid ""
+#~ "Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</"
+#~ "a>"
+#~ msgstr ""
+#~ "Télécharger depuis <a href=\"http://maemo.org/packages/view/tor/\">Maemo."
+#~ "org</a>"
+
 #~ msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 4\" />"
 #~ msgstr "<img src=\"images/distros/centos.png\" alt=\"CentOS 4\" />"
 

Modified: translation/trunk/projects/website/fr/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/fr/4-optional.volunteer.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fr/4-optional.volunteer.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-21 11:14+0100\n"
+"POT-Creation-Date: 2010-02-23 20:32+0100\n"
 "PO-Revision-Date: 2010-02-23 19:05+0100\n"
 "Last-Translator: Médéric RIBREUX <mederic.ribreux at gmail.com>\n"
 "Language-Team: french <tor-translation at torproject.org>\n"
@@ -208,14 +208,14 @@
 "\"http://www.youtube.com/freedom4internet\">Youtube</a>."
 msgstr ""
 "Créer une vidéo sur les utilisations positives de Tor, sur ce qu'est Tor ou "
-"comment l'utiliser.  Quelques personnes ont déjà commencé sur <a "
-"href=\"http://media.torproject.org/video/\">le serveur Média de Tor</a>, <a "
-"href=\"http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-"
-"Proxy\">Howcast</a>, et <a "
-"href=\"http://www.youtube.com/freedom4internet\">Youtube</a>."
+"comment l'utiliser.  Quelques personnes ont déjà commencé sur <a href="
+"\"http://media.torproject.org/video/\">le serveur Média de Tor</a>, <a href="
+"\"http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy"
+"\">Howcast</a>, et <a href=\"http://www.youtube.com/freedom4internet"
+"\">Youtube</a>."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:70
+#: /home/runa/tor/website/en/volunteer.wml:75
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\""
@@ -224,17 +224,17 @@
 "Liberté !\""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:73
+#: /home/runa/tor/website/en/volunteer.wml:79
 msgid "<a id=\"Documentation\"></a>"
 msgstr "<a id=\"Documentation\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:74
+#: /home/runa/tor/website/en/volunteer.wml:80
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:76
+#: /home/runa/tor/website/en/volunteer.wml:82
 msgid ""
 "Please help Matt Edman with the documentation and how-tos for his Tor "
 "controller, <a href=\"<page vidalia/index>\">Vidalia</a>."
@@ -243,7 +243,7 @@
 "Tor, <a href=\"<page vidalia/index>\">Vidalia</a>."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:79
+#: /home/runa/tor/website/en/volunteer.wml:85
 msgid ""
 "Evaluate and document <a href=\"https://wiki.torproject.org/wiki/"
 "TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be configured "
@@ -254,7 +254,7 @@
 "utilisés avec Tor."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:82
+#: /home/runa/tor/website/en/volunteer.wml:88
 msgid ""
 "We need better documentation for dynamically intercepting connections and "
 "sending them through Tor. tsocks (Linux), dsocks (BSD), and freecap "
@@ -267,7 +267,7 @@
 "utiliserait au mieux notre nouvelle fonctionnalité Transport."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:86
+#: /home/runa/tor/website/en/volunteer.wml:92
 msgid ""
 "We have a huge list of <a href=\"https://wiki.torproject.org/noreply/"
 "TheOnionRouter/SupportPrograms\">potentially useful programs that interface "
@@ -280,7 +280,7 @@
 "situations ? Contribuez à les tester et à documenter les résultats."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:89
+#: /home/runa/tor/website/en/volunteer.wml:95
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page translation>\">translation guidelines</a> if you want to "
@@ -294,18 +294,18 @@
 "les zones censurées."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:95
+#: /home/runa/tor/website/en/volunteer.wml:101
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a> <a id=\"Projects\"></a>"
 msgstr "<a id=\"Coding\"></a> <a id=\"Summer\"></a> <a id=\"Projects\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:98
+#: /home/runa/tor/website/en/volunteer.wml:104
 msgid "<a class=\"anchor\" href=\"#Projects\">Good Coding Projects</a>"
 msgstr ""
 "<h2><a class=\"anchor\" href=\"#Projects\">Bons Projets de code</a></h2>"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:101
+#: /home/runa/tor/website/en/volunteer.wml:107
 msgid ""
 "You may find some of these projects to be good <a href=\"<page gsoc>"
 "\">Google Summer of Code 2010</a> ideas. We have labelled each idea with how "
@@ -348,34 +348,33 @@
 "done in terms of bug fixes or new features. We get this informally at the "
 "moment, but a more structured process would be better."
 msgstr ""
-"<b>Pack de Navigation Tor pour Linux/Mac OS X</b> <br /> Priorité: "
-"<i>Haute</i> <br /> Effort à fournir: <i>Haut</i> <br /> Compétences "
-"requises: <i> Moyennes</i> <br /> Tuteurs potentiels: <i>Steven, Erinn, "
-"Jacob, Andrew</i> <br /> Le Pack de Navigation Tor contient Tor, Firefox, "
-"Polipo et l'interface graphique Vidalia (et en option le client de "
-"messagerie instantanée <a href=\"http://pidgin.im/\">Pidgin</a>). Les "
-"composants sont préconfigurés pour fonctionner de manière sécurisée et "
-"requièrent très peu de dépendances vis à vis du système d'exploitation "
-"installé. C'était autrefois un des moyens les plus faciles et le plus "
-"populaire d'utiliser Tor sous Windows.  <br /> Toutefois, il n'existe pas de "
-"paquets fonctionnant sous Linux ou Mac Os X. C'est pourquoi ce projet "
-"consiste à créer un Pack de Navigation Tor sur ces plateformes. Cela "
-"implique des modifications dans Vidalia (C++), peut-être dans Firefox (C) et "
-"enfin de créer et de tester le lanceur sur toute une gamme de versions de "
-"systèmes d'exploitation et de configuration différentes afin de vérifier la "
-"portabilité. Un peu de ce travail a été accompli lors du Google Summer of "
-"Code 2009. <br /> Les étudiants désirant participer doivent connaître le "
-"développement d'applications, de préférence, sur les deux plateformes (Linux "
-"et Mac OS X) et doivent disposer de sérieuses compétences en C/C++ et en "
-"script shell.  <br /> Une part de ce projet peut consister à tester ce Pack "
-"de Navigation sur le coeur de cible des utilisateurs concernés. Cela "
-"permettrait d'en savoir un peu plus sur ce qui a besoin d'être corrigé ou "
-"amélioré. Nous conservons cette description comme un simple élément "
-"d'information pour le moment mais un processus plus structuré serait "
-"meilleur."
+"<b>Pack de Navigation Tor pour Linux/Mac OS X</b> <br /> Priorité: <i>Haute</"
+"i> <br /> Effort à fournir: <i>Haut</i> <br /> Compétences requises: <i> "
+"Moyennes</i> <br /> Tuteurs potentiels: <i>Steven, Erinn, Jacob, Andrew</i> "
+"<br /> Le Pack de Navigation Tor contient Tor, Firefox, Polipo et "
+"l'interface graphique Vidalia (et en option le client de messagerie "
+"instantanée <a href=\"http://pidgin.im/\">Pidgin</a>). Les composants sont "
+"préconfigurés pour fonctionner de manière sécurisée et requièrent très peu "
+"de dépendances vis à vis du système d'exploitation installé. C'était "
+"autrefois un des moyens les plus faciles et le plus populaire d'utiliser Tor "
+"sous Windows.  <br /> Toutefois, il n'existe pas de paquets fonctionnant "
+"sous Linux ou Mac Os X. C'est pourquoi ce projet consiste à créer un Pack de "
+"Navigation Tor sur ces plateformes. Cela implique des modifications dans "
+"Vidalia (C++), peut-être dans Firefox (C) et enfin de créer et de tester le "
+"lanceur sur toute une gamme de versions de systèmes d'exploitation et de "
+"configuration différentes afin de vérifier la portabilité. Un peu de ce "
+"travail a été accompli lors du Google Summer of Code 2009. <br /> Les "
+"étudiants désirant participer doivent connaître le développement "
+"d'applications, de préférence, sur les deux plateformes (Linux et Mac OS X) "
+"et doivent disposer de sérieuses compétences en C/C++ et en script shell.  "
+"<br /> Une part de ce projet peut consister à tester ce Pack de Navigation "
+"sur le coeur de cible des utilisateurs concernés. Cela permettrait d'en "
+"savoir un peu plus sur ce qui a besoin d'être corrigé ou amélioré. Nous "
+"conservons cette description comme un simple élément d'information pour le "
+"moment mais un processus plus structuré serait meilleur."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:149
+#: /home/runa/tor/website/en/volunteer.wml:160
 msgid ""
 "<b>Help track the overall Tor Network status</b> <br /> Priority: <i>Medium "
 "to High</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: "
@@ -399,25 +398,24 @@
 "<b>Aider à mesurer l'état général du réseau Tor</b> <br /> Priorité: "
 "<i>Moyenne à Haute</i> <br /> Effort à fournir: <i>Moyen</i> <br /> "
 "Compétences requises: <i>Moyennes</i> <br /> Tuteurs potentiels: <i>Karsten, "
-"Roger</i> <br /> Il serait bon de mettre en place un système automatisé "
-"pour rendre compte de la santé du réseau au cours du temps, avec des "
-"graphiques, etc... Une partie de ce projet consisterait à trouver un système "
-"de mesure adéquat pour évaluer la santé du réseau et sa croissance. Est-ce-"
-"que sa durée de fonctionnement augmente ? Combien de relais sont en cours de "
+"Roger</i> <br /> Il serait bon de mettre en place un système automatisé pour "
+"rendre compte de la santé du réseau au cours du temps, avec des graphiques, "
+"etc... Une partie de ce projet consisterait à trouver un système de mesure "
+"adéquat pour évaluer la santé du réseau et sa croissance. Est-ce-que sa "
+"durée de fonctionnement augmente ? Combien de relais sont en cours de "
 "qualification pour adopter l'état Guard ce mois-ci comparé au mois "
 "précédent ? Comment est le turnover entre les nouveaux relais qui "
 "apparaissent et ceux qui s'éteignent ? Régulièrement, des personnes "
 "collectes de brèves photos d'état mais il est plus intéressant de le faire "
 "sur une longue période.  <br ./> Les données peuvent être collectées depuis "
-"les scanners du réseau Tor dans <a "
-"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, "
-"depuis les descripteurs de serveurs publiés par chaque relais et ailleurs "
-"également. Les résultats sur le long terme pourraient être présentés sur "
-"l'une des pages web de <a href=\"https://torstatus.blutmagie.de/\">Tor "
-"Status</a> ou éventuellement ailleurs. En parlant des pages Tor Status, "
-"prenez le temps de consulter <a "
-"href=\"http://archives.seul.org/or/talk/Jan-2008/msg00300.html\">la \"whish-"
-"list\" Tor Status</a> de Roger."
+"les scanners du réseau Tor dans <a href=\"https://svn.torproject.org/svn/"
+"torflow/trunk/README\">TorFlow</a>, depuis les descripteurs de serveurs "
+"publiés par chaque relais et ailleurs également. Les résultats sur le long "
+"terme pourraient être présentés sur l'une des pages web de <a href=\"https://"
+"torstatus.blutmagie.de/\">Tor Status</a> ou éventuellement ailleurs. En "
+"parlant des pages Tor Status, prenez le temps de consulter <a href=\"http://"
+"archives.seul.org/or/talk/Jan-2008/msg00300.html\">la \"whish-list\" Tor "
+"Status</a> de Roger."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:190
@@ -446,15 +444,15 @@
 "resistance with usability and robustness."
 msgstr ""
 "<b>Améliorer les capacités de résistance à la censure de Tor</b> <br /> "
-"Priorité: <i>Moyenne à Haute</i> <br /> Effort à fournir: <i>Moyen</i> <br "
-"/> Compétences requises: <i>Hautes</i> <br /> Tuteurs potentiels: <i>Nick, "
-"Roger, Steven</i> <br /> La série 0.2.1.x de Tor a fait l'objet <a "
-"href=\"<gitblob>doc/design-paper/blocking.html\">d'amélioration sensibles</a> "
+"Priorité: <i>Moyenne à Haute</i> <br /> Effort à fournir: <i>Moyen</i> <br /"
+"> Compétences requises: <i>Hautes</i> <br /> Tuteurs potentiels: <i>Nick, "
+"Roger, Steven</i> <br /> La série 0.2.1.x de Tor a fait l'objet <a href="
+"\"<gitblob>doc/design-paper/blocking.html\">d'amélioration sensibles</a> "
 "dans la résistance aux censures des États et des organisations.  Néanmoins, "
 "Tor a toujours besoin de meilleurs mécanismes dans certaines parties de ses "
 "fonctionnalités anti-censure.  Par exemple, Tor ne peut écouter le réseau "
-"que sur une seule combinaison adresse/port à la fois.  Il existe <a "
-"href=\"<gitblob>doc/spec/proposals/118-multiple-orports.txt\">une proposition "
+"que sur une seule combinaison adresse/port à la fois.  Il existe <a href="
+"\"<gitblob>doc/spec/proposals/118-multiple-orports.txt\">une proposition "
 "visant à réduire cette limite</a> et permettre aux clients de se connecter à "
 "n'importe quel noeud Tor sur de multiples adresses et ports mais il y a "
 "besoin de plus de travail dessus.  Un autre projet anti-censure est "
@@ -462,18 +460,18 @@
 "peut identifier <a href=\"<gitblob>doc/spec/proposals/125-bridges.txt\">les "
 "passerelles Tor</a> simplement en essayant de s'y connecter, en suivant le "
 "protocole Tor et voir si elles répondent.  Pour régler ce problème, les "
-"passerelles pourraient <a href=\"<gitblob>doc/design-"
-"paper/blocking.html#tth_sEc9.3\">simuler des serveurs web</a> (HTTP ou HTTPS) "
-"lorsqu'elles sont contactées par des outils de scans de port et ne pas "
-"répondre en tant que passerelle Tor avant que l'utilisateur ne lui ait "
-"fourni une clef spécificque.  <br /> Ce projet implique un gros travail de "
-"recherche et de conception. Un des défis le plus important est d'identifier "
-"et de sélectionner des approches résistantes aux attaques y compris lorsque "
+"passerelles pourraient <a href=\"<gitblob>doc/design-paper/blocking."
+"html#tth_sEc9.3\">simuler des serveurs web</a> (HTTP ou HTTPS) lorsqu'elles "
+"sont contactées par des outils de scans de port et ne pas répondre en tant "
+"que passerelle Tor avant que l'utilisateur ne lui ait fourni une clef "
+"spécificque.  <br /> Ce projet implique un gros travail de recherche et de "
+"conception. Un des défis le plus important est d'identifier et de "
+"sélectionner des approches résistantes aux attaques y compris lorsque "
 "l'attaquant en connaît la conception. Il sera alors possible de conjuguer "
 "résistance à la censure avec facilité d'utilisation et robustesse."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:214
+#: /home/runa/tor/website/en/volunteer.wml:225
 msgid ""
 "<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
 "Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -497,19 +495,18 @@
 "<br /> Tuteurs potentiels: <i>Nick, Roger, Mike, Karsten</i> <br />Pour le "
 "moment, les relais Tor mesurent et remontent leur propre bande passante, les "
 "clients choisissent quels relais ils vont utiliser en partie selon cette "
-"bande passante.  Cette approche présent des vulnérabilités <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\">aux attaques dans "
-"lesquelles le relais ment sur sa bande passante</a>. Pour régler ce "
-"problème, Tor plafonne la bande passante maximale affichée par un relais.  "
-"C'est une correction limitée et une perte de bande passante.  A la place, "
-"Tor devrait mesure la bande passante selon un mode distribué, peut-être "
-"comme décrit dans le document <a "
-"href=\"http://freehaven.net/anonbib/author.html#snader08\">\"A Tune-up for "
-"Tor\"</a> de Snader et Borisov. On pourrait utiliser du code source en test "
-"pour confirmer les trouvailles de ce document et vérifier la manière dont "
-"elles concordent avec le fonctionnement réel de Tor. On pourrait trouver les "
-"bons moyens d'incorporer ces suggestions dans le réseau Tor sans ajouter "
-"trop de trafic entre les relais et les autorités d'annuaire."
+"bande passante.  Cette approche présent des vulnérabilités <a href=\"http://"
+"freehaven.net/anonbib/#bauer:wpes2007\">aux attaques dans lesquelles le "
+"relais ment sur sa bande passante</a>. Pour régler ce problème, Tor plafonne "
+"la bande passante maximale affichée par un relais.  C'est une correction "
+"limitée et une perte de bande passante.  A la place, Tor devrait mesure la "
+"bande passante selon un mode distribué, peut-être comme décrit dans le "
+"document <a href=\"http://freehaven.net/anonbib/author.html#snader08\">\"A "
+"Tune-up for Tor\"</a> de Snader et Borisov. On pourrait utiliser du code "
+"source en test pour confirmer les trouvailles de ce document et vérifier la "
+"manière dont elles concordent avec le fonctionnement réel de Tor. On "
+"pourrait trouver les bons moyens d'incorporer ces suggestions dans le réseau "
+"Tor sans ajouter trop de trafic entre les relais et les autorités d'annuaire."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
@@ -523,9 +520,8 @@
 "<b>Améliorer Polipo sous Windows</b> <br /> Priorité: <i>Moyenne à Haute</i> "
 "<br /> Effort à fournir: <i>Moyen</i> <br /> Compétences requises: "
 "<i>Moyennes</i> <br /> Tuteurs potentiels: <i>Chris</i> <br />Il faut nous "
-"aider à porter <a "
-"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> sous "
-"Windows. Quelques exemples de sujets à retenir:"
+"aider à porter <a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/"
+"\">Polipo</a> sous Windows. Quelques exemples de sujets à retenir:"
 
 #. type: Content of: <div><ol><li><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:269
@@ -569,7 +565,7 @@
 "Files\\Polipo\""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:271
+#: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
 "<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
@@ -633,7 +629,7 @@
 "permettrait de créer les belles nouvelles icônes dont nous aurons besoin."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:314
+#: /home/runa/tor/website/en/volunteer.wml:326
 msgid ""
 "<b>Improve our unit testing process</b> <br /> Priority: <i>Medium</i> <br /"
 "> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
@@ -652,8 +648,8 @@
 msgstr ""
 "<b>Améliorer notre processus de tests unitaires</b> <br /> Priorité: "
 "<i>Moyenne</i> <br /> Effort à fournir: <i>Moyen</i> <br /> Compétences "
-"requises: <i>Moyennes</i> <br /> Tuteurs potentiels: <i>Nick, Roger</i> <br "
-"/> Tor a besoin d'être bien plus testé. Ce travail est composé de plusieurs "
+"requises: <i>Moyennes</i> <br /> Tuteurs potentiels: <i>Nick, Roger</i> <br /"
+"> Tor a besoin d'être bien plus testé. Ce travail est composé de plusieurs "
 "parties. Pour commencer, notre couverture de tests unitaires devrait être "
 "plus large, spécialement du côté des fonctions utilitaires. Cela implique la "
 "refonte de certaines parties de Tor dans le but de dissocier le plus "
@@ -662,12 +658,11 @@
 "processus d'intégration et de tests de compilation (nous sommes à la "
 "recherche de quelqu'un qui pourrait le faire fonctionner sous Windows). Mais "
 "nous avons besoin de mettre à jour nos tests de simulation réseau "
-"(construits dans <a "
-"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>) pour "
-"les versions récentes de Tor et de concevoir la mise en place d'un réseau "
-"de test soit sur une seule machine soit sur plusieurs de manière à tester "
-"automatiquement les changements de performances selon les rôles de chaque "
-"machine."
+"(construits dans <a href=\"https://svn.torproject.org/svn/torflow/trunk/"
+"README\">TorFlow</a>) pour les versions récentes de Tor et de concevoir la "
+"mise en place d'un réseau de test soit sur une seule machine soit sur "
+"plusieurs de manière à tester automatiquement les changements de "
+"performances selon les rôles de chaque machine."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:353
@@ -694,22 +689,21 @@
 "Compétences requises: <i>Moyennes à Hautes</i> <br /> Tuteurs potentiels: "
 "<i>Karsten, Nick</i> <br /> D'autres personnes travaillent en ce moment sur "
 "des clients Tor pour Java, Android et Maemo.  La première étape est de vous "
-"intéresser au projet dans lequel vous désirez vous investir: <a "
-"href=\"http://github.com/brl/JTor\">Tor pour Java</a>, <a href=\"https://svn.to"
-"rproject.org/svn/projects/android/trunk/\">Androif/Orbot</a> ou Tor pour "
+"intéresser au projet dans lequel vous désirez vous investir: <a href="
+"\"http://github.com/brl/JTor\">Tor pour Java</a>, <a href=\"https://svn."
+"torproject.org/svn/projects/android/trunk/\">Androif/Orbot</a> ou Tor pour "
 "Maemo. Consultez les dépôts et familiarisez-vous avec le code source.  De "
 "plus, nous recherchons quelqu'un qui pourrait  (mais ce n'est pas requis) "
 "travailler sur l'interrogation ou même l'hébergement des services cachés Tor "
 "sur ces plateformes.  <br /> Un développeur compétent devrait être capable "
 "de comprendre et d'écrire du code Java, y compris une API Java de "
 "chiffrement. Connaître le C serait également un vrai plus. Il faut également "
-"vouloir lire et contribuer à la documentation existante car "
-"l'implémentation du code est basée sur celle-ci. Ce projet est "
-"essentiellement un projet de code qui nécessite quelques compétences en "
-"matière de conception."
+"vouloir lire et contribuer à la documentation existante car l'implémentation "
+"du code est basée sur celle-ci. Ce projet est essentiellement un projet de "
+"code qui nécessite quelques compétences en matière de conception."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:367
+#: /home/runa/tor/website/en/volunteer.wml:381
 msgid ""
 "<b>New Torbutton Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely Mentors: "
@@ -734,24 +728,25 @@
 "<b>Nouvelles fonctionnalités dans Torbutton<br /> Priorité: <i>Moyenne</i> "
 "<br /> Effort à fournir: <i>Important</i> <br /> Compétences requises: "
 "<i>Hautes</i> <br /> Tuteurs potentiels: <i>Mike</i> <br /> Il existe "
-"plusieurs <a href=\"https://bugs.torproject.org/flyspray/index.php?tasks=all&"
-"amp;project=5&amp;type=2\">demandes d'amélioration</a> dans la section "
-"Torbutton de Flyspray. En particulier, <a href=\"https://bugs.torproject.org/"
-"flyspray/index.php?do=details&amp;id=523\">l'intégration de la 'Nouvelle "
-"Identité' avec Vidalia</a>, <a href=\"https://bugs.torproject.org/flyspray/in"
-"dex.php?do=details&amp;id=940\">les moyens de gérer plusieurs conteneurs de "
-"cookies par identité</a>, <a href=\"https://bugs.torproject.org/flyspray/inde"
-"x.php?do=details&amp;id=637\">la préservation de certains cookies</a> lorsque "
-"ceux-ci sont effacés, <a href=\"https://bugs.torproject.org/flyspray/index.p"
-"hp?do=details&amp;id=524\">une meilleure injection du champ referrer</a>, <a h"
-"ref=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=564\">u"
-"ne remontée correcte du statut de Tor</a>, et <a href=\"https://bugs.torproje"
-"ct.org/flyspray/index.php?do=details&amp;id=462\">la gestion des urls "
-"\"tor://\" et \"tors://\"</a> sont toutes des fonctionnalités intéressantes qui "
-"pourraient être ajoutées.  <br /> Ce travail devrait être réalisé en tant "
-"que code source indépendant réalisé en Javascript et en <a "
-"href=\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\">XUL</a> "
-"sans trop interférer avec le fonctionnement interne de Tor."
+"plusieurs <a href=\"https://bugs.torproject.org/flyspray/index.php?"
+"tasks=all&amp;project=5&amp;type=2\">demandes d'amélioration</a> dans la "
+"section Torbutton de Flyspray. En particulier, <a href=\"https://bugs."
+"torproject.org/flyspray/index.php?do=details&amp;id=523\">l'intégration de "
+"la 'Nouvelle Identité' avec Vidalia</a>, <a href=\"https://bugs.torproject."
+"org/flyspray/index.php?do=details&amp;id=940\">les moyens de gérer plusieurs "
+"conteneurs de cookies par identité</a>, <a href=\"https://bugs.torproject."
+"org/flyspray/index.php?do=details&amp;id=637\">la préservation de certains "
+"cookies</a> lorsque ceux-ci sont effacés, <a href=\"https://bugs.torproject."
+"org/flyspray/index.php?do=details&amp;id=524\">une meilleure injection du "
+"champ referrer</a>, <a href=\"https://bugs.torproject.org/flyspray/index.php?"
+"do=details&amp;id=564\">une remontée correcte du statut de Tor</a>, et <a "
+"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=462"
+"\">la gestion des urls \"tor://\" et \"tors://\"</a> sont toutes des "
+"fonctionnalités intéressantes qui pourraient être ajoutées.  <br /> Ce "
+"travail devrait être réalisé en tant que code source indépendant réalisé en "
+"Javascript et en <a href=\"http://www.mozilla.org/keymaster/gatekeeper/there."
+"is.only.xul\">XUL</a> sans trop interférer avec le fonctionnement interne de "
+"Tor."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:415
@@ -775,8 +770,8 @@
 "Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto"
 "\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
 msgstr ""
-"Intégration de <a href=\"http://chandlerproject.org/Projects/MeTooCrypto\">la "
-"bibliohthèque Python MeTooCrypto</a> pour les téléchargements HTTPS "
+"Intégration de <a href=\"http://chandlerproject.org/Projects/MeTooCrypto"
+"\">la bibliohthèque Python MeTooCrypto</a> pour les téléchargements HTTPS "
 "authentifiés."
 
 #. type: Content of: <div><ol><li><ol><li>
@@ -805,7 +800,7 @@
 "les API win32 et posix ainsi que dans Python."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:428
+#: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
 "i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /"
@@ -830,20 +825,20 @@
 "nombreux utilisateurs de Tor disposent de connexions à Internet de qualité "
 "médiocre avec une faible bande passante, beaucoup de latence et de "
 "nombreuses pertes ou tris de paquets. A l'usage, Tor ne se comporte pas très "
-"bien dans ces conditions mais il est difficile d'améliorer la situation "
-"sans pouvoir reproduire le problème en laboratoire.  <br /> Ce projet "
-"consiste à élaborer un environnement de simulation d'une connection médiocre "
-"de manière à ce que l'effet sur Tor puisse être mesuré. D'autres composants "
-"à mettre en place pourraient être des utilitaires de test des propriétés "
-"des connexions disponibles pour mesurer l'effet sur les performance des "
-"modifications apportées à Tor.  <br /> Le responsable du projet peut "
-"utiliser les outils de son choix mais dummynet (pour FreeBSD) et nisnet "
-"(pour Linux) sont deux composants sur lesquels le projet peut être "
-"construit. Les étudiants devraient avoir de l'expérience en programmation "
-"réseau et en TCP/IP, de préférence compétents en C et en langage de script."
+"bien dans ces conditions mais il est difficile d'améliorer la situation sans "
+"pouvoir reproduire le problème en laboratoire.  <br /> Ce projet consiste à "
+"élaborer un environnement de simulation d'une connection médiocre de manière "
+"à ce que l'effet sur Tor puisse être mesuré. D'autres composants à mettre en "
+"place pourraient être des utilitaires de test des propriétés des connexions "
+"disponibles pour mesurer l'effet sur les performance des modifications "
+"apportées à Tor.  <br /> Le responsable du projet peut utiliser les outils "
+"de son choix mais dummynet (pour FreeBSD) et nisnet (pour Linux) sont deux "
+"composants sur lesquels le projet peut être construit. Les étudiants "
+"devraient avoir de l'expérience en programmation réseau et en TCP/IP, de "
+"préférence compétents en C et en langage de script."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:458
+#: /home/runa/tor/website/en/volunteer.wml:475
 msgid ""
 "<b>An Improved and More Usable Network Map in Vidalia</b> <br /> Priority: "
 "<i>Low to Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: "
@@ -866,19 +861,19 @@
 "Previous experience with Qt and CMake is helpful, but not required."
 msgstr ""
 "<b>Une meilleure et plus utile carte du réseau dans Vidalia</b> <br /> "
-"Priorité: <i>Faible à Moyenne</i> <br /> Effort à fournir: <i>Moyen</i> <br "
-"/> Compétences requises: <i>Moyennes</i> <br /> Tuteurs potentiels: "
-"<i>Matt</i> <br /> Une des fonctionnalités courantes de Vidalia est la carte "
-"du réseau qui montre à l'utilisateur l'emplacement approximatif des relais "
-"du réseau Tor et qui trace les chemins empruntés par le trafic qui y est "
+"Priorité: <i>Faible à Moyenne</i> <br /> Effort à fournir: <i>Moyen</i> <br /"
+"> Compétences requises: <i>Moyennes</i> <br /> Tuteurs potentiels: <i>Matt</"
+"i> <br /> Une des fonctionnalités courantes de Vidalia est la carte du "
+"réseau qui montre à l'utilisateur l'emplacement approximatif des relais du "
+"réseau Tor et qui trace les chemins empruntés par le trafic qui y est "
 "injecté. La carte n'est pas très interactive pour le moment et est de "
 "médiocre qualité graphique. A la place, nous avons implémenté le widget KDE "
 "Marble pour nous donner une carte de meilleure qualité et nous permettre une "
 "meilleure interactivité tel que l'affichage des informations d'un relais ou "
 "d'un chemin lorsqu'on clique dessus. Nous voulons ajouter la possibilité "
 "pour les utilisateurs de cliquer sur un relais ou un pays contenant un ou "
-"plusieurs relais de sortie Tor et dire \"Je veux que mes connexions de sortie "
-"se fasse à partir d'ici.\". <br /> Ce projet implique d'abord d'être "
+"plusieurs relais de sortie Tor et dire \"Je veux que mes connexions de "
+"sortie se fasse à partir d'ici.\". <br /> Ce projet implique d'abord d'être "
 "familiarisé avec Vidalia et l'API du widget Marble. On pourra ensuite "
 "intégrer le widget dans Vidalia et adapter Marble à notre application, comme "
 "rendre les circuits cliquables, l'enregistrement du cache des données de la "
@@ -888,7 +883,7 @@
 "Qt et Cmake serait un vrai plus."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:492
+#: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
 "> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -898,17 +893,17 @@
 "your hostname in the outgoing mail that it sends. At some point we should "
 "start a new push to build a Thunderbird extension similar to Torbutton."
 msgstr ""
-"<b>Équivalent de Torbutton pour Thunderbird</b> <br /> Priorité: "
-"<i>Faible</i> <br /> Effort à fournir: <i>Important</i> <br /> Compétences "
-"requises: <i>Hautes</i> <br /> Tuteurs potentiels: <i>Mike</i> <br /> Nous "
-"entendons parler d'un nombre de plus en plus important d'utilisateurs qui "
-"désirent utiliser Thunderbird avec Tor. Néanmoins, il y a plein de problèmes "
-"de niveau applicatifs, par exemple, par défaut Thunderbird ajoutera votre "
-"nom d'hôte au mail sortant qu'il envoie. A un certain niveau, nous devrions "
+"<b>Équivalent de Torbutton pour Thunderbird</b> <br /> Priorité: <i>Faible</"
+"i> <br /> Effort à fournir: <i>Important</i> <br /> Compétences requises: "
+"<i>Hautes</i> <br /> Tuteurs potentiels: <i>Mike</i> <br /> Nous entendons "
+"parler d'un nombre de plus en plus important d'utilisateurs qui désirent "
+"utiliser Thunderbird avec Tor. Néanmoins, il y a plein de problèmes de "
+"niveau applicatifs, par exemple, par défaut Thunderbird ajoutera votre nom "
+"d'hôte au mail sortant qu'il envoie. A un certain niveau, nous devrions "
 "pousser la réalisation d'une extension Thunderbird similaire à Torbutton."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:510
+#: /home/runa/tor/website/en/volunteer.wml:527
 msgid ""
 "<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
@@ -932,7 +927,7 @@
 "tests. Connaître Winsock et Qemu serait un plus."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:530
+#: /home/runa/tor/website/en/volunteer.wml:547
 msgid ""
 "<b>Improve Tor Weather</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> Likely "
@@ -955,27 +950,27 @@
 msgstr ""
 "<b>Améliorer Tor Weather</b> <br /> Priorité: <i>Moyenne</i> <br /> Effort à "
 "fournir: <i>Moyen</i> <br /> Compétences requises: <i>moyennes</i> <br /> "
-"Tuteurs potentiels: <i>Christian, Roger</i> <br /> <a "
-"href=\"https://weather.torproject.org/\">Tor weather</a> est un outil qui "
-"permet de recevoir un email indiquant le moment où le relais que vous "
-"désirez tracer s'arrête. Actuellement, il n'est pas vraiment utile pour les "
-"personnes qui utilisent la fonctionnalité d'hibernation de Tor ou pour ceux "
-"qui doivent éteindre régulièrement leur relais. Au cours du projet, Tor "
-"weather pourrait être enrichi pour permettre des configurations plus "
-"souples.  D'autres améliorations sont également envisageables: Weather "
-"pourrait vous envoyer des avertissements lorsque votre relais fonctionne "
-"avec une version périmée de Tor ou lorsque votre bande passante atteint un "
-"seuil limite. Il pourrait être également un outil sympathique pour vous "
-"indiquer si votre relais vous permet d'avoir un <a href=\"<page "
-"tshirt>\">T-Shirt</a> ou envoyer des rappels au autorités d'annuaire que "
-"leurs clefs vont bientôt expirer. Soyez créatifs et n'oubliez pas que ce "
-"projet vous permet de juger de l'état du réseau dans le but de vous aider à "
-"terminer votre travail plus rapidement ! Consultez également son <a "
-"href=\"https://svn.torproject.org/svn/weather/trunk/README\">README</a> et <a "
-"href=\"https://svn.torproject.org/svn/weather/trunk/TODO\">TODO</a>."
+"Tuteurs potentiels: <i>Christian, Roger</i> <br /> <a href=\"https://weather."
+"torproject.org/\">Tor weather</a> est un outil qui permet de recevoir un "
+"email indiquant le moment où le relais que vous désirez tracer s'arrête. "
+"Actuellement, il n'est pas vraiment utile pour les personnes qui utilisent "
+"la fonctionnalité d'hibernation de Tor ou pour ceux qui doivent éteindre "
+"régulièrement leur relais. Au cours du projet, Tor weather pourrait être "
+"enrichi pour permettre des configurations plus souples.  D'autres "
+"améliorations sont également envisageables: Weather pourrait vous envoyer "
+"des avertissements lorsque votre relais fonctionne avec une version périmée "
+"de Tor ou lorsque votre bande passante atteint un seuil limite. Il pourrait "
+"être également un outil sympathique pour vous indiquer si votre relais vous "
+"permet d'avoir un <a href=\"<page tshirt>\">T-Shirt</a> ou envoyer des "
+"rappels au autorités d'annuaire que leurs clefs vont bientôt expirer. Soyez "
+"créatifs et n'oubliez pas que ce projet vous permet de juger de l'état du "
+"réseau dans le but de vous aider à terminer votre travail plus rapidement ! "
+"Consultez également son <a href=\"https://svn.torproject.org/svn/weather/"
+"trunk/README\">README</a> et <a href=\"https://svn.torproject.org/svn/"
+"weather/trunk/TODO\">TODO</a>."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:570
+#: /home/runa/tor/website/en/volunteer.wml:577
 msgid ""
 "<b>Better Debian/Ubuntu Packaging for Tor+Vidalia</b> <br /> Vidalia "
 "currently doesn't play nicely on Debian and Ubuntu with the default Tor "
@@ -1011,48 +1006,47 @@
 "have prior knowledge of Debian package management and some C++ development "
 "experience. Previous experience with Qt is helpful, but not required."
 msgstr ""
-"<b>Améliorer la mise en paquets de Tor et Vidalia sur Debian/Ubuntu</b> <br "
-"/> Vidalia ne fonctionne pas correctement sous Debian et Ubuntu avec les "
+"<b>Améliorer la mise en paquets de Tor et Vidalia sur Debian/Ubuntu</b> <br /"
+"> Vidalia ne fonctionne pas correctement sous Debian et Ubuntu avec les "
 "paquets par défaut de Tor. Les paquets Tor actuels lancement automatiquement "
-"Tor en tant que démon sous le compte utilisateur debian-tor et "
-"(visiblement) n'ont pas de directive <a href=\"<gitblob>doc/spec/control-"
-"spec.txt\">ControlPort</a> définie dans le fichier de configuration torrc par "
+"Tor en tant que démon sous le compte utilisateur debian-tor et (visiblement) "
+"n'ont pas de directive <a href=\"<gitblob>doc/spec/control-spec.txt"
+"\">ControlPort</a> définie dans le fichier de configuration torrc par "
 "défaut. En conséquence, Vidalia tente de démarrer sont propre processus Tor "
-"étant donné qu'il ne peut se connecter au Tor existant; à la suite de quoi "
-", le processus Tor lancé par Vidalia génère un message d'erreur peu "
+"étant donné qu'il ne peut se connecter au Tor existant; à la suite de quoi , "
+"le processus Tor lancé par Vidalia génère un message d'erreur peu "
 "compréhensible indiquant que Tor ne peut pas utiliser ses ports d'écoute "
 "&mdash; ils sont déjà utilisé par le démon Tor initial.  <br /> La solution "
 "implique soit d'indiquer à l'utilisateur d'arrêter le démon existant et de "
 "laisser Vidalia démarrer son propre processus Tor soit d'expliquer à "
 "l'utilisateur comment configurer un port de contrôle et un mot de passe dans "
-"son torrc. Une meilleure solution pour Debian serait d'utiliser la "
-"directive ControlSocket qui permet à Vidalia de communiquer avec Tor via une "
-"socket Unix et cela pourrait être activé par défaut dans les paquets Debian "
-"de Tor. Vidalia peut ensuite s'authentifier sur Tor en utilisant "
-"l'authentification du système de fichier (cookie) si l'utilisateur qui a "
-"lancé Vidalia est également dans le groupe debian-tor.  <br /> Ce projet "
-"implique d'abord le support de la directive ControlSocket dans Vidalia. "
-"L'étudiant développera et testera alors les paquets Vidalia pour Debian et "
-"Ubuntu de manière conforme aux standards d'empaquetage de Debian et "
-"s'assurera qu'ils fonctionnent correctement avec les paquets Tor existant. "
-"Nous pouvons aussi mettre en place un dépôt pour héberger les nouveaux "
-"paquets Vidalia.  <br /> Le défi qui suit consiste à trouver un moyen "
-"efficace pour Vidalia de pouvoir modifier la configuration de Tor (torrc) "
-"même si celle-ci est située dans <code>/etc/tor/torrc</code> et reste "
-"immuable. La meilleure idée que nous avons trouvée jusqu'à présent est de "
-"faire passer cette configuration par le ControlSocket lorsque Vidalia "
-"démarre mais c'est une méthode discutable car Tor se lance à chaque "
-"démarrage avec une configuration différente de celle que désire "
-"l'utilisateur. La deuxième idée consiste à faire écrire à Vidalia un fichier "
-"temporaire torrc et demander à l'utilisateur de le déplacer manuellement "
-"dans <code>/etc/tor/torrc</code> mais c'est également discutable car les "
-"utilisateurs ne devraient pas gérer ces fichiers directement.  <br />Une "
-"personne intéressée par ce projet doit disposer d'une certaine connaissance "
-"des règles d'empaquetage dans Debian et avoir une expérience en C++. Des "
-"compétences en QT seraient un vrai plus."
+"son torrc. Une meilleure solution pour Debian serait d'utiliser la directive "
+"ControlSocket qui permet à Vidalia de communiquer avec Tor via une socket "
+"Unix et cela pourrait être activé par défaut dans les paquets Debian de Tor. "
+"Vidalia peut ensuite s'authentifier sur Tor en utilisant l'authentification "
+"du système de fichier (cookie) si l'utilisateur qui a lancé Vidalia est "
+"également dans le groupe debian-tor.  <br /> Ce projet implique d'abord le "
+"support de la directive ControlSocket dans Vidalia. L'étudiant développera "
+"et testera alors les paquets Vidalia pour Debian et Ubuntu de manière "
+"conforme aux standards d'empaquetage de Debian et s'assurera qu'ils "
+"fonctionnent correctement avec les paquets Tor existant. Nous pouvons aussi "
+"mettre en place un dépôt pour héberger les nouveaux paquets Vidalia.  <br /> "
+"Le défi qui suit consiste à trouver un moyen efficace pour Vidalia de "
+"pouvoir modifier la configuration de Tor (torrc) même si celle-ci est située "
+"dans <code>/etc/tor/torrc</code> et reste immuable. La meilleure idée que "
+"nous avons trouvée jusqu'à présent est de faire passer cette configuration "
+"par le ControlSocket lorsque Vidalia démarre mais c'est une méthode "
+"discutable car Tor se lance à chaque démarrage avec une configuration "
+"différente de celle que désire l'utilisateur. La deuxième idée consiste à "
+"faire écrire à Vidalia un fichier temporaire torrc et demander à "
+"l'utilisateur de le déplacer manuellement dans <code>/etc/tor/torrc</code> "
+"mais c'est également discutable car les utilisateurs ne devraient pas gérer "
+"ces fichiers directement.  <br />Une personne intéressée par ce projet doit "
+"disposer d'une certaine connaissance des règles d'empaquetage dans Debian et "
+"avoir une expérience en C++. Des compétences en QT seraient un vrai plus."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:614
+#: /home/runa/tor/website/en/volunteer.wml:621
 msgid ""
 "<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
 "good authenticated-update framework.  Vidalia already has the ability to "
@@ -1079,9 +1073,9 @@
 "a vital step of the project will be producing a design document to review "
 "and discuss with others prior to implementation."
 msgstr ""
-"<b>Framework de mise à jour automatique pour Tor/Polipo/Vidalia</b> <br "
-"/>Nous avons besoin d'un bon framework pour les mises à jour authentifiées. "
-" Vidalia dispose déjà de la capacité à avertir l'utilisateur qu'il utilise "
+"<b>Framework de mise à jour automatique pour Tor/Polipo/Vidalia</b> <br /"
+">Nous avons besoin d'un bon framework pour les mises à jour authentifiées.  "
+"Vidalia dispose déjà de la capacité à avertir l'utilisateur qu'il utilise "
 "une version périmée ou non recommandée de Tor en utilisant des annonces "
 "signées issue des information d'annuaire. Pour le moment, Vidalia affiche "
 "simplement une petit boîte de dialogue qui informe l'utilisateur qu'il doit "
@@ -1108,7 +1102,7 @@
 "avant l'implémentation."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:648
+#: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
 "> It would be useful to have automated build processes for Windows and "
@@ -1139,28 +1133,27 @@
 "d'avoir un tel environnement est de s'assurer que Windows ne reste pas à la "
 "traîne sur aucun des logiciels employés dans le projet Tor. <br />Buildbot "
 "semble être un bon choix car il supporte toutes les plateformes "
-"surlesquelles Tor fonctionne. Consultez <a "
-"href=\"http://en.wikipedia.org/wiki/BuildBot\">l'article Wikipedia sur "
-"buildbot</a>.<br /> Il y a sans doute de meilleures options que la personne "
-"désirant gérer cette tâche doit évaluer. Toute personne travaillant sur ce "
-"processus de compilation automatique doit avoir de l'expérience ou le désir "
-"d'apprendre comment compiler l'ensemble du code source en lien avec Tor à "
-"partir de rien. De plus, cette personne doit disposer d'une expérience dans "
-"la compilation de logiciels sous l'environnement Windows car c'est le coeur "
-"de cible à ne pas rater de ce projet. Ce travail impose d'utiliser le code "
-"source de Tor mais uniquement du point de vue compilation et non "
-"d'écriture.<br />Ensuite, nous avons besoin d'automatiser nos tests de "
-"performance pour toutes les plateformes. Nous disposons là encore de builbot "
-"(sauf sur Windows &mdash; comme indiqué ci-dessus) pour automatiser nos "
-"intégrations régulières de code et nos tests de compilation mais nous avons "
-"besoin de mettre à jour nos tests de simulation réseau pour les versions les "
-"plus récente de Tor. Enfin, nous avons besoin de lancer des tests réseau à "
-"la fois sur une seule machine et également à travers plusieurs autres de "
-"manière à tester automatiquement les changement de performance avec des "
-"rôles différents."
+"surlesquelles Tor fonctionne. Consultez <a href=\"http://en.wikipedia.org/"
+"wiki/BuildBot\">l'article Wikipedia sur buildbot</a>.<br /> Il y a sans "
+"doute de meilleures options que la personne désirant gérer cette tâche doit "
+"évaluer. Toute personne travaillant sur ce processus de compilation "
+"automatique doit avoir de l'expérience ou le désir d'apprendre comment "
+"compiler l'ensemble du code source en lien avec Tor à partir de rien. De "
+"plus, cette personne doit disposer d'une expérience dans la compilation de "
+"logiciels sous l'environnement Windows car c'est le coeur de cible à ne pas "
+"rater de ce projet. Ce travail impose d'utiliser le code source de Tor mais "
+"uniquement du point de vue compilation et non d'écriture.<br />Ensuite, nous "
+"avons besoin d'automatiser nos tests de performance pour toutes les "
+"plateformes. Nous disposons là encore de builbot (sauf sur Windows &mdash; "
+"comme indiqué ci-dessus) pour automatiser nos intégrations régulières de "
+"code et nos tests de compilation mais nous avons besoin de mettre à jour nos "
+"tests de simulation réseau pour les versions les plus récente de Tor. Enfin, "
+"nous avons besoin de lancer des tests réseau à la fois sur une seule machine "
+"et également à travers plusieurs autres de manière à tester automatiquement "
+"les changement de performance avec des rôles différents."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:676
+#: /home/runa/tor/website/en/volunteer.wml:683
 msgid ""
 "<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
@@ -1205,24 +1198,24 @@
 "knows how to hear from IRC clients, knows how to talk to IRC servers, and "
 "has an additional layer that requires the users to authenticate."
 msgstr ""
-"<b>Un proxy IRC d'authentification</b> <br /> Priorité: <i>Moyenne</i> <br "
-"/> Effort à fournir: <i>Moyen à Important</i> <br /> Compétences requises: "
+"<b>Un proxy IRC d'authentification</b> <br /> Priorité: <i>Moyenne</i> <br /"
+"> Effort à fournir: <i>Moyen à Important</i> <br /> Compétences requises: "
 "<i>Moyennes à Hautes</i> <br /> Tuteurs potentiels: <i>Sebastian, Weasel, "
 "Roger</i> <br /> Le monde entier a besoin d'un proxy IRC d'authentification. "
 "Comme nous le rappelle régulièrement la bande dessinée web Penny Arcade: "
 "\"Utilisateur Internet+ anonymat = abruti\". Toutefois, Tor n'a pas de "
 "problème avec le sites web car ces derniers permettent à leurs utilisateurs "
 "de connecter en utilisant des systèmes d'authentification situés à un autre "
-"niveau. Mais les serveurs IRC sont bien plus mauvais car pour la majorité d"
-"'entre-eux, le code source est écrit de manière médiocre: difficile à "
+"niveau. Mais les serveurs IRC sont bien plus mauvais car pour la majorité "
+"d'entre-eux, le code source est écrit de manière médiocre: difficile à "
 "maintenir et plus difficile encore à modifier. De nombreux réseaux IRC "
 "bloquent maintenant les connexions depuis Tor et nous sommes quasiment "
 "acceptés seulement sur deux réseaux (OFTC et Freenode). Cet état signifie "
 "qu'un grand nombre de personnes dans le monde affirment \"je vous l'avais "
-"bien dit\" lorsqu'ils évoquent l'anonymat en ligne alors que c'est simplement "
-"dû à un manque de technologie pour rendre le problème gérable. Nous avons "
-"besoin d'un moyen pour les réseaux IRC de distinguer quels sont les "
-"utilisateurs qui ont prouvé leur réputation et qui sont les abrutis, de "
+"bien dit\" lorsqu'ils évoquent l'anonymat en ligne alors que c'est "
+"simplement dû à un manque de technologie pour rendre le problème gérable. "
+"Nous avons besoin d'un moyen pour les réseaux IRC de distinguer quels sont "
+"les utilisateurs qui ont prouvé leur réputation et qui sont les abrutis, de "
 "manière à bien séparer les deux. Il existe quels concepts de recherche comme "
 "<a href=\"http://www.cs.dartmouth.edu/~nymble/\">Nymble</a> qui permet aux "
 "sites web de blacklister les utilisateurs sans avoir besoin de connaître "
@@ -1243,18 +1236,18 @@
 "proposals\">current proposals</a> might also be short on developers."
 msgstr ""
 "<b>Amener de nouvelles idées !</b> <br />Vous n'aimez aucune de celles qui "
-"sont présentées ? Consultez <a href=\"<gitblob>doc/roadmaps/2008-12-19"
-"-roadmap-full.pdf\">la feuille de route de développement</a> pour vous donner "
+"sont présentées ? Consultez <a href=\"<gitblob>doc/roadmaps/2008-12-19-"
+"roadmap-full.pdf\">la feuille de route de développement</a> pour vous donner "
 "d'autres idées.  Quelques-unes <a href=\"<gittree>doc/spec/proposals/\">des "
 "propositions en cours</a> ont également besoin de développeurs."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:693
+#: /home/runa/tor/website/en/volunteer.wml:745
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr "<a id=\"OtherCoding\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:694
+#: /home/runa/tor/website/en/volunteer.wml:746
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
@@ -1263,7 +1256,7 @@
 "de code</a>"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:696
+#: /home/runa/tor/website/en/volunteer.wml:748
 msgid ""
 "Tor relays don't work well on Windows XP. On Windows, Tor uses the standard "
 "<tt>select()</tt> system call, which uses space in the non-page pool. This "
@@ -1290,7 +1283,7 @@
 "trunk/\">bien démarré</a> sur ce point l'été 2007."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:709
+#: /home/runa/tor/website/en/volunteer.wml:761
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "documentation>#DesignDoc\">blocking-resistance design</a>. This involves "
@@ -1306,7 +1299,7 @@
 "deploiement."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:715
+#: /home/runa/tor/website/en/volunteer.wml:767
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -1331,7 +1324,7 @@
 "écrivant un rapport ou deux."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:725
+#: /home/runa/tor/website/en/volunteer.wml:777
 msgid ""
 "Tor 0.1.1.x and later include support for hardware crypto accelerators via "
 "OpenSSL. It has been lightly tested and is possibly very buggy.  We're "
@@ -1343,7 +1336,7 @@
 "voudrait se procurer une carte et nous dire ce qu'il en est ?"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:728
+#: /home/runa/tor/website/en/volunteer.wml:780
 msgid ""
 "Perform a security analysis of Tor with <a href=\"http://en.wikipedia.org/"
 "wiki/Fuzz_testing\">\"fuzz\"</a>. Determine if there are good fuzzing "
@@ -1356,7 +1349,7 @@
 "celui grâce à qui une nouvelle version pourra voir le jour !"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:733
+#: /home/runa/tor/website/en/volunteer.wml:785
 msgid ""
 "Tor uses TCP for transport and TLS for link encryption. This is nice and "
 "simple, but it means all cells on a link are delayed when a single packet "
@@ -1380,7 +1373,7 @@
 "lisez-la et faites-nous part de vos remarques et critiques, s'il-vous-plaît."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:744
+#: /home/runa/tor/website/en/volunteer.wml:796
 msgid ""
 "We're not that far from having IPv6 support for destination addresses (at "
 "exit nodes). If you care strongly about IPv6, that's probably the first "
@@ -1391,7 +1384,7 @@
 "partir de là est sans doute un premier pas."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:748
+#: /home/runa/tor/website/en/volunteer.wml:800
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page overview>\">overview page</a> from "
@@ -1401,12 +1394,12 @@
 "the website."
 msgstr ""
 "Nous avons besoin de générer les diagrammes du site web (par exemple les "
-"images de \"Comment fonctionne Tor ?\" sur <a href=\"<page overview>\">la page "
-"d'aperçu</a> à partir d'une source de manière à pouvoir les traduire comme "
-"du texte UTF-8 plutôt que de les éditer à la main avec Gimp. Nous voudrions "
-"intégrer ce processus dans un fichier wml pour faciliter les traductions et "
-"regénérer les images en plusieurs langues lorsque nous construisons le site "
-"web."
+"images de \"Comment fonctionne Tor ?\" sur <a href=\"<page overview>\">la "
+"page d'aperçu</a> à partir d'une source de manière à pouvoir les traduire "
+"comme du texte UTF-8 plutôt que de les éditer à la main avec Gimp. Nous "
+"voudrions intégrer ce processus dans un fichier wml pour faciliter les "
+"traductions et regénérer les images en plusieurs langues lorsque nous "
+"construisons le site web."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:807
@@ -1418,22 +1411,21 @@
 msgstr ""
 "Comment pouvons-nous maintenir, améliorer et documenter plus facilement les "
 "différents systèmes LiveCD/USB ? <a href=\"http://amnesia.boum.org/\">Le "
-"LiveCD/USB amnesia</a>et <a "
-"href=\"http://anonymityanywhere.com/incognito/\">le LiveCD Incognito</a> sont "
-"quelques exemples."
+"LiveCD/USB amnesia</a>et <a href=\"http://anonymityanywhere.com/incognito/"
+"\">le LiveCD Incognito</a> sont quelques exemples."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:760
+#: /home/runa/tor/website/en/volunteer.wml:814
 msgid "<a id=\"Research\"></a>"
 msgstr "<a id=\"Research\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:761
+#: /home/runa/tor/website/en/volunteer.wml:815
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr "<a class=\"anchor\" href=\"#Research\">Recherche</a>"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:763
+#: /home/runa/tor/website/en/volunteer.wml:817
 msgid ""
 "The \"website fingerprinting attack\": make a list of a few hundred popular "
 "websites, download their pages, and make a set of \"signatures\" for each "
@@ -1461,7 +1453,7 @@
 "d'utilisabilité de Tor (à quantifier) ?"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:775
+#: /home/runa/tor/website/en/volunteer.wml:829
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice "
 "and at Bob, we can <a href=\"http://freehaven.net/anonbib/#danezis:pet2004"
@@ -1485,7 +1477,7 @@
 "modelage de trafic fonctionnent mieux que d'autres ?"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:785
+#: /home/runa/tor/website/en/volunteer.wml:839
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -1512,16 +1504,15 @@
 "former une queue pouvant être utilisée pour mimer les timings du trafic "
 "descendant du client pour le faire passer pour du trafic egalement relayé ? "
 "Cette queue identique pourrait être également utilisée pour masquer les "
-"temps du trafic montant du client à l'aide des techniques dites <a "
-"href=\"http://www.freehaven.net/anonbib/#ShWa-Timing06\">adaptative "
-"padding</a> sans avoir besoin de trafic supplémentaire. Est-ce-qu'un tel "
-"entrelacement du trafic montant du client osbcurcit les temps pour des "
-"attaquants externes ? Les stratégies doivent-elles être ajustées pour les "
-"liens symétriques ? Ou bien est-ce plus évident que pour les liens "
-"symétriques ?"
+"temps du trafic montant du client à l'aide des techniques dites <a href="
+"\"http://www.freehaven.net/anonbib/#ShWa-Timing06\">adaptative padding</a> "
+"sans avoir besoin de trafic supplémentaire. Est-ce-qu'un tel entrelacement "
+"du trafic montant du client osbcurcit les temps pour des attaquants "
+"externes ? Les stratégies doivent-elles être ajustées pour les liens "
+"symétriques ? Ou bien est-ce plus évident que pour les liens symétriques ?"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:800
+#: /home/runa/tor/website/en/volunteer.wml:854
 msgid ""
 "Repeat Murdoch and Danezis's <a href=\"http://www.cl.cam.ac.uk/~sjm217/"
 "projects/anon/#torta\">attack from Oakland 05</a> on the current Tor "
@@ -1552,12 +1543,11 @@
 "plus grand nombre de relais candidats augmente le taux de faux positifs ou "
 "une autre complexité dans l'attaque ? (Le réseau Tor est maintenant deux "
 "fois plus étendu qu'il ne l'était au moment de la rédaction de leur papier). "
-"Prenez également le temps de consulter le document <a "
-"href=\"http://freehaven.net/anonbib/#clog-the-queue\">Don't Clog the "
-"Queue</a>."
+"Prenez également le temps de consulter le document <a href=\"http://"
+"freehaven.net/anonbib/#clog-the-queue\">Don't Clog the Queue</a>."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:815
+#: /home/runa/tor/website/en/volunteer.wml:869
 msgid ""
 "The \"routing zones attack\": most of the literature thinks of the network "
 "path between Alice and her entry node (and between the exit node and Bob) as "
@@ -1570,20 +1560,20 @@
 "it. Are there practical approximations, such as avoiding IP addresses in the "
 "same /8 network?"
 msgstr ""
-"L'attaque \"routing zones\": la majorité de ce qui est écrit sur Tor modélise "
-"le chemin réseau entre Alice et son noeud d'entrée (et entre Bob et le noeud "
-"de sortie) comme un simple lien sur un graphe. En pratique, le chemin "
-"traverse de nombreux systèmes automomes (SA) et <a "
-"href=\"http://freehaven.net/anonbib/#feamster:wpes2004\">il n'est pas rare que "
-"le même SA apparaissent à la fois sur le chemin d'entrée comme sur le "
-"chemin de retoure</a>.  Malheureusement, pour être sûr de prédire si un "
-"quartet Alice, noeud d'entrée, noeud de sortie, Bob sera dangereux, il faut "
-"télécharger entièrement une zone de routage Internet et effectuer de "
-"couteuses opérations dessus. Existe-t-il des approximations pratiques comme "
-"éviter les adresse IP situées dans le même réseau /8 ?"
+"L'attaque \"routing zones\": la majorité de ce qui est écrit sur Tor "
+"modélise le chemin réseau entre Alice et son noeud d'entrée (et entre Bob et "
+"le noeud de sortie) comme un simple lien sur un graphe. En pratique, le "
+"chemin traverse de nombreux systèmes automomes (SA) et <a href=\"http://"
+"freehaven.net/anonbib/#feamster:wpes2004\">il n'est pas rare que le même SA "
+"apparaissent à la fois sur le chemin d'entrée comme sur le chemin de "
+"retoure</a>.  Malheureusement, pour être sûr de prédire si un quartet Alice, "
+"noeud d'entrée, noeud de sortie, Bob sera dangereux, il faut télécharger "
+"entièrement une zone de routage Internet et effectuer de couteuses "
+"opérations dessus. Existe-t-il des approximations pratiques comme éviter les "
+"adresse IP situées dans le même réseau /8 ?"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:825
+#: /home/runa/tor/website/en/volunteer.wml:879
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -1595,14 +1585,14 @@
 msgstr ""
 "D'autres points de recherche se pose la question de savoir, d'un point de "
 "vue diversité géographique, s'il est mieux d'avoir un circuit efficace ou de "
-"choisir un circuit au hasard. Consultez <a href=\"http://swiki.cc.gatech.edu"
-":8080/ugResearch/uploads/7/ImprovingTor.pdf\">les travaux de Stephen "
+"choisir un circuit au hasard. Consultez <a href=\"http://swiki.cc.gatech."
+"edu:8080/ugResearch/uploads/7/ImprovingTor.pdf\">les travaux de Stephen "
 "Rollyson</a> qui expliquent comment éviter les choix particulièrement "
 "inefficaces sans \"trop\" compromettre l'anonymat. Cet angle d'attaque a "
 "besoin d'être creusé et travaillé mais il a l'air très prometteur."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:832
+#: /home/runa/tor/website/en/volunteer.wml:886
 msgid ""
 "Tor doesn't work very well when relays have asymmetric bandwidth (e.g. cable "
 "or DSL). Because Tor has separate TCP connections between each hop, if the "
@@ -1633,7 +1623,7 @@
 "reconsidérer le transport par UDP."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:844
+#: /home/runa/tor/website/en/volunteer.wml:898
 msgid ""
 "A related topic is congestion control. Is our current design sufficient once "
 "we have heavy use? Maybe we should experiment with variable-sized windows "
@@ -1644,14 +1634,14 @@
 msgstr ""
 "Le contrôle de la congestion est un sujet proche. Est-ce-que notre "
 "spécification permet de gérer les fortes charges ? Peut-être devrions-nous "
-"expérimenter des fenêtres de tailles variables plutôt que des fenêtres fixes "
-"? Cela semble prometteur dans <a "
-"href=\"http://www.psc.edu/networking/projects/hpn-ssh/theory.php\">cette "
-"expérimentation autour de ssh</a>. Nous avons besoin de mesurer, de corriger "
-"et peut-être de refondre quelquechose si les résultats s'avèrent bons."
+"expérimenter des fenêtres de tailles variables plutôt que des fenêtres "
+"fixes ? Cela semble prometteur dans <a href=\"http://www.psc.edu/networking/"
+"projects/hpn-ssh/theory.php\">cette expérimentation autour de ssh</a>. Nous "
+"avons besoin de mesurer, de corriger et peut-être de refondre quelquechose "
+"si les résultats s'avèrent bons."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:851
+#: /home/runa/tor/website/en/volunteer.wml:905
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking "
 "at Tor traffic on the wire from <a href=\"<gitblob>doc/design-paper/blocking."
@@ -1666,22 +1656,22 @@
 "an attack we must accept?"
 msgstr ""
 "Nos objectifs de résistance à la censure incluent l'impossibilité pour un "
-"attaquant qui observe le trafic Tor de <a href=\"<gitblob>doc/design-"
-"paper/blocking.html#sec:network-fingerprint\">le distinguer d'un trafic SSL "
+"attaquant qui observe le trafic Tor de <a href=\"<gitblob>doc/design-paper/"
+"blocking.html#sec:network-fingerprint\">le distinguer d'un trafic SSL "
 "normal</a>. Néanmoins, nous ne pouvons pas recréer une stéganographie "
 "parfaire tout en restant utilisable mais, dans un premier temps, nous "
 "aimerions pouvoir bloquer toute attaque qui pourrait réussir en observant "
 "quelques paquets seulement. Une des attaques qu'il nous reste à examiner est "
 "basée sur le fait que les paquets Tor font 512 octets et que par "
 "conséquence, les paquets du trafic réseau sont également des multiples de "
-"512 octets.  En quoi le fait de modifier les enregistrements TLS et leur "
-"en-tête pourrait brouiller ce trafic ? Différentes stratégies de fermeture "
-"de tampon dans Tor peuvent-elles avoir un impact sur ce sujet ? Est-ce-qu'un "
+"512 octets.  En quoi le fait de modifier les enregistrements TLS et leur en-"
+"tête pourrait brouiller ce trafic ? Différentes stratégies de fermeture de "
+"tampon dans Tor peuvent-elles avoir un impact sur ce sujet ? Est-ce-qu'un "
 "peu de remplissage ferait l'affaire ou bien est-ce-une attaque que nous "
 "pouvons accepter ?"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:862
+#: /home/runa/tor/website/en/volunteer.wml:916
 msgid ""
 "Tor circuits are built one hop at a time, so in theory we have the ability "
 "to make some streams exit from the second hop, some from the third, and so "
@@ -1700,7 +1690,7 @@
 "sécurité"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:869
+#: /home/runa/tor/website/en/volunteer.wml:923
 msgid ""
 "It's not that hard to DoS Tor relays or directory authorities. Are client "
 "puzzles the right answer? What other practical approaches are there? Bonus "
@@ -1712,7 +1702,7 @@
 "compatibles avec le protocole Tor actuel."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:872
+#: /home/runa/tor/website/en/volunteer.wml:926
 msgid ""
 "Programs like <a href=\"<page torbutton/index>\">Torbutton</a> aim to hide "
 "your browser's UserAgent string by replacing it with a uniform answer for "
@@ -1751,7 +1741,7 @@
 "question deux."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:889
+#: /home/runa/tor/website/en/volunteer.wml:943
 msgid ""
 "Right now Tor clients are willing to reuse a given circuit for ten minutes "
 "after it's first used. The goal is to avoid loading down the network with "
@@ -1782,7 +1772,7 @@
 "clients initient afin de disposer de données réalistes ?"
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:902
+#: /home/runa/tor/website/en/volunteer.wml:956
 msgid ""
 "How many bridge relays do you need to know to maintain reachability? We "
 "should measure the churn in our bridges. If there is lots of churn, are "
@@ -1794,7 +1784,7 @@
 "utilisateurs de passerelles restent connectés plus longtemps ?"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:910
+#: /home/runa/tor/website/en/volunteer.wml:964
 msgid ""
 "<a href=\"<page contact>\">Let us know</a> if you've made progress on any of "
 "these!"

Added: translation/trunk/projects/website/fr/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/fr/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/fr/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:32+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/kyjIOQm8yn.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/fr/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/fr/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/fr/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:32+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/YdlCp0RNR4.xml:32
+#: /tmp/YdlCp0RNR4.xml:40 /tmp/YdlCp0RNR4.xml:48 /tmp/YdlCp0RNR4.xml:71
+#: /tmp/YdlCp0RNR4.xml:83 /tmp/YdlCp0RNR4.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/fr/docs/3-low.rpms.po
===================================================================
--- translation/trunk/projects/website/fr/docs/3-low.rpms.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fr/docs/3-low.rpms.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:02+0100\n"
+"POT-Creation-Date: 2010-02-23 20:32+0100\n"
 "PO-Revision-Date: 2010-02-21 11:17-0700\n"
 "Last-Translator: Médéric RIBREUX <mederic.ribreux at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -30,7 +30,7 @@
 "sur RPM.</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:14 /tmp/AhmyEKS8Et.xml:60
+#: /home/runa/tor/website/docs/en/rpms.wml:14 /tmp/DJJ9JyxseD.xml:60
 msgid "<br />"
 msgstr "<br />"
 
@@ -76,8 +76,7 @@
 "baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/\n"
 "type=rpm-md\n"
 "gpgcheck=1\n"
-"gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-"
-"torproject.org\n"
+"gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/rpms.wml:35

Modified: translation/trunk/projects/website/fr/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/fr/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/fr/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-07 08:00+0100\n"
+"POT-Creation-Date: 2010-02-23 20:32+0100\n"
 "PO-Revision-Date: 2010-02-02 14:31+0100\n"
 "Last-Translator: Médéric RIBREUX <mederic.ribreux at gmail.com>\n"
 "Language-Team: fr_FR <tor-translate at torproject.org>\n"
@@ -24,9 +24,9 @@
 "Unix"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/oH17TDAv73.xml:24
-#: /tmp/oH17TDAv73.xml:54 /tmp/oH17TDAv73.xml:86 /tmp/oH17TDAv73.xml:129
-#: /tmp/oH17TDAv73.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/FHKK2ecAPQ.xml:24
+#: /tmp/FHKK2ecAPQ.xml:54 /tmp/FHKK2ecAPQ.xml:88 /tmp/FHKK2ecAPQ.xml:131
+#: /tmp/FHKK2ecAPQ.xml:169
 msgid "<br />"
 msgstr "<br />"
 
@@ -126,13 +126,15 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60
+#, fuzzy
 msgid ""
 "The first step is to set up web browsing. Start by installing <a href="
 "\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> from your "
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 "Il faut tout d'abord s'occuper de la navigation web. Commencez par installer "
 "<a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> "
@@ -143,7 +145,7 @@
 "Polipo puisse fonctionner avec Tor."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -162,7 +164,7 @@
 "Par exemple:<br /> <tt>/etc/init.d/polipo restart</tt>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -176,12 +178,12 @@
 "devriez pas les faire tourner tous les deux en même temps."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr "<hr /> <a id=\"using\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
@@ -190,7 +192,7 @@
 "pour utiliser Tor</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
@@ -199,7 +201,7 @@
 "l'utiliser."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -210,7 +212,7 @@
 "\">l'extension Torbutton</a>, redémarrer Firefox et c'est terminé :"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
@@ -219,7 +221,7 @@
 "png\" border=\"1\"> <br />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -232,7 +234,7 @@
 "sur un ordinateur différent</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -256,7 +258,7 @@
 "noreply/TheOnionRouter/TorifyHOWTO#socat\">socat</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -267,12 +269,12 @@
 "TheOnionRouter/TorifyHOWTO\">le HOWTO Torréfaction</a."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr "<hr /> <a id=\"verify\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -282,7 +284,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -300,7 +302,7 @@
 "suggestions supplémentaires sur la manière de tester Tor.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -328,7 +330,7 @@
 "machine pour que cette modification prenne effet. "
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
@@ -338,12 +340,12 @@
 "la FAQ</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
@@ -351,7 +353,7 @@
 "relais</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -371,7 +373,7 @@
 "possibles plaintes suite à une utilisation abusive de Tor."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -387,7 +389,7 @@
 "relayées depuis un autre endroit."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
@@ -396,12 +398,12 @@
 "relay>\">configuration d'un relais</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr "<hr />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/it/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/it/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/it/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:54+0100\n"
+"POT-Creation-Date: 2010-02-23 20:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/it/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/it/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/it/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:01+0100\n"
+"POT-Creation-Date: 2010-02-23 20:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/POJP4AAUlq.xml:40
-#: /tmp/POJP4AAUlq.xml:56 /tmp/POJP4AAUlq.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/SUiumU65Oi.xml:40
+#: /tmp/SUiumU65Oi.xml:56 /tmp/SUiumU65Oi.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/it/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/it/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/it/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/rKkJZFOABH.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/it/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/it/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/it/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/SjpC1raD6T.xml:32
+#: /tmp/SjpC1raD6T.xml:40 /tmp/SjpC1raD6T.xml:48 /tmp/SjpC1raD6T.xml:71
+#: /tmp/SjpC1raD6T.xml:83 /tmp/SjpC1raD6T.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/it/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/it/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/it/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-19 14:17+0100\n"
+"POT-Creation-Date: 2010-02-23 20:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/zNTSyNxpZT.xml:24
-#: /tmp/zNTSyNxpZT.xml:54 /tmp/zNTSyNxpZT.xml:86 /tmp/zNTSyNxpZT.xml:129
-#: /tmp/zNTSyNxpZT.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/gZUpio8RsS.xml:24
+#: /tmp/gZUpio8RsS.xml:54 /tmp/gZUpio8RsS.xml:88 /tmp/gZUpio8RsS.xml:131
+#: /tmp/gZUpio8RsS.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/nb/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/nb/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/nb/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:49+0100\n"
+"POT-Creation-Date: 2010-02-23 20:28+0100\n"
 "PO-Revision-Date: 2010-01-21 07:40-0700\n"
 "Last-Translator: Runa Sandvik <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -454,15 +454,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -470,58 +471,58 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr "<a id=\"Developers\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr "<a class=\"anchor\" href=\"#Developers\">For Utviklere</a>"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr "Tilgang til Git og SVN:"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/nb/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/nb/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/nb/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:58+0100\n"
+"POT-Creation-Date: 2010-02-23 20:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/rLqtaptfeG.xml:40
-#: /tmp/rLqtaptfeG.xml:56 /tmp/rLqtaptfeG.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/IlZ5As1n4t.xml:40
+#: /tmp/IlZ5As1n4t.xml:56 /tmp/IlZ5As1n4t.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/nb/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/nb/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/nb/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:28+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/glVgGvBN7R.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/nb/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/nb/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/nb/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:28+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/LpD6Z_8xAc.xml:32
+#: /tmp/LpD6Z_8xAc.xml:40 /tmp/LpD6Z_8xAc.xml:48 /tmp/LpD6Z_8xAc.xml:71
+#: /tmp/LpD6Z_8xAc.xml:83 /tmp/LpD6Z_8xAc.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/nb/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/nb/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/nb/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:28+0100\n"
+"POT-Creation-Date: 2010-02-23 20:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/5LSITr5Q7I.xml:24
-#: /tmp/5LSITr5Q7I.xml:54 /tmp/5LSITr5Q7I.xml:86 /tmp/5LSITr5Q7I.xml:129
-#: /tmp/5LSITr5Q7I.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/jSgzQclamJ.xml:24
+#: /tmp/jSgzQclamJ.xml:54 /tmp/jSgzQclamJ.xml:88 /tmp/jSgzQclamJ.xml:131
+#: /tmp/jSgzQclamJ.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/nl/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/nl/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/nl/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:52+0100\n"
+"POT-Creation-Date: 2010-02-23 20:25+0100\n"
 "PO-Revision-Date: 2010-02-05 05:40-0700\n"
 "Last-Translator: CJ <libertarismeforum at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -432,15 +432,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -448,57 +449,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/nl/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/nl/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/nl/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:55+0100\n"
+"POT-Creation-Date: 2010-02-23 20:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/eZlMjoEIoH.xml:40
-#: /tmp/eZlMjoEIoH.xml:56 /tmp/eZlMjoEIoH.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/0CgGvnH5V9.xml:40
+#: /tmp/0CgGvnH5V9.xml:56 /tmp/0CgGvnH5V9.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/nl/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/nl/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/nl/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:24+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/8YLlSTAl_G.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/nl/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/nl/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/nl/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:24+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/Xfd8_zSsbB.xml:32
+#: /tmp/Xfd8_zSsbB.xml:40 /tmp/Xfd8_zSsbB.xml:48 /tmp/Xfd8_zSsbB.xml:71
+#: /tmp/Xfd8_zSsbB.xml:83 /tmp/Xfd8_zSsbB.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/nl/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/nl/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/nl/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 18:13+0100\n"
+"POT-Creation-Date: 2010-02-23 20:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/z612qStaly.xml:24
-#: /tmp/z612qStaly.xml:54 /tmp/z612qStaly.xml:86 /tmp/z612qStaly.xml:129
-#: /tmp/z612qStaly.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/o7eeJSPKJ3.xml:24
+#: /tmp/o7eeJSPKJ3.xml:54 /tmp/o7eeJSPKJ3.xml:88 /tmp/o7eeJSPKJ3.xml:131
+#: /tmp/o7eeJSPKJ3.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/pl/1-high.download.po
===================================================================
--- translation/trunk/projects/website/pl/1-high.download.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/pl/1-high.download.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor\n"
-"POT-Creation-Date: 2009-12-18 21:29+0100\n"
+"POT-Creation-Date: 2010-02-23 20:26+0100\n"
 "PO-Revision-Date: 2010-01-03 16:13+0100\n"
 "Last-Translator: Bogdan Drozdowski <bogdandr / op . pl>\n"
 "Language-Team: Polish\n"
@@ -31,26 +31,26 @@
 "Uwaga: Chcesz, żeby Tor naprawdę działał? ...to prosimy nie poprzestawaj "
 "tylko na instalacji. Musisz zmienić część swoich zwyczajów i "
 "przekonfigurować swoje oprogramowanie! Tor sam z siebie NIE jest wszystkim, "
-"czego ci trzeba, by zachować anonimowość. Przeczytaj <a "
-"href=\"#Warning\">ostrzeżenie</a>, by poznać pułapki i ograniczenia Tora."
+"czego ci trzeba, by zachować anonimowość. Przeczytaj <a href=\"#Warning"
+"\">ostrzeżenie</a>, by poznać pułapki i ograniczenia Tora."
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:25 /tmp/uTWRApxPAW.xml:313
+#: /home/runa/tor/website/en/download.wml:25 /tmp/0ah1vmUzE5.xml:313
 msgid "Operating System"
 msgstr "System operacyjny"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:26 /tmp/uTWRApxPAW.xml:314
+#: /home/runa/tor/website/en/download.wml:26 /tmp/0ah1vmUzE5.xml:314
 msgid "Download Stable"
 msgstr "Stabilna"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:27 /tmp/uTWRApxPAW.xml:315
+#: /home/runa/tor/website/en/download.wml:27 /tmp/0ah1vmUzE5.xml:315
 msgid "Download Unstable"
 msgstr "Niestabilna"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:28 /tmp/uTWRApxPAW.xml:316
+#: /home/runa/tor/website/en/download.wml:28 /tmp/0ah1vmUzE5.xml:316
 msgid "Installation and Configuration"
 msgstr "Instalacja i Konfiguracja"
 
@@ -60,8 +60,8 @@
 "<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows "
 "7, Vista, XP, 2000, 2003 Server</em></small>"
 msgstr ""
-"<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows 7, "
-"Vista, XP, 2000, 2003 Server</em></small>"
+"<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows "
+"7, Vista, XP, 2000, 2003 Server</em></small>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:38
@@ -78,11 +78,11 @@
 "<a href=\"<package-win32-bundle-alpha>\"><version-win32-bundle-alpha></a> "
 "(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>)"
 msgstr ""
-"<a href=\"<package-win32-bundle-alpha>\"><version-win32-bundle-alpha></a> (<a "
-"href=\"<package-win32-bundle-alpha-sig>\">podpis</a>)"
+"<a href=\"<package-win32-bundle-alpha>\"><version-win32-bundle-alpha></a> "
+"(<a href=\"<package-win32-bundle-alpha-sig>\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:46 /tmp/uTWRApxPAW.xml:333
+#: /home/runa/tor/website/en/download.wml:46 /tmp/0ah1vmUzE5.xml:333
 msgid "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 msgstr "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 
@@ -105,13 +105,14 @@
 "<version-torbrowserbundle>_en-US.exe.asc\">sig</a>)"
 msgstr ""
 "<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe"
-"\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-browser"
-"-<version-torbrowserbundle>_en-US.exe.asc\">podpis</a>)"
+"\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-browser-"
+"<version-torbrowserbundle>_en-US.exe.asc\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:63
 msgid "<a href=\"<page torbrowser/index>\">Windows Browser Bundle</a>"
-msgstr "<a href=\"<page torbrowser/index>\">Paczka przeglądarką dla Windows</a>"
+msgstr ""
+"<a href=\"<page torbrowser/index>\">Paczka przeglądarką dla Windows</a>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:69
@@ -119,9 +120,9 @@
 "<img src=\"images/distros/windows.png\" /> Tor IM Browser Bundle for Windows "
 "<br />(Contains Tor, Vidalia, Torbutton, Polipo, Firefox, and Pidgin)"
 msgstr ""
-"<img src=\"images/distros/windows.png\" /> Paczka Tora z przeglądarką i IM dla "
-"Windows <br /> (zawiera programy Tor, Vidalia, Torbutton, Polipo, Firefox i "
-"Pidgin)"
+"<img src=\"images/distros/windows.png\" /> Paczka Tora z przeglądarką i IM "
+"dla Windows <br /> (zawiera programy Tor, Vidalia, Torbutton, Polipo, "
+"Firefox i Pidgin)"
 
 #. PO4ASHARPBEGIN Translators should link to the IM Browser Bundle for their language,PO4ASHARPEND
 #. PO4ASHARPBEGIN e.g. _ru.exe Russian, _de.exe for Deutsch, etc.PO4ASHARPEND
@@ -132,15 +133,16 @@
 "exe\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-im-browser-"
 "<version-torimbrowserbundle>_en-US.exe.asc\">sig</a>)"
 msgstr ""
-"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-"
-"US.exe\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-im-"
-"browser-<version-torimbrowserbundle>_en-US.exe.asc\">podpis</a>)"
+"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US."
+"exe\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-im-browser-"
+"<version-torimbrowserbundle>_en-US.exe.asc\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:80
 msgid "<a href=\"<page torbrowser/index>\">Windows IM Browser Bundle</a>"
 msgstr ""
-"<a href=\"<page torbrowser/index>\">Paczka z przeglądarką i IM dla Windows</a>"
+"<a href=\"<page torbrowser/index>\">Paczka z przeglądarką i IM dla Windows</"
+"a>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:86
@@ -148,8 +150,8 @@
 "<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>Intel Only</"
 "em></small>"
 msgstr ""
-"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>Tylko "
-"Intel</em></small>"
+"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>Tylko Intel</"
+"em></small>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:90
@@ -166,12 +168,12 @@
 "<a href=\"<package-osx-bundle-alpha>\"><version-osx-bundle-alpha></a> (<a "
 "href=\"<package-osx-bundle-alpha-sig>\">sig</a>)"
 msgstr ""
-"<a href=\"<package-osx-bundle-alpha>\"><version-osx-bundle-alpha></a> (<a href"
-"=\"<package-osx-bundle-alpha-sig>\">podpis</a>)"
+"<a href=\"<package-osx-bundle-alpha>\"><version-osx-bundle-alpha></a> (<a "
+"href=\"<package-osx-bundle-alpha-sig>\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:97 /tmp/uTWRApxPAW.xml:115
-#: /tmp/uTWRApxPAW.xml:350 /tmp/uTWRApxPAW.xml:367
+#: /home/runa/tor/website/en/download.wml:97 /tmp/0ah1vmUzE5.xml:115
+#: /tmp/0ah1vmUzE5.xml:350 /tmp/0ah1vmUzE5.xml:367
 msgid "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 msgstr "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 
@@ -181,8 +183,8 @@
 "<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>PowerPC Only</"
 "em></small>"
 msgstr ""
-"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>Tylko "
-"PowerPC</em></small>"
+"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>Tylko PowerPC</"
+"em></small>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:107
@@ -190,8 +192,8 @@
 "<a href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></"
 "a> (<a href=\"<package-oldosx-bundle-stable-sig>\">sig</a>)"
 msgstr ""
-"<a href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></a> "
-"(<a href=\"<package-oldosx-bundle-stable-sig>\">podpis</a>)"
+"<a href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></"
+"a> (<a href=\"<package-oldosx-bundle-stable-sig>\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:111
@@ -212,12 +214,12 @@
 "<small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:125 /tmp/uTWRApxPAW.xml:377
+#: /home/runa/tor/website/en/download.wml:125 /tmp/0ah1vmUzE5.xml:377
 msgid "<a href=\"<page download-unix>\">Linux/Unix download page</a>"
 msgstr "<a href=\"<page download-unix>\">Strona pobierania dla Linux/Unix</a>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:128 /tmp/uTWRApxPAW.xml:380
+#: /home/runa/tor/website/en/download.wml:128 /tmp/0ah1vmUzE5.xml:380
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 
@@ -269,12 +271,11 @@
 "supporting applications distributed under the GNU GPL."
 msgstr ""
 "Tor jest rozprowadzany jako <a href=\"http://www.fsf.org/\"> Wolne "
-"Oprogramowanie (Free Software)</a> pod <a "
-"href=\"<svnsandbox>LICENSE\">3-punktową licencją BSD</a>. Paczki z programem "
-"zawierają też programy pomocnicze: <a href=\"<page "
-"vidalia/index>\">Vidalia</a> i <a "
-"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a>, "
-"rozpowszechniane pod licencją GNU GPL."
+"Oprogramowanie (Free Software)</a> pod <a href=\"<svnsandbox>LICENSE\">3-"
+"punktową licencją BSD</a>. Paczki z programem zawierają też programy "
+"pomocnicze: <a href=\"<page vidalia/index>\">Vidalia</a> i <a href=\"http://"
+"www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a>, rozpowszechniane pod "
+"licencją GNU GPL."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:161
@@ -285,8 +286,8 @@
 msgstr ""
 "Nie ma żadnych opłat za instalację oprogramowania ani za korzystanie z "
 "sieci, ale jeśli chcesz, by Tor stał się szybszy i bardziej użyteczny, "
-"rozważ <a href=\"<page donate>\">złożenie na Projekt Tor dotacji, którą można "
-"odpisać od podatku</a>."
+"rozważ <a href=\"<page donate>\">złożenie na Projekt Tor dotacji, którą "
+"można odpisać od podatku</a>."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:170
@@ -298,11 +299,10 @@
 "list's RSS feed</a>."
 msgstr ""
 "Aby otrzymywać informacje dotyczące bezpieczeństwa i nowych wersji "
-"stabilnych, zapisz się na <a "
-"href=\"http://archives.seul.org/or/announce/\">listę mailingową or-"
-"announce</a> (będziesz musiał potwierdzić zapisanie się przez e-mail). "
-"Możesz też <a href=\"http://rss.gmane.org/gmane.network.onion-"
-"routing.announce\">czytać kanał RSS tej listy</a>."
+"stabilnych, zapisz się na <a href=\"http://archives.seul.org/or/announce/"
+"\">listę mailingową or-announce</a> (będziesz musiał potwierdzić zapisanie "
+"się przez e-mail). Możesz też <a href=\"http://rss.gmane.org/gmane.network."
+"onion-routing.announce\">czytać kanał RSS tej listy</a>."
 
 #. type: Attribute 'title' of: <div><div><link>
 #: /home/runa/tor/website/en/download.wml:177
@@ -317,10 +317,10 @@
 "\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
 "<input type=\"submit\" value=\"subscribe to or-announce\"/>"
 msgstr ""
-"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type=\"hidden\" "
-"name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name=\"host\" "
-"value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> <input type=\"submit\" "
-"value=\"zapisz się do or-announce\"/>"
+"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
+"\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
+"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
+"<input type=\"submit\" value=\"zapisz się do or-announce\"/>"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/en/download.wml:190
@@ -358,11 +358,11 @@
 "\"https://addons.mozilla.org/firefox/2275/\">Torbutton</a> extension."
 msgstr ""
 "Tor chroni tylko te aplikacje internetowe, które są skonfigurowane, by swoje "
-"dane wysyłać przez Tora &mdash; Tor nie anonimizuje magicznie całego ruchu "
-"w sieci tylko dlatego, że jest zainstalowany. Polecamy przeglądarkę <a "
-"href=\"http://www.mozilla.com/en-US/firefox/all-older.html\">Firefox</a> z "
-"rozszerzeniem <a "
-"href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton</a>."
+"dane wysyłać przez Tora &mdash; Tor nie anonimizuje magicznie całego ruchu w "
+"sieci tylko dlatego, że jest zainstalowany. Polecamy przeglądarkę <a href="
+"\"http://www.mozilla.com/en-US/firefox/all-older.html\">Firefox</a> z "
+"rozszerzeniem <a href=\"https://addons.mozilla.org/firefox/2275/"
+"\">Torbutton</a>."
 
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/en/download.wml:211
@@ -380,13 +380,13 @@
 "Torbutton blokuje wtyczki przeglądarki takie jak Java, Flash, ActiveX, "
 "RealPlayer, Quicktime, wtyczka Adobe PDF, i inne: mogą one zostać "
 "zmanipulowane, by zdradzić twój adres IP. Znaczy to na przykład, że Youtube "
-"jest zablokowane. Jeśli naprawdę potrzebujesz Youtube, możesz <a href=\"<page "
-"torbutton/faq>#noflash\">przekonfigurować Torbuttona</a>, by na to zezwolić; "
-"ale zdaj sobie sprawę z tego, że otwierasz się na potencjalny atak. "
-"Ponadto, rozszerzenia takie jak Google toolbar wyszukują więcej informacji o "
-"stronach, które wpisujesz: mogą pomijać Tora lub wysyłać prywatne "
-"informacje. Niektórzy ludzie wolą używać dwóch przeglądarek (jednej dla "
-"Tora, drugiej do niebezpiecznego przeglądania sieci)."
+"jest zablokowane. Jeśli naprawdę potrzebujesz Youtube, możesz <a href="
+"\"<page torbutton/faq>#noflash\">przekonfigurować Torbuttona</a>, by na to "
+"zezwolić; ale zdaj sobie sprawę z tego, że otwierasz się na potencjalny "
+"atak. Ponadto, rozszerzenia takie jak Google toolbar wyszukują więcej "
+"informacji o stronach, które wpisujesz: mogą pomijać Tora lub wysyłać "
+"prywatne informacje. Niektórzy ludzie wolą używać dwóch przeglądarek (jednej "
+"dla Tora, drugiej do niebezpiecznego przeglądania sieci)."
 
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/en/download.wml:224
@@ -400,8 +400,8 @@
 "Strzeż się ciasteczek: jeśli kiedykolwiek zdarzy ci się przeglądać sieć bez "
 "Tora, a jakaś strona przyśle ci ciasteczko, to ciasteczko to może "
 "identyfikować cię nawet wtedy, gdy ponownie zaczniesz używać Tora. Torbutton "
-"stara się bezpiecznie zajmować się ciasteczkami. Rozszerzenie <a "
-"href=\"https://addons.mozilla.org/firefox/82/\">CookieCuller</a> może pomóc w "
+"stara się bezpiecznie zajmować się ciasteczkami. Rozszerzenie <a href="
+"\"https://addons.mozilla.org/firefox/82/\">CookieCuller</a> może pomóc w "
 "ochronie ciasteczek, których nie chcesz stracić."
 
 #. type: Content of: <div><div><ol><li>
@@ -416,13 +416,13 @@
 "Internet &mdash; use HTTPS or other end-to-end encryption and authentication."
 msgstr ""
 "Tor anonimizuje źródło przesyłanych informacji i szyfruje wszystko między "
-"Tobą i siecią Tora oraz wewnątrz sieci Tora, ale <a href=\"https://wiki.torpr"
-"oject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">nie może "
+"Tobą i siecią Tora oraz wewnątrz sieci Tora, ale <a href=\"https://wiki."
+"torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">nie może "
 "szyfrować danych między siecią Tora a punktem docelowym.</a> Jeśli wysyłasz "
 "prywatne informacje, powinieneś wkładać w ich ochronę tyle wysiłku, ile "
 "normalnie byś wkładał w normalnym, strasznym internecie &mdash; używaj HTTPS "
-"lub innego protokołu uwierzytelniania i szyfrowania na całej drodze "
-"nadawca-odbiorca."
+"lub innego protokołu uwierzytelniania i szyfrowania na całej drodze nadawca-"
+"odbiorca."
 
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/en/download.wml:243
@@ -530,7 +530,8 @@
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/download.wml:304
 msgid "<a class=\"anchor\" href=\"#Dev\">Expert Packages &amp; Source Code</a>"
-msgstr "<a class=\"anchor\" href=\"#Dev\">Paczki dla ekspertów i kod źródłowy</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#Dev\">Paczki dla ekspertów i kod źródłowy</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/download.wml:307
@@ -556,8 +557,8 @@
 "<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href="
 "\"<package-win32-stable-sig>\">sig</a>)"
 msgstr ""
-"<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href"
-"=\"<package-win32-stable-sig>\">podpis</a>)"
+"<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href="
+"\"<package-win32-stable-sig>\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:329
@@ -565,8 +566,8 @@
 "<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href="
 "\"<package-win32-alpha-sig>\">sig</a>)"
 msgstr ""
-"<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href"
-"=\"<package-win32-alpha-sig>\">podpis</a>)"
+"<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href="
+"\"<package-win32-alpha-sig>\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:339
@@ -583,8 +584,8 @@
 "<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href="
 "\"<package-osx-stable-sig>\">sig</a>)"
 msgstr ""
-"<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href=\"<package-"
-"osx-stable-sig>\">podpis</a>)"
+"<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href="
+"\"<package-osx-stable-sig>\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:346
@@ -606,8 +607,8 @@
 "<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href="
 "\"<package-oldosx-stable-sig>\">sig</a>)"
 msgstr ""
-"<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href"
-"=\"<package-oldosx-stable-sig>\">podpis</a>)"
+"<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href="
+"\"<package-oldosx-stable-sig>\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:363
@@ -615,8 +616,8 @@
 "<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href="
 "\"<package-oldosx-alpha-sig>\">sig</a>)"
 msgstr ""
-"<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href"
-"=\"<package-oldosx-alpha-sig>\">podpis</a>)"
+"<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href="
+"\"<package-oldosx-alpha-sig>\">podpis</a>)"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:373
@@ -624,9 +625,8 @@
 "<img src=\"images/ico-tux.png\" /> Linux/Unix packages (Contains only Tor)"
 "<br /> <small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 msgstr ""
-"<img src=\"images/ico-tux.png\" /> Paczki dla Linux/Unix (Zawiera tylko "
-"Tora)<br /> <small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, "
-"SUSE</em></small>"
+"<img src=\"images/ico-tux.png\" /> Paczki dla Linux/Unix (Zawiera tylko Tora)"
+"<br /> <small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:386

Modified: translation/trunk/projects/website/pl/1-high.finding-tor.po
===================================================================
--- translation/trunk/projects/website/pl/1-high.finding-tor.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/pl/1-high.finding-tor.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor\n"
-"POT-Creation-Date: 2009-12-18 21:29+0100\n"
+"POT-Creation-Date: 2010-02-23 20:26+0100\n"
 "PO-Revision-Date: 2010-01-03 16:13+0100\n"
 "Last-Translator: Bogdan Drozdowski <bogdandr / op . pl>\n"
 "Language-Team: Polish\n"
@@ -20,8 +20,8 @@
 msgstr "Tor: Znajdowanie Tora"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/finding-tor.wml:9 /tmp/tsXHAGgZuN.xml:24
-#: /tmp/tsXHAGgZuN.xml:39 /tmp/tsXHAGgZuN.xml:60
+#: /home/runa/tor/website/en/finding-tor.wml:9 /tmp/Xyy_y03_ia.xml:24
+#: /tmp/Xyy_y03_ia.xml:39 /tmp/Xyy_y03_ia.xml:60
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -41,8 +41,8 @@
 "jeśli nasza strona jest zablokowana w Twoim obszarze. Czy czytasz to z "
 "pamięci podręcznej wyszukiwarki, czy bezpośrednio z naszej strony, czy "
 "jakimś innym sposobem, mamy nadzieję, że te sugestie będą pomocne. "
-"Dodatkowo, jeśli masz pomysły na ulepszenie tych instrukcji, prosimy <a "
-"href=\"<page contact>\">skontaktuj się z nami</a> i daj nam znać."
+"Dodatkowo, jeśli masz pomysły na ulepszenie tych instrukcji, prosimy <a href="
+"\"<page contact>\">skontaktuj się z nami</a> i daj nam znać."
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/finding-tor.wml:21
@@ -72,10 +72,11 @@
 "Jeśli już używasz Tora, powinieneś/aś móc pobrać nowego Tora bezpiecznie, "
 "korzystając z posiadanego przez siebie Tora. Powinieneś/aś to zrobić dla "
 "swoich przyjaciół, którzy jeszcze nie mają Tora. Możesz to uczynić przez "
-"naszą <a href=\"<page download>\">stronę pobierania</a> lub stronę pobierania "
-"jednego z wielu <a href=\"<page mirrors>\">mirrorów</a> Tora. Prosimy "
-"poświecić szczególną uwagę <a href=\"<page verifying-signatures>\">weryfikacji "
-"podpisu</a> jakiejkolwiek pobranej paczki, kiedy tylko jest to możliwe."
+"naszą <a href=\"<page download>\">stronę pobierania</a> lub stronę "
+"pobierania jednego z wielu <a href=\"<page mirrors>\">mirrorów</a> Tora. "
+"Prosimy poświecić szczególną uwagę <a href=\"<page verifying-signatures>"
+"\">weryfikacji podpisu</a> jakiejkolwiek pobranej paczki, kiedy tylko jest "
+"to możliwe."
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/finding-tor.wml:36
@@ -88,8 +89,8 @@
 "<a class=\"anchor\" href=\"#Mirrors\">With a little help from our friends: "
 "Using Mirrors</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#Mirrors\">Z pomocą naszych przyjaciół: Korzystanie z "
-"mirrorów</a>"
+"<a class=\"anchor\" href=\"#Mirrors\">Z pomocą naszych przyjaciół: "
+"Korzystanie z mirrorów</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/finding-tor.wml:42
@@ -100,9 +101,9 @@
 "engine."
 msgstr ""
 "Strona lustrzana (mirror) jest to strona zawierająca dokładną kopię naszej "
-"strony głównej. W chwili obecnej mamy <a href=\"<page mirrors>\">kilka tuzinów "
-"mirrorów</a>, a ich listę można znaleźć wpisując \"Tor mirrors\" w swojej "
-"ulubionej wyszukiwarce."
+"strony głównej. W chwili obecnej mamy <a href=\"<page mirrors>\">kilka "
+"tuzinów mirrorów</a>, a ich listę można znaleźć wpisując \"Tor mirrors\" w "
+"swojej ulubionej wyszukiwarce."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/finding-tor.wml:50
@@ -157,8 +158,8 @@
 "address for the next day or so."
 msgstr ""
 "By uniknąć przypadkowego spamowania ludzi, odpowiadamy tylko na listy "
-"wysłane z serwisów obsługujących <a href=\"http://www.dkim.org/\">DKIM</a>, co "
-"pozwala nam sprawdzić, że adres w polu \"Od:\" jest rzeczywiście tym, z "
+"wysłane z serwisów obsługujących <a href=\"http://www.dkim.org/\">DKIM</a>, "
+"co pozwala nam sprawdzić, że adres w polu \"Od:\" jest rzeczywiście tym, z "
 "którego wysłano list. Gmail jest takim serwisem, na którym to działa. Jeśli "
 "otrzymamy e-mail z serwisu nie obsługującego DKIM, wyślemy krótkie "
 "wytłumaczenie, po czym będziemy ignorować ten adres przez około dzień."

Modified: translation/trunk/projects/website/pl/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/pl/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/pl/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 08:00+0100\n"
+"POT-Creation-Date: 2010-02-23 20:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -639,11 +639,12 @@
 #: /home/runa/tor/website/en/documentation.wml:245
 #, fuzzy
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 "Zobacz stronę <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
 "Status</a> lub stronę Xenobite'a <a href=\"https://torstat.xenobite.eu/\">o "
@@ -652,7 +653,7 @@
 "katalogowe i bada je lokalnie."
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 #, fuzzy
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
@@ -664,25 +665,25 @@
 "by szybko nabrać pojęcia o systemach anonimowej komunikacji."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 #, fuzzy
 msgid "<a id=\"Developers\"></a>"
 msgstr "<a id=\"Developers\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 #, fuzzy
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr "<a class=\"anchor\" href=\"#Developers\">Dla Deweloperów</a>"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 #, fuzzy
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr "Przeglądaj <b>katalogi ze źródłami</b> Tora:"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 #, fuzzy
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
@@ -690,18 +691,18 @@
 "źródłowego</a>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 #, fuzzy
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 #, fuzzy
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
@@ -711,7 +712,7 @@
 "kbd> i <kbd>maint-0.2.1</kbd>"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 #, fuzzy
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
@@ -721,7 +722,7 @@
 "8D:58:41:85:9C:2B:82:84:7C:84:0E:B9:BB:58:16:AC"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 #, fuzzy
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
@@ -729,7 +730,7 @@
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 #, fuzzy
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"

Modified: translation/trunk/projects/website/pl/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/pl/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/pl/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:57+0100\n"
+"POT-Creation-Date: 2010-02-23 20:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/RLPFUhZdh5.xml:40
-#: /tmp/RLPFUhZdh5.xml:56 /tmp/RLPFUhZdh5.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/wAfcrUrb_S.xml:40
+#: /tmp/wAfcrUrb_S.xml:56 /tmp/wAfcrUrb_S.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/pl/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/pl/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/pl/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:26+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/AzKo9O8kWi.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/pl/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/pl/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/pl/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:26+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/xoiRmpMHct.xml:32
+#: /tmp/xoiRmpMHct.xml:40 /tmp/xoiRmpMHct.xml:48 /tmp/xoiRmpMHct.xml:71
+#: /tmp/xoiRmpMHct.xml:83 /tmp/xoiRmpMHct.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/pl/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/pl/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/pl/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:31+0100\n"
+"POT-Creation-Date: 2010-02-23 20:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -23,9 +23,9 @@
 "Uruchamianie klienta <a href=\"<page index>\">Tor</a> na Linux/BSD/Unix"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/E6V2Z1s_jT.xml:24
-#: /tmp/E6V2Z1s_jT.xml:54 /tmp/E6V2Z1s_jT.xml:86 /tmp/E6V2Z1s_jT.xml:129
-#: /tmp/E6V2Z1s_jT.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/rAVGZsp_zV.xml:24
+#: /tmp/rAVGZsp_zV.xml:54 /tmp/rAVGZsp_zV.xml:88 /tmp/rAVGZsp_zV.xml:131
+#: /tmp/rAVGZsp_zV.xml:169
 #, fuzzy
 msgid "<br />"
 msgstr "<br />"
@@ -141,7 +141,8 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 "Pierwszym krokiem jest ustawienie sposobu przeglądania sieci WWW. Zacznij od "
 "instalacji <a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/"
@@ -152,7 +153,7 @@
 "używania Polipo z Torem."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 #, fuzzy
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
@@ -172,7 +173,7 @@
 "tt>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 #, fuzzy
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
@@ -186,13 +187,13 @@
 "aś używać Polipo i Privoxy jednocześnie."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 #, fuzzy
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr "<hr /> <a id=\"using\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 #, fuzzy
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
@@ -202,7 +203,7 @@
 "używały Tora</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 #, fuzzy
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
@@ -212,7 +213,7 @@
 "używały.  Pierwszym krokiem jest ustawienie sposobu przeglądania sieci WWW."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 #, fuzzy
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
@@ -225,7 +226,7 @@
 "gotowe:"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 #, fuzzy
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
@@ -235,7 +236,7 @@
 "torbutton.png\" border=\"1\"> <br />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 #, fuzzy
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
@@ -249,7 +250,7 @@
 "komputerze</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 #, fuzzy
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
@@ -273,7 +274,7 @@
 "org/noreply/TheOnionRouter/TorifyHOWTO#socat\">socat</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 #, fuzzy
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
@@ -285,13 +286,13 @@
 "HOWTO</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 #, fuzzy
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr "<hr /> <a id=\"verify\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 #, fuzzy
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
@@ -303,7 +304,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 #, fuzzy
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
@@ -322,7 +323,7 @@
 "na testowanie swojego Tora.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 #, fuzzy
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
@@ -350,7 +351,7 @@
 "efekt, ponownie uruchom komputer."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 #, fuzzy
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
@@ -361,13 +362,13 @@
 "wskazówek."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 #, fuzzy
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 #, fuzzy
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
@@ -376,7 +377,7 @@
 "przekaźnika sieci</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 #, fuzzy
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
@@ -395,7 +396,7 @@
 "obsługą dynamicznych adresów IP."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 #, fuzzy
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
@@ -412,7 +413,7 @@
 "innych."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 #, fuzzy
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
@@ -422,13 +423,13 @@
 "\">Konfiguracji przekaźnika sieci Tor</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 #, fuzzy
 msgid "<hr />"
 msgstr "<hr />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 #, fuzzy
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "

Modified: translation/trunk/projects/website/pt/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/pt/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/pt/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:50+0100\n"
+"POT-Creation-Date: 2010-02-23 20:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/pt/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/pt/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/pt/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:58+0100\n"
+"POT-Creation-Date: 2010-02-23 20:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/wFr3g0zfkE.xml:40
-#: /tmp/wFr3g0zfkE.xml:56 /tmp/wFr3g0zfkE.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/gFZbQSqRlb.xml:40
+#: /tmp/gFZbQSqRlb.xml:56 /tmp/gFZbQSqRlb.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/pt/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/pt/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/pt/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/JVTCMj428M.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/pt/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/pt/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/pt/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/guKY62mvLG.xml:32
+#: /tmp/guKY62mvLG.xml:40 /tmp/guKY62mvLG.xml:48 /tmp/guKY62mvLG.xml:71
+#: /tmp/guKY62mvLG.xml:83 /tmp/guKY62mvLG.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/pt/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/pt/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/pt/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:28+0100\n"
+"POT-Creation-Date: 2010-02-23 20:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/gszJHcVDlU.xml:24
-#: /tmp/gszJHcVDlU.xml:54 /tmp/gszJHcVDlU.xml:86 /tmp/gszJHcVDlU.xml:129
-#: /tmp/gszJHcVDlU.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/TziCqTj5X8.xml:24
+#: /tmp/TziCqTj5X8.xml:54 /tmp/TziCqTj5X8.xml:88 /tmp/TziCqTj5X8.xml:131
+#: /tmp/TziCqTj5X8.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/ru/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/ru/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/ru/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:53+0100\n"
+"POT-Creation-Date: 2010-02-23 20:33+0100\n"
 "PO-Revision-Date: 2010-01-04 09:58-0700\n"
 "Last-Translator: vitaliy <vitolink at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -594,12 +594,14 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
+#, fuzzy
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 "Смотрите страницы состояния сети Tor : <a href=\"http://trunk.torstatus."
 "kgprog.com/index.php\">http://trunk.torstatus.kgprog.com/</a> или <a href="
@@ -609,7 +611,7 @@
 "локально."
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -621,38 +623,38 @@
 "данных."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr "<a id=\"Developers\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr "<a class=\"anchor\" href=\"#Developers\">Для разработчиков</a>"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr "<b>Репозиторий исходного кода</b> Tor: "
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 #, fuzzy
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr "<a href=\"<svnsandbox>\">Содержимое репозитория</a>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
@@ -661,7 +663,7 @@
 "0.2.0</kbd> и <kbd>maint-0.2.1</kbd>."
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
@@ -670,14 +672,14 @@
 "8D:58:41:85:9C:2B:82:84:7C:84:0E:B9:BB:58:16:AC"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/ru/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/ru/2-medium.donate.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/ru/2-medium.donate.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:03+0100\n"
+"POT-Creation-Date: 2010-02-23 20:33+0100\n"
 "PO-Revision-Date: 2010-02-20 23:47-0700\n"
 "Last-Translator: vitaliy <vitolink at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -60,14 +60,14 @@
 "privacy continue to exist in the world."
 msgstr ""
 "Мы предлагаем несколько путей поддержки конфиденциальности и анонимности в "
-"сети Интернет через пожертвования. Вы можете пожертвовать <a "
-"href=\"#money\">деньги</a>, <a href=\"#services\">услуги</a>, <a "
-"href=\"#hardware\">оборудование</a>, и/или <a href=\"#time\">время</a>. Ваше "
-"необлагаемое налогами пожертвование помогает нам обеспечивать анонимность и "
+"сети Интернет через пожертвования. Вы можете пожертвовать <a href=\"#money"
+"\">деньги</a>, <a href=\"#services\">услуги</a>, <a href=\"#hardware"
+"\">оборудование</a>, и/или <a href=\"#time\">время</a>. Ваше необлагаемое "
+"налогами пожертвование помогает нам обеспечивать анонимность и "
 "конфиденциальность в сети Интернет по всему миру."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/OZ_sDNAHTI.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/wqQVkq_kAx.xml:102
 msgid "<br />"
 msgstr "<br />"
 
@@ -119,8 +119,8 @@
 "ретранслятора. Вы присоединяетесь к сообществу ответственных людей, которые "
 "уже создали ретрансляторы по всему миру. Самый простой способ ускорить "
 "работу сети Tor  - это увеличение количества ретрансляторов в сети. "
-"Установить ретранслятор на своем ПК так же легко как <a href=\"<page docs"
-"/tor-doc-relay>\">нажать на кнопку</a>. Присоединитесь к сети. Поддержите "
+"Установить ретранслятор на своем ПК так же легко как <a href=\"<page docs/"
+"tor-doc-relay>\">нажать на кнопку</a>. Присоединитесь к сети. Поддержите "
 "свою анонимность и конфиденциальность во всемирной паутине!"
 
 #. type: Content of: <div>
@@ -178,17 +178,17 @@
 msgstr "<br /> Выберете валюту: <select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/OZ_sDNAHTI.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/wqQVkq_kAx.xml:114
 msgid "$"
 msgstr "$"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/OZ_sDNAHTI.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/wqQVkq_kAx.xml:115
 msgid "€"
 msgstr "€"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/OZ_sDNAHTI.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/wqQVkq_kAx.xml:116
 msgid "£"
 msgstr "£"
 
@@ -218,7 +218,8 @@
 "<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
 "month"
 msgstr ""
-"<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/месяц"
+"<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
+"месяц"
 
 #. type: Content of: <div><form><dl><dt>
 #: /home/runa/tor/website/en/donate.wml:82
@@ -246,23 +247,24 @@
 "org/donate#funds\"/> <input type=\"hidden\" name=\"cancel_return\" value="
 "\"https://www.torproject.org/donate\"/>"
 msgstr ""
-"<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" name=\"t3\" "
-"value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /> <input "
-"type=\"hidden\" name=\"src\" value=\"1\" /> <input type=\"hidden\" "
+"<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" "
+"name=\"t3\" value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /"
+"> <input type=\"hidden\" name=\"src\" value=\"1\" /> <input type=\"hidden\" "
 "name=\"no_shipping\" value=\"1\" /> <input type=\"hidden\" name=\"no_note\" "
-"value=\"1\" /> <input type=\"image\" src=\"images/btn_donateCC_LG.gif\" "
-"name=\"submit\" alt=\"Make payments with PayPal - it's fast, free and "
-"secure!\"/> <input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" /> "
-"<input type=\"hidden\" name=\"business\" value=\"donations at torproject.org\" /> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Tor Project Membership\" /> "
-"<input type=\"hidden\" name=\"return\" "
-"value=\"https://www.torproject.org/donate#funds\"/> <input type=\"hidden\" "
-"name=\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
+"value=\"1\" /> <input type=\"image\" src=\"images/btn_donateCC_LG.gif\" name="
+"\"submit\" alt=\"Make payments with PayPal - it's fast, free and secure!\"/> "
+"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" /> "
+"<input type=\"hidden\" name=\"business\" value=\"donations at torproject.org\" /"
+"> <input type=\"hidden\" name=\"item_name\" value=\"Tor Project Membership"
+"\" /> <input type=\"hidden\" name=\"return\" value=\"https://www.torproject."
+"org/donate#funds\"/> <input type=\"hidden\" name=\"cancel_return\" value="
+"\"https://www.torproject.org/donate\"/>"
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/donate.wml:103
 msgid "<a class=\"anchor\" href=\"#paypal\">Single donation via PayPal</a>"
-msgstr "<a class=\"anchor\" href=\"#paypal\">Единое пожертвование через PayPal</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#paypal\">Единое пожертвование через PayPal</a>"
 
 #. type: Content of: <div><form><p><select>
 #: /home/runa/tor/website/en/donate.wml:105
@@ -276,11 +278,12 @@
 "\"currency_code\">"
 msgstr ""
 "Вы также можете сделать <b>единовременное пожертвование</b> (через PayPal, "
-"но не запрашивая счет):<br /> <input type=\"radio\" name=\"amount\" "
-"value=\"100.00\" />100 <input type=\"radio\" name=\"amount\" value=\"50.00\" />50 "
-"<input type=\"radio\" name=\"amount\" value=\"20.00\" checked=\"checked\" />20 "
-"<input type=\"radio\" name=\"amount\" value=\"10.00\" />10 <input type=\"radio\" "
-"name=\"amount\" value=\"\" />другая сумма <select name=\"currency_code\">"
+"но не запрашивая счет):<br /> <input type=\"radio\" name=\"amount\" value="
+"\"100.00\" />100 <input type=\"radio\" name=\"amount\" value=\"50.00\" />50 "
+"<input type=\"radio\" name=\"amount\" value=\"20.00\" checked=\"checked\" /"
+">20 <input type=\"radio\" name=\"amount\" value=\"10.00\" />10 <input type="
+"\"radio\" name=\"amount\" value=\"\" />другая сумма <select name="
+"\"currency_code\">"
 
 #. type: Content of: <div><form><p>
 #: /home/runa/tor/website/en/donate.wml:117
@@ -296,12 +299,12 @@
 msgstr ""
 "</select> <input type=\"hidden\" name=\"no_shipping\" value=\"1\" /> <input "
 "type=\"image\" src=\"images/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make "
-"payments with PayPal - it's fast, free and secure!\"/> <input type=\"hidden\" "
-"name=\"cmd\" value=\"_xclick\" /> <input type=\"hidden\" name=\"business\" "
-"value=\"donations at torproject.org\" /> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Tor\" /> <input type=\"hidden\" name=\"return\" "
-"value=\"https://www.torproject.org/donate#funds\"/> <input type=\"hidden\" "
-"name=\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
+"payments with PayPal - it's fast, free and secure!\"/> <input type=\"hidden"
+"\" name=\"cmd\" value=\"_xclick\" /> <input type=\"hidden\" name=\"business"
+"\" value=\"donations at torproject.org\" /> <input type=\"hidden\" name="
+"\"item_name\" value=\"Tor\" /> <input type=\"hidden\" name=\"return\" value="
+"\"https://www.torproject.org/donate#funds\"/> <input type=\"hidden\" name="
+"\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:133
@@ -482,13 +485,15 @@
 "<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
 "\"></a>"
 msgstr ""
-"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds\"></a>"
+"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
+"\"></a>"
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/donate.wml:180
 msgid "<a class=\"anchor\" href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#outcome\">Что происходит с моим пожертвованием?</a>"
+"<a class=\"anchor\" href=\"#outcome\">Что происходит с моим пожертвованием?</"
+"a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:181
@@ -511,8 +516,9 @@
 "\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
 "spent?\"/>"
 msgstr ""
-"<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor Project?\"/> "
-"<img src=\"images/2008-expenses-chart.png\" alt=\"How is the money spent?\"/>"
+"<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor Project?"
+"\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
+"spent?\"/>"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/donate.wml:188
@@ -522,5 +528,5 @@
 "strong>"
 msgstr ""
 "<strong>Проект Tor признает конфиденциальность наших доноров, если это "
-"требуется. Мы никогда не передаем, сдаем и не продаем списки наших "
-"доноров.</strong>"
+"требуется. Мы никогда не передаем, сдаем и не продаем списки наших доноров.</"
+"strong>"

Modified: translation/trunk/projects/website/ru/2-medium.torusers.po
===================================================================
--- translation/trunk/projects/website/ru/2-medium.torusers.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/ru/2-medium.torusers.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:29+0100\n"
+"POT-Creation-Date: 2010-02-23 20:33+0100\n"
 "PO-Revision-Date: 2010-02-21 06:39-0700\n"
 "Last-Translator: vitaliy <vitolink at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -28,7 +28,8 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:15
 msgid "<a href=\"<page torusers>#normalusers\">Normal people use Tor</a>"
-msgstr "<a href=\"<page torusers>#normalusers\">Обычные люди используют Tor</a>"
+msgstr ""
+"<a href=\"<page torusers>#normalusers\">Обычные люди используют Tor</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:16
@@ -59,8 +60,8 @@
 "<a href=\"<page torusers>#activists\">Activists &amp; Whistleblowers use "
 "Tor</a>"
 msgstr ""
-"<a href=\"<page torusers>#activists\">Активисты и правдолюбы используют "
-"Tor</a>"
+"<a href=\"<page torusers>#activists\">Активисты и правдолюбы используют Tor</"
+"a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:20
@@ -75,8 +76,8 @@
 #: /home/runa/tor/website/en/torusers.wml:21
 msgid "<a href=\"<page torusers>#executives\">Business executives use Tor</a>"
 msgstr ""
-"<a href=\"<page torusers>#executives\">Управляющие из сферы бизнеса используют "
-"Tor</a>"
+"<a href=\"<page torusers>#executives\">Управляющие из сферы бизнеса "
+"используют Tor</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:22
@@ -92,10 +93,10 @@
 "Информационных Технологий используют Tor</a>"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/torusers.wml:28 /tmp/FyrirT_Dpu.xml:38
-#: /tmp/FyrirT_Dpu.xml:69 /tmp/FyrirT_Dpu.xml:96 /tmp/FyrirT_Dpu.xml:121
-#: /tmp/FyrirT_Dpu.xml:147 /tmp/FyrirT_Dpu.xml:214 /tmp/FyrirT_Dpu.xml:245
-#: /tmp/FyrirT_Dpu.xml:282 /tmp/FyrirT_Dpu.xml:294
+#: /home/runa/tor/website/en/torusers.wml:28 /tmp/qObmECBfe5.xml:38
+#: /tmp/qObmECBfe5.xml:69 /tmp/qObmECBfe5.xml:96 /tmp/qObmECBfe5.xml:121
+#: /tmp/qObmECBfe5.xml:147 /tmp/qObmECBfe5.xml:214 /tmp/qObmECBfe5.xml:245
+#: /tmp/qObmECBfe5.xml:282 /tmp/qObmECBfe5.xml:294
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -110,16 +111,16 @@
 "journalists, law enforcement officers, activists, and many others. Here are "
 "some of the specific uses we've seen or recommend."
 msgstr ""
-"Сеть Tor изначально разрабатывалась и внедрялась в рамках <a "
-"href=\"http://www.onion-router.net/\"> проекта по созданию лукового "
-"маршрутизатора Военно-Морской Исследовательской Лаборатории (Naval Research "
-"Laboratory)</a> третьего поколения.  Изначально сеть была разработана с "
-"расчетом на Военно-Морской Флот США, главной целью при этом была защита "
-"правительственных коммуникаций. Сегодня, сеть ежедневно используется по "
-"широкому спектру причин военными, журналистами, сотрудниками "
-"правоохранительных органов, активистами и множеством других людей. Здесь "
-"перечислены несколько специфичных видов использования, о которых мы знаем, и "
-"которые мы рекомендуем."
+"Сеть Tor изначально разрабатывалась и внедрялась в рамках <a href=\"http://"
+"www.onion-router.net/\"> проекта по созданию лукового маршрутизатора Военно-"
+"Морской Исследовательской Лаборатории (Naval Research Laboratory)</a> "
+"третьего поколения.  Изначально сеть была разработана с расчетом на Военно-"
+"Морской Флот США, главной целью при этом была защита правительственных "
+"коммуникаций. Сегодня, сеть ежедневно используется по широкому спектру "
+"причин военными, журналистами, сотрудниками правоохранительных органов, "
+"активистами и множеством других людей. Здесь перечислены несколько "
+"специфичных видов использования, о которых мы знаем, и которые мы "
+"рекомендуем."
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/torusers.wml:36
@@ -129,7 +130,8 @@
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/torusers.wml:37
 msgid "<a class=\"anchor\" href=\"#normalusers\">Normal people use Tor</a>"
-msgstr "<a class=\"anchor\" href=\"#normalusers\">Обычные люди используют Tor</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#normalusers\">Обычные люди используют Tor</a>"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:40
@@ -154,15 +156,15 @@
 "clickstreams-for-5-a-month\"> продают записи ваших просмотров Интернет "
 "страниц</a> продавцам и другим людям, желающим заплатить за эту информацию. "
 "Провайдеры обычно говорят, что они анонимизируют данные, не предоставляя "
-"информацию, идентифицирующую конкретных людей, <a href=\"http://www.wired.com"
-"/politics/security/news/2006/08/71579?currentPage=all\">но, как оказалось, "
-"это не правда</a>. Полная запись всех посещаемых вами сайтов, текст каждого "
-"поискового запроса, а возможно также и идентификационная информация о "
-"пользователе и даже пароли могут быть частью этих данных. Помимо вашего "
-"Интернет сервис провайдера, веб сайты (<a "
-"href=\"http://www.google.com/privacy_faq.html\">и поисковые машины</a>), "
-"которые вы посещаете, имеют свои собственные логи, содержащие ту же, а, "
-"возможно, и более полную информацию."
+"информацию, идентифицирующую конкретных людей, <a href=\"http://www.wired."
+"com/politics/security/news/2006/08/71579?currentPage=all\">но, как "
+"оказалось, это не правда</a>. Полная запись всех посещаемых вами сайтов, "
+"текст каждого поискового запроса, а возможно также и идентификационная "
+"информация о пользователе и даже пароли могут быть частью этих данных. "
+"Помимо вашего Интернет сервис провайдера, веб сайты (<a href=\"http://www."
+"google.com/privacy_faq.html\">и поисковые машины</a>), которые вы посещаете, "
+"имеют свои собственные логи, содержащие ту же, а, возможно, и более полную "
+"информацию."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:49
@@ -177,15 +179,15 @@
 "your data is often not well protected by those you are supposed to trust to "
 "keep it safe."
 msgstr ""
-"<strong> Они защищают свои коммуникации от безответственных "
-"корпораций.</strong> По всему Интернету, Tor рекомендуют людям, с недавних "
-"пор заинтересовавшимся вопросами собственной конфиденциальности в виду "
+"<strong> Они защищают свои коммуникации от безответственных корпораций.</"
+"strong> По всему Интернету, Tor рекомендуют людям, с недавних пор "
+"заинтересовавшимся вопросами собственной конфиденциальности в виду "
 "увеличения количества брешей в системах безопасности и случаев "
-"злоупотреблений частной информацией. Начиная <a "
-"href=\"http://www.securityfocus.com/news/11048\">утерянными резервными копиями "
-"данных</a>, и заканчивая <a href=\"http://www.nytimes.com/2006/08/09/technol"
-"ogy/09aol.html?ex=1312776000&amp;en=f6f61949c6da4d38&amp;ei=5090\">передачей "
-"данных исследователям</a>, ваша информация очень часто не достаточно хорошо "
+"злоупотреблений частной информацией. Начиная <a href=\"http://www."
+"securityfocus.com/news/11048\">утерянными резервными копиями данных</a>, и "
+"заканчивая <a href=\"http://www.nytimes.com/2006/08/09/technology/09aol.html?"
+"ex=1312776000&amp;en=f6f61949c6da4d38&amp;ei=5090\">передачей данных "
+"исследователям</a>, ваша информация очень часто не достаточно хорошо "
 "защищена теми, кому вы её доверяете."
 
 #. type: Content of: <div><ul><li>
@@ -202,13 +204,13 @@
 msgstr ""
 "<strong>Они защищают своих детей в сети Интернет.</strong> Вы сказали своим "
 "детям, что им не стоит раскрывать идентифицирующую их информацию в сети, но, "
-"возможно, они раскрывают свое местоположение, просто не маскируя свои "
-"IP-адреса. IP-адреса все чаще могут быть использованы<a "
-"href=\"http://whatismyipaddress.com/\">буквально для определения улицы, с "
-"которой осуществлен доступ в Интернет</a>. Они также <a "
-"href=\"http://whatsmyip.org/more/\">раскрывают информацию</a> о том, как вы "
-"подключаетесь к сети Интернет. В США правительство продвигает эту "
-"технологию, чтобы карты IP-адресов стали еще более точными."
+"возможно, они раскрывают свое местоположение, просто не маскируя свои IP-"
+"адреса. IP-адреса все чаще могут быть использованы<a href=\"http://"
+"whatismyipaddress.com/\">буквально для определения улицы, с которой "
+"осуществлен доступ в Интернет</a>. Они также <a href=\"http://whatsmyip.org/"
+"more/\">раскрывают информацию</a> о том, как вы подключаетесь к сети "
+"Интернет. В США правительство продвигает эту технологию, чтобы карты IP-"
+"адресов стали еще более точными."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:60

Modified: translation/trunk/projects/website/ru/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/ru/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/ru/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:03+0100\n"
+"POT-Creation-Date: 2010-02-23 20:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/SRBf5RobqT.xml:40
-#: /tmp/SRBf5RobqT.xml:56 /tmp/SRBf5RobqT.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/gseyPZ_gAh.xml:40
+#: /tmp/gseyPZ_gAh.xml:56 /tmp/gseyPZ_gAh.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/ru/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/ru/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/ru/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:33+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/IjBm9IA1k0.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/ru/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/ru/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/ru/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:33+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/xbQeye3IYK.xml:32
+#: /tmp/xbQeye3IYK.xml:40 /tmp/xbQeye3IYK.xml:48 /tmp/xbQeye3IYK.xml:71
+#: /tmp/xbQeye3IYK.xml:83 /tmp/xbQeye3IYK.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/ru/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/ru/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/ru/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:29+0100\n"
+"POT-Creation-Date: 2010-02-23 20:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/XQY_yqlAjI.xml:24
-#: /tmp/XQY_yqlAjI.xml:54 /tmp/XQY_yqlAjI.xml:86 /tmp/XQY_yqlAjI.xml:129
-#: /tmp/XQY_yqlAjI.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/c5utUvQbSS.xml:24
+#: /tmp/c5utUvQbSS.xml:54 /tmp/c5utUvQbSS.xml:88 /tmp/c5utUvQbSS.xml:131
+#: /tmp/c5utUvQbSS.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/sv/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/sv/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/sv/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:56+0100\n"
+"POT-Creation-Date: 2010-02-23 20:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/sv/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/sv/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/sv/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:01+0100\n"
+"POT-Creation-Date: 2010-02-23 20:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/7KZHPO4DX_.xml:40
-#: /tmp/7KZHPO4DX_.xml:56 /tmp/7KZHPO4DX_.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/bwOEmFwv2Q.xml:40
+#: /tmp/bwOEmFwv2Q.xml:56 /tmp/bwOEmFwv2Q.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/sv/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/sv/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/sv/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/3N1jNAHZ4e.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/sv/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/sv/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/sv/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/E_Te84LaFX.xml:32
+#: /tmp/E_Te84LaFX.xml:40 /tmp/E_Te84LaFX.xml:48 /tmp/E_Te84LaFX.xml:71
+#: /tmp/E_Te84LaFX.xml:83 /tmp/E_Te84LaFX.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/sv/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/sv/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/sv/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 18:43+0100\n"
+"POT-Creation-Date: 2010-02-23 20:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/G3AjEV5cRD.xml:24
-#: /tmp/G3AjEV5cRD.xml:54 /tmp/G3AjEV5cRD.xml:86 /tmp/G3AjEV5cRD.xml:129
-#: /tmp/G3AjEV5cRD.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/of1K78wXpj.xml:24
+#: /tmp/of1K78wXpj.xml:54 /tmp/of1K78wXpj.xml:88 /tmp/of1K78wXpj.xml:131
+#: /tmp/of1K78wXpj.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/tr/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/tr/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/tr/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:51+0100\n"
+"POT-Creation-Date: 2010-02-23 20:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,15 +428,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -444,57 +445,57 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/tr/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/tr/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/tr/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:56+0100\n"
+"POT-Creation-Date: 2010-02-23 20:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/jJqOhf_7uq.xml:40
-#: /tmp/jJqOhf_7uq.xml:56 /tmp/jJqOhf_7uq.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/BLb6biltpP.xml:40
+#: /tmp/BLb6biltpP.xml:56 /tmp/BLb6biltpP.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Added: translation/trunk/projects/website/tr/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/tr/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/tr/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:25+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/pXMdMEs1Kf.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/tr/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/tr/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/tr/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:25+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/1xxbJKoqJX.xml:32
+#: /tmp/1xxbJKoqJX.xml:40 /tmp/1xxbJKoqJX.xml:48 /tmp/1xxbJKoqJX.xml:71
+#: /tmp/1xxbJKoqJX.xml:83 /tmp/1xxbJKoqJX.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/tr/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/tr/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/tr/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 19:00+0100\n"
+"POT-Creation-Date: 2010-02-23 20:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/hBihNfFSsC.xml:24
-#: /tmp/hBihNfFSsC.xml:54 /tmp/hBihNfFSsC.xml:86 /tmp/hBihNfFSsC.xml:129
-#: /tmp/hBihNfFSsC.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/OC7lsuF5YL.xml:24
+#: /tmp/OC7lsuF5YL.xml:54 /tmp/OC7lsuF5YL.xml:88 /tmp/OC7lsuF5YL.xml:131
+#: /tmp/OC7lsuF5YL.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/zh_CN/1-high.download.po
===================================================================
--- translation/trunk/projects/website/zh_CN/1-high.download.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/zh_CN/1-high.download.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-10 13:03+0100\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
 "PO-Revision-Date: 2010-02-18 21:59-0700\n"
 "Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -38,22 +38,22 @@
 "在的隐患和局限。"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:25 /tmp/xBddRXN1Bd.xml:313
+#: /home/runa/tor/website/en/download.wml:25 /tmp/fy3DtpUkNo.xml:313
 msgid "Operating System"
 msgstr "操作系统"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:26 /tmp/xBddRXN1Bd.xml:314
+#: /home/runa/tor/website/en/download.wml:26 /tmp/fy3DtpUkNo.xml:314
 msgid "Download Stable"
 msgstr "稳定版"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:27 /tmp/xBddRXN1Bd.xml:315
+#: /home/runa/tor/website/en/download.wml:27 /tmp/fy3DtpUkNo.xml:315
 msgid "Download Unstable"
 msgstr "测试版"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:28 /tmp/xBddRXN1Bd.xml:316
+#: /home/runa/tor/website/en/download.wml:28 /tmp/fy3DtpUkNo.xml:316
 msgid "Installation and Configuration"
 msgstr "安装及配置"
 
@@ -85,7 +85,7 @@
 "(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:46 /tmp/xBddRXN1Bd.xml:333
+#: /home/runa/tor/website/en/download.wml:46 /tmp/fy3DtpUkNo.xml:333
 msgid "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 msgstr "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 
@@ -171,8 +171,8 @@
 "href=\"<package-osx-bundle-alpha-sig>\">sig</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:97 /tmp/xBddRXN1Bd.xml:115
-#: /tmp/xBddRXN1Bd.xml:350 /tmp/xBddRXN1Bd.xml:367
+#: /home/runa/tor/website/en/download.wml:97 /tmp/fy3DtpUkNo.xml:115
+#: /tmp/fy3DtpUkNo.xml:350 /tmp/fy3DtpUkNo.xml:367
 msgid "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 msgstr "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 
@@ -213,12 +213,12 @@
 "<small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:125 /tmp/xBddRXN1Bd.xml:377
+#: /home/runa/tor/website/en/download.wml:125 /tmp/fy3DtpUkNo.xml:377
 msgid "<a href=\"<page download-unix>\">Linux/Unix download page</a>"
 msgstr "<a href=\"<page download-unix>\">Linux/Unix 下载页面</a>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:128 /tmp/xBddRXN1Bd.xml:380
+#: /home/runa/tor/website/en/download.wml:128 /tmp/fy3DtpUkNo.xml:380
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 
@@ -450,8 +450,8 @@
 "other binaries, see <a href=\"http://archive.torproject.org/tor-package-"
 "archive/\">the archive</a>."
 msgstr ""
-"如果你想研究任何过去发布的 Tor 源代码、套件或其他二进制文件,请看 <a href=\"http://archive.torproject.org"
-"/tor-package-archive/\">存档</a>。"
+"如果你想研究任何过去发布的 Tor 源代码、套件或其他二进制文件,请看 <a href="
+"\"http://archive.torproject.org/tor-package-archive/\">存档</a>。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:276

Modified: translation/trunk/projects/website/zh_CN/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/zh_CN/2-medium.documentation.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/zh_CN/2-medium.documentation.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:55+0100\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
 "PO-Revision-Date: 2010-01-31 16:44-0700\n"
 "Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -538,12 +538,14 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:245
+#, fuzzy
 msgid ""
-"Check out the <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor "
-"Status</a> page, or Xenobite's <a href=\"https://torstat.xenobite.eu/\">Tor "
-"node status</a> page.  Remember that these lists may not be as accurate as "
-"what your Tor client uses, because your client fetches its own directory "
-"information and examines it locally."
+"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."
+"com/index.php\">kgprog's</a>, or Xenobite's <a href=\"https://torstat."
+"xenobite.eu/\">Tor node status</a> page.  Remember that these lists may not "
+"be as accurate as what your Tor client uses, because your client fetches its "
+"own directory information and examines it locally."
 msgstr ""
 "签出 <a href=\"http://trunk.torstatus.kgprog.com/index.php\">Tor 状态</a> 页"
 "面,或 Xenobite 的 <a href=\"https://torstat.xenobite.eu/\">Tor 节点状态</a> "
@@ -551,7 +553,7 @@
 "的目录信息并在本地检查。"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:251
+#: /home/runa/tor/website/en/documentation.wml:252
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -562,38 +564,38 @@
 "通信领域的速度。"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:258
 msgid "<a id=\"Developers\"></a>"
 msgstr "<a id=\"Developers\"></a>"
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:258
+#: /home/runa/tor/website/en/documentation.wml:259
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr "<a class=\"anchor\" href=\"#Developers\">给开发人员</a>"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:259
+#: /home/runa/tor/website/en/documentation.wml:260
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr "浏览 Tor <b>源代码库</b>:"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:261
+#: /home/runa/tor/website/en/documentation.wml:262
 #, fuzzy
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr "<a href=\"<gitblob>\">直接浏览代码树</a>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "Git and SVN access:"
 msgstr "Git 和 SVN 访问:"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:265
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
@@ -602,7 +604,7 @@
 "<kbd>maint-0.2.1</kbd>。"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid ""
 "<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
 "B9:BB:58:16:AC"
@@ -610,14 +612,14 @@
 "<b>Git HTTPS 证书指纹:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:B9:BB:58:16:AC"
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:268
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
 "\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/zh_CN/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/zh_CN/2-medium.donate.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/zh_CN/2-medium.donate.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:59+0100\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
 "PO-Revision-Date: 2010-02-18 22:03-0700\n"
 "Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -64,7 +64,7 @@
 "href=\"#time\">时间</a>。您的捐助确保了在线的匿名与隐私依然存于世间。"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/bi0atPfvHR.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/XHso_j5JRd.xml:102
 msgid "<br />"
 msgstr "<br />"
 
@@ -148,7 +148,9 @@
 msgid ""
 "through our <a href=\"http://givv.org/recipients/the-tor-project\">Givv "
 "account</a>"
-msgstr "通过我们的 <a href=\"http://givv.org/recipients/the-tor-project\">Givv 帐户</a>"
+msgstr ""
+"通过我们的 <a href=\"http://givv.org/recipients/the-tor-project\">Givv 帐户</"
+"a>"
 
 #. type: Content of: <div><form><p><ol><li>
 #: /home/runa/tor/website/en/donate.wml:66
@@ -162,17 +164,17 @@
 msgstr "<br /><br />选择您的货币种类:<select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/bi0atPfvHR.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/XHso_j5JRd.xml:114
 msgid "$"
 msgstr "$"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/bi0atPfvHR.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/XHso_j5JRd.xml:115
 msgid "€"
 msgstr "€"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/bi0atPfvHR.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/XHso_j5JRd.xml:116
 msgid "£"
 msgstr "£"
 

Modified: translation/trunk/projects/website/zh_CN/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.download-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/zh_CN/3-low.download-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:59+0100\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/A9jhO4BQNO.xml:40
-#: /tmp/A9jhO4BQNO.xml:56 /tmp/A9jhO4BQNO.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/M6hNZqlL7K.xml:40
+#: /tmp/M6hNZqlL7K.xml:56 /tmp/M6hNZqlL7K.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -174,13 +174,12 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:78
-msgid "Maemo"
+msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
-msgid ""
-"Download from <a href=\"http://maemo.org/packages/view/tor/\">Maemo.org</a>"
+msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Modified: translation/trunk/projects/website/zh_CN/docs/2-medium.tor-doc-osx.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/2-medium.tor-doc-osx.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/zh_CN/docs/2-medium.tor-doc-osx.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2010-02-23 20:28+0100\n"
 "PO-Revision-Date: 2010-02-18 20:46-0700\n"
 "Last-Translator: tommy ma <myrose999 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr "在Mac OS X下运行<a href=\"<page index>\">Tor</a>客户端"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:12 /tmp/wncbgQ6qHD.xml:24
-#: /tmp/wncbgQ6qHD.xml:70 /tmp/wncbgQ6qHD.xml:107 /tmp/wncbgQ6qHD.xml:142
-#: /tmp/wncbgQ6qHD.xml:165
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:12 /tmp/k4sklnLqdR.xml:24
+#: /tmp/k4sklnLqdR.xml:70 /tmp/k4sklnLqdR.xml:107 /tmp/k4sklnLqdR.xml:142
+#: /tmp/k4sklnLqdR.xml:165
 msgid "<br />"
 msgstr "<br />"
 
@@ -35,8 +35,9 @@
 "network grow (please do), read the <a href=\"<page docs/tor-doc-relay>"
 "\">Configuring a relay</a> guide.</b>"
 msgstr ""
-"<b>请注意,这是运行在Mac OS X下的安装介绍。如果您想贡献流量帮助网络增长(很高兴您能那么做),请阅读<a href=\"<page docs"
-"/tor-doc-relay>\">配置网络中继</a>手册。</b>"
+"<b>请注意,这是运行在Mac OS X下的安装介绍。如果您想贡献流量帮助网络增长(很高"
+"兴您能那么做),请阅读<a href=\"<page docs/tor-doc-relay>\">配置网络中继</a>手"
+"册。</b>"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:21

Added: translation/trunk/projects/website/zh_CN/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/3-low.N900.po	                        (rev 0)
+++ translation/trunk/projects/website/zh_CN/docs/3-low.N900.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,214 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:11
+msgid "<a id=\"Maemo\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:12
+msgid "<a class=\"anchor\" href=\"#Maemo\">Installing Tor on Maemo</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:13 /tmp/3ib5Z0kmsH.xml:23
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:15
+msgid ""
+"If you have a Maemo device that is not the <a href=\"#N900\">N900</a>, we "
+"suggest you install the Tor package from the <a href=\"http://maemo.org/"
+"packages/view/tor/\">Maemo website</a>. The Tor Project does not produce "
+"these packages. They are maintaind by the Maemo community."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:21
+msgid "<a id=\"N900\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/N900.wml:22
+msgid "<a class=\"anchor\" href=\"#N900\">Installing Tor on the N900</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:25
+msgid ""
+"The following instructions should help install an <a href=\"https://garage."
+"maemo.org/projects/tor-status\">experimental Tor controller</a> and Tor as "
+"packaged for the N900 Nokia telephone. This is currently an untested "
+"configuration. The browser in this configuration does not have Torbutton and "
+"it should not be used for high security anonymity needs at this time."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:34
+msgid ""
+"Open the Application manager: <br /> <a href=\"../img/N900/1_app_menu.png\"> "
+"<img border=\"0\" alt=\"N900 application menu\" src=\"../img/N900/1_app_menu-"
+"small-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:42
+msgid ""
+"Click on the Application manager menu at the top of the screen: <br /> <a "
+"href=\"../img/N900/2_app_manager.png\"> <img border=\"0\" alt=\"N900 "
+"application manager\" src=\"../img/N900/2_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:50
+msgid ""
+"Select 'Application catalogs': <br /> <a href=\"../img/"
+"N900/3_app_managermenu.png\"> <img border=\"0\" alt=\"N900 application "
+"catalogs\" src=\"../img/N900/3_app_managermenu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:58
+msgid ""
+"Press 'New' to enable the maemo extras-devel repository. <br /> <small>Note: "
+"This repository contains untested packages that might harm your device. <br /"
+"> See <a href=\"http://wiki.maemo.org/Extras-devel\">Extras-devel</a> for "
+"details. You should probably disable extras-devel after installing Tor, or "
+"proceed at your own risk.</small> <br /> <a href=\"../img/"
+"N900/4_catalog_list.png\"> <img border=\"0\" alt=\"N900 catalog list\" src="
+"\"../img/N900/4_catalog_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:72
+msgid "Enter the following information into the catalog addition screen:"
+msgstr ""
+
+#. type: Content of: <div><div><p><p><pre>
+#: /home/runa/tor/website/docs/en/N900.wml:75
+#, no-wrap
+msgid ""
+"Catalog name:    Extras devel\n"
+"Web address:    http://repository.maemo.org/extras-devel/\n"
+"Distribution:        fremantle\n"
+"Components:    free non-free\n"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:81
+msgid ""
+"<br /> Make sure 'Disabled' is unchecked, hit 'Save', and wait for the "
+"package list to update.<br /> <a href=\"../img/N900/5_new_catalog.png\"> "
+"<img border=\"0\" alt=\"N900 new catalog\" src=\"../img/N900/5_new_catalog-"
+"small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:91
+msgid ""
+"Press 'Download' in the App manager: <br /> <a href=\"../img/"
+"N900/6_app_manager.png\"> <img border=\"0\" alt=\"N900 app manager\" src="
+"\"../img/N900/6_app_manager-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:99
+msgid ""
+"Select the Network category (or search for Tor): <br /> <a href=\"../img/"
+"N900/7_app_categories.png\"> <img border=\"0\" alt=\"N900 application "
+"categories\" src=\"../img/N900/7_app_categories-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:107
+msgid ""
+"Scroll down and select 'Tor Status Area Applet': <br /> <a href=\"../img/"
+"N900/8_app_list.png\"> <img border=\"0\" alt=\"N900 application list\" src="
+"\"../img/N900/8_app_list-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:115
+msgid ""
+"Agree to the disclaimer and press 'Continue': <br /> <a href=\"../img/"
+"N900/9_disclaimer.png\"> <img border=\"0\" alt=\"N900 disclaimer\" src=\"../"
+"img/N900/9_disclaimer-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:123
+msgid ""
+"When the install is done, disable the extras-devel repository, and reboot "
+"the device: <br /> <a href=\"../img/N900/10_success.png\"> <img border=\"0\" "
+"alt=\"N900 success\" src=\"../img/N900/10_success-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:132
+msgid ""
+"After rebooting the N900, open the status menu: <br /> <a href=\"../img/"
+"N900/11_after_rebooting.png\"> <img border=\"0\" alt=\"N900 status menu post-"
+"reboot\" src=\"../img/N900/11_after_rebooting-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:140
+msgid ""
+"Select 'The Onion Router' from the list: <br /> <a href=\"../img/"
+"N900/12_status_menu.png\"> <img border=\"0\" alt=\"N900 status menu selection"
+"\" src=\"../img/N900/12_status_menu-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:148
+msgid ""
+"Enable onion routing, and press 'Save': <br /> <a href=\"../img/"
+"N900/13_enable_tor.png\"> <img border=\"0\" alt=\"N900 enabling Tor\" src="
+"\"../img/N900/13_enable_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:156
+msgid ""
+"Visit <a href=\"https://check.torproject.org/\">TorCheck</a> to confirm that "
+"you are routing browser traffic through Tor: <br /> <a href=\"../img/"
+"N900/14_check_tor.png\"> <img border=\"0\" alt=\"N900 check Tor\" src=\"../"
+"img/N900/14_check_tor-small.png\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:165
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the N900 web browser does not have Torbutton. This means that "
+"while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/N900.wml:171
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/N900.wml:173
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/zh_CN/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/3-low.android.po	                        (rev 0)
+++ translation/trunk/projects/website/zh_CN/docs/3-low.android.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -0,0 +1,246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-02-23 20:28+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:11
+msgid "<a id=\"Android\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:12
+msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:13 /tmp/KSlBDq1J6L.xml:32
+#: /tmp/KSlBDq1J6L.xml:40 /tmp/KSlBDq1J6L.xml:48 /tmp/KSlBDq1J6L.xml:71
+#: /tmp/KSlBDq1J6L.xml:83 /tmp/KSlBDq1J6L.xml:107
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:15
+msgid "Tor is available for Android by installing our package named Orbot."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:18
+msgid ""
+"Orbot is an application that allows mobile phone users to access the web, "
+"instant messaging and email without being monitored or blocked by their "
+"mobile internet service provider. Orbot brings the features and "
+"functionality of Tor to the Android mobile operating system."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:24
+msgid ""
+"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy "
+"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot "
+"has the ability to transparently torify all of the TCP traffic on your "
+"Android device when it has the correct permissions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:30
+msgid "<a id=\"Market\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android Market</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:34
+msgid ""
+"Orbot is not currently in the Android Market. It will be available in the "
+"market in the very near future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:38
+msgid "<a id=\"Manual\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:39
+msgid ""
+"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:42
+msgid ""
+"You can download our most recent beta of Orbot and a gpg signature from our "
+"server."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:46
+msgid "<a id=\"Screenshots\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:47
+msgid ""
+"<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:50
+msgid ""
+"<a href=\"../img/android/android-off.jpg\"> <img border=\"0\" alt=\"Android "
+"Tor off\" src=\"../img/android/android-off-150x150.jpg\"/> </a> <a href=\"../"
+"img/android/android-bootstrapping.jpg\"> <img border=\"0\" alt=\"Android Tor "
+"bootstrapping\" src=\"../img/android/android-bootstrapping-150x150.jpg\"/> </"
+"a> <a href=\"../img/android/android-activated.jpg\"> <img border=\"0\" alt="
+"\"Android Tor activated\" src=\"../img/android/android-activated-150x150.jpg"
+"\"/> </a> <a href=\"../img/android/android-settings.jpg\"> <img border=\"0\" "
+"alt=\"Android Tor settings\" src=\"../img/android/android-settings-150x150."
+"jpg\"/> </a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:68
+msgid "<a id=\"ProxySettings\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:69
+msgid ""
+"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration "
+"</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:73
+msgid "Orbot offers three interfaces into the Tor network:"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:75
+msgid "SOCKS 4A/5 proxy 127.0.0.1:9050"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:76
+msgid "HTTP proxy 127.0.0.1:8118"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:77
+msgid "Transparent proxying (on select devices)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:81
+msgid "<a id=\"Notes\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:82
+msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:85
+msgid ""
+"For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, "
+"Moment):"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:87
+msgid ""
+"The “ProxySurf” browser available in the Android Market allows for use of a "
+"proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:89
+msgid ""
+"For Instant Messsaging, try “Beem” in the market, and set the Proxy to "
+"SOCKS5 '127.0.0.1' and port '9050'."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:93
+msgid "For Android 2.x devices: Droid, Nexus One"
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:95
+msgid ""
+"You must root your device for Orbot to transparently proxy all TCP traffic."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:96
+msgid ""
+"For non-modified and non-rooted phones, you'll want to manually configure "
+"your specific applications."
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/android.wml:98
+msgid ""
+"If you root your device, whether it is 1.x or 2.x based, Orbot will "
+"automatically, transparently proxy all web traffic on port 80 and 443 and "
+"all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps "
+"and any other application that uses standard web traffic."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:105
+msgid "<a id=\"Source\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/android.wml:106
+msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:109
+msgid ""
+"All of the source code is available in the <a href=\"https://svn.torproject."
+"org/svn/projects/android/trunk/Orbot/\">Orbot subversion repository</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:115
+msgid ""
+"Note that this might not always give you the latest stable Tor version.  "
+"Additionally, the Android web browser does not have Torbutton. This means "
+"that while it may be useful for circumvention, it probably is unsuitable for "
+"strong web browser anonymity requirements."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/android.wml:121
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/android.wml:123
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"contact>\">send them to us</a>. Thanks!"
+msgstr ""

Modified: translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po	2010-02-23 19:34:55 UTC (rev 21744)
+++ translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po	2010-02-23 19:49:06 UTC (rev 21745)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:18+0100\n"
+"POT-Creation-Date: 2010-02-23 20:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/Q_NsYkYh5m.xml:24
-#: /tmp/Q_NsYkYh5m.xml:54 /tmp/Q_NsYkYh5m.xml:86 /tmp/Q_NsYkYh5m.xml:129
-#: /tmp/Q_NsYkYh5m.xml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/xoeru7o7qx.xml:24
+#: /tmp/xoeru7o7qx.xml:54 /tmp/xoeru7o7qx.xml:88 /tmp/xoeru7o7qx.xml:131
+#: /tmp/xoeru7o7qx.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -103,11 +103,12 @@
 "favorite repository. Polipo is a caching web proxy that does http pipelining "
 "well, so it's well-suited for Tor's latencies. Make sure to get at least "
 "Polipo 1.0.4, since earlier versions lack the SOCKS support required to use "
-"Polipo with Tor."
+"Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
+"remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
@@ -119,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
 "torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -128,26 +129,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -155,14 +156,14 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -171,7 +172,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -185,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -193,12 +194,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
@@ -207,7 +208,7 @@
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/"
@@ -218,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -234,25 +235,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
 msgid ""
 "If it's still not working, look at <a href=\"https://wiki.torproject.org/"
 "noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
 "The Tor network relies on volunteers to donate bandwidth. The more people "
 "who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -263,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -273,19 +274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"



More information about the tor-commits mailing list